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 1210941 P5 Use LOAD_BYPASS_SERVICE_WORKER in nsObjectLoadingContent instead of ForceNoIntercept(). r=ehsan

Browse Source
This commit is contained in:
Ben Kelly 2015-10-06 06:37:07 -07:00
parent 6f5ac6af87
commit 86810e04e9
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/base/nsObjectLoadingContent.cpp
View File

@ -21,7 +21,6 @@
#include "nsIDOMHTMLAppletElement.h"
#include "nsIExternalProtocolHandler.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIHttpChannelInternal.h"
#include "nsIObjectFrame.h"
#include "nsIPermissionManager.h"
#include "nsPluginHost.h"
@ -2535,7 +2534,8 @@ nsObjectLoadingContent::OpenChannel()
group, // aLoadGroup
shim, // aCallbacks
nsIChannel::LOAD_CALL_CONTENT_SNIFFERS |
nsIChannel::LOAD_CLASSIFY_URI);
nsIChannel::LOAD_CLASSIFY_URI |
nsIChannel::LOAD_BYPASS_SERVICE_WORKER);
NS_ENSURE_SUCCESS(rv, rv);
@ -2558,13 +2558,6 @@ nsObjectLoadingContent::OpenChannel()
scriptChannel->SetExecutionPolicy(nsIScriptChannel::EXECUTE_NORMAL);
}
nsCOMPtr<nsIHttpChannelInternal> internalChannel = do_QueryInterface(httpChan);
if (internalChannel) {
// Bug 1168676. object/embed tags are not allowed to be intercepted by
// ServiceWorkers.
internalChannel->ForceNoIntercept();
}
// AsyncOpen can fail if a file does not exist.
rv = chan->AsyncOpen(shim, nullptr);
NS_ENSURE_SUCCESS(rv, rv);