wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 878786 - relax assertion requiring a loadGroup when the loading document is an SVG-glyph document loaded from a font table. r=bz

Browse Source
This commit is contained in:
Jonathan Kew 2013-08-26 22:31:02 -07:00
parent 96fb2ae10c
commit f2a90fffff
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/base/src/nsContentUtils.cpp
View File

@ -70,6 +70,7 @@
#include "nsFocusManager.h" #include "nsFocusManager.h"
#include "nsGenericHTMLElement.h" #include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h" #include "nsGkAtoms.h"
#include "nsHostObjectProtocolHandler.h"
#include "nsHtml5Module.h" #include "nsHtml5Module.h"
#include "nsHtml5StringParser.h" #include "nsHtml5StringParser.h"
#include "nsIAsyncVerifyRedirectCallback.h" #include "nsIAsyncVerifyRedirectCallback.h"
@ -2715,10 +2716,12 @@ nsContentUtils::LoadImage(nsIURI* aURI, nsIDocument* aLoadingDocument,
} }
nsCOMPtr<nsILoadGroup> loadGroup = aLoadingDocument->GetDocumentLoadGroup(); nsCOMPtr<nsILoadGroup> loadGroup = aLoadingDocument->GetDocumentLoadGroup();
NS_ASSERTION(loadGroup, "Could not get loadgroup; onload may fire too early");
nsIURI *documentURI = aLoadingDocument->GetDocumentURI(); nsIURI *documentURI = aLoadingDocument->GetDocumentURI();
NS_ASSERTION(loadGroup || IsFontTableURI(documentURI),
"Could not get loadgroup; onload may fire too early");
// check for a Content Security Policy to pass down to the channel that // check for a Content Security Policy to pass down to the channel that
// will get created to load the image // will get created to load the image
nsCOMPtr<nsIChannelPolicy> channelPolicy; nsCOMPtr<nsIChannelPolicy> channelPolicy;