mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1148708: Add missing 'override' annotations in DocAccessibleChild.h. rs=ehsan (d606358545)
- Bug 1210408 - make nsMaiInterfaceAction work with proxies, r=tbsaunde (f7c819c6ae)
- Bug 1210407 - teach nsMaiInterfaceTable to use proxies, r=tbsaunde (4ca4f10b5f)
- bug 1185157 make sure we don't send an event to a destroyed ipc document r=billm (23acf53f75)
- bug 1214864 - make SetCarretOffset() async r=davidb (e3079e9b2d)
- missing of Bug 1139972 - IPC Proxy for charAt, r=tbsaunde (e9593ed752)
- bug 1191598 - Pass MOZ_CURRENT_PROJECT in environment when running post-build automation steps for universal mac builds. r=gps (fc342c6ced)
- Bug 1164596 - Add mach android-emulator command; r=ahal (afeb9b27d1)
- Bug 1223149 - Add basic usage documentation for mach build; r=glandium (bfb802d175)
- Bug 1182301 - Improve 'mach build' notifications. r=gps (2c65a122d1)
- Bug 1184696 - Add clobber targets to |mach clobber|; Ability to clobber compiled python files, r=gps (35d8be292e)
- Bug 1117958 - Allow any debugging options to the run or gtest mach subcommands to automatically enable debugging. r=gps (32f986af4b)
- Bug 1180081 - Properly rebuild gtest/libxul before running gtests. r=gps (80db9a3d49)
- Bug 1171647, part 1 - Define a new function to convert the mode to a string. r=njn (61ad16f5ba)
- Bug 1171647, part 2 - Remove redundant assertion for dark matter mode. r=njn (b5ac9519f3)
- Bug 1058178, part 1 - Implement DMD heap scanning mode. r=njn (60e1079536)
- Bug 1058178, part 2 - Implement address clamping analysis for DMD scan logs. r=njn (45c0326b93)
- Bug 1102388 - Fix DMD static constructor ordering dependency. r=mccr8 (59b87897a1)
- Bug 1128705 - Don't redefine PAGE_SIZE in DMD if it's already defined. r=erahm (49216348ee)
- Bug 1179042 - Add a script for analyzing memory blocks using a heap scan DMD log. r=njn DONTBUILD (1c08d2d66e)
- Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat (1c999d139b)
- Bug 1158772 - fix non-idiomatic memset call in nsDeque.cpp; r=erahm (de6b555245)
- Bug 1199400 - Part 1: Use CheckedInt when growing nsDeque capacity. r=froydnj (dfdf6814a3)
- Bug 1199400 - Part 0: Remove unused nsDequeIterator. r=froydnj (38d69d7f47)
- Bug 1199400 - Part 2: Add tests for possible nsDeque corner cases. r=froydnj (931baff195)
- Bug 1201997 - Part 1 - Converted compiled test to gtest for nsDeque class. Added tests to test untested methods. r=froydn (e893916651)
- Bug 1201997 - Part 2 - Removing unused methods from the nsDeque class. r=froydn (41595a90ac)
- Bug 1201997 - Part 3 - Make internally used methods private. r=froydn (8cd3afd96f)
- Bug 1201997 - Part 4 - Change size and offset variables to size_t.r=froydn (73eabc8d60)
- Bug 1215140 P1 Add an nsIConsoleReportCollector interface to support navigation channel logging. r=bz (8a41535e2b)
- Bug 1215140 P2 Make HttpBaseChannel implement nsIConsoleReportCollector. r=bz (75fca301f2)
- Bug 1197679 - If nsUnknownDecoder is involved in e10s DivertToParent can break. r=jduell (5d94a12504)
- Bug 1178991 - smartptr for http converter r=hurley (8e7fbc8443)
- bug 366559 - patch 2, fix nsHTTPCompressConv indentation r=bagder (ba762da587)
- bug 366559 - patch 3, fix nsHTTPCompressConv bracing style r=bagder (54195ab451)
- bits of bug 366559 - patch 7, content-encoding brotli for http (f0b4051022)
- Bug 1205112 - Make PushEvent.data nullable. r=mt,smaug (775db32856)
- Bug 1193414 - SharedWorkers thread should be kept alive also when the SharedWorker object is CCed, r=khuey (b77ea8125c)
- Bug 1206520: Add about:config prefs to enable throwing on asm.js validation failures; r=bz (c42126665d)
- Bug 1193414 - Telemetry for SharedWorker spawning. r=bkelly (77984b7bcc)
- Bug 1205676 - Enable WPT service-worker/unregister-then-register-new-script.https.html in e10s, r=nsm (ec24939cf6)
- Bug 1193133 - Throw when calling postMessage from a Service Worker dom object with no global. r=bkelly (526dcacfab)
- Bug 1181871 P1 Only enforce Cache Context shared data destruction on target thread after init. r=ehsan (cdbf3ed3a8)
- Bug 1181871 P2 Fix ServiceWorkerManager usage of stack-based ErrorResult. r=ehsan (c449195d90)
- minor cleanup and missing bit of 1198230 (02f459db05)
- Bug 1143717 - Implement the ServiceWorkerMessageEvent interface. r=baku (027b3465f2)
- fix misspatch (708eee4e84)
- Bug 1188545 - Disentangle service workers from shared workers and refactor event dispatching code into a separate class. r=nsm,mrbkap (fb5b5341c9)
- Bug 1205228 - Change PackagedAppVerifier to notify the verification result asynchronously. r=valentin. (9edda0fa00)
- Bug 1178518 - Packaged App Utils. r=valentin (f60f3b7a93)
- Bug 1213150 - Part 1: Add a nsContentUtils::IsNonSubresourceRequest helper; r=jdm (b509cc3cc9)
- Bug 1213150 - Part 2: Rework ShouldPrepareForIntercept() in terms of subresource requests; r=jdm (2e92fe8780)
- Bug 1213150 - Part 3: Remove nsIInterceptedChannel.isNavigation; r=jdm (becf1cc12f)
- Bug 1213150 follow-up: fix build bustage (8d73d6ca73)
- Bug 1198394 - Part 1: Allow interception of HSTS upgraded connections in non-e10s mode; r=mcmanus (f504c5be08)
- Bug 1198394 - Part 2: Add a test for interception of HSTS upgraded connections; r=jdm (054e984eef)
- Bug 1187011 - Don't allow response body with null body status. r=bkelly (b1860741d1)
- missing bit of 1140788 (29d319712e)
- Bug 1213436 - Reject core dumps with node IDs that don't fit in an IEEE 754 double; r=sfink (3c1f6fdda0)
- Bug 1211006 - Add Debugger.Source.prototype.canonicalId; r=ejpbruel (eef7b79fce)
- Bug 1199218 - Implement JS::ubi::Node::size for js::LazyScript referents; r=sfink (098a48d240)
- Bug 1220031 - Add JS::ubi::Node::scriptFilename; r=sfink (6b824ae680)
- Bug 1143575. Remove unused MediaQueue::Empty. r=cpearce (de737f3433)
- Bug 1209933 - Make sure all parent runtime pointers are the topmost parent, r=billm. (fe824d967d)
- Bug 1197012 - Fix ThrowTypeError in Notification. r=mccr8 (0b1a097526)
- Bug 1197893 - Check the number of arguments for ThrowTypeError() and ThrowRangeError() at compile time. r=peterv (d98c7d78a0)
- Bug 1142083 - Add test for IDN Unicode domain redirect. r=mcmanus (0c8961fe17)
- Bug 1187159 - Add mochitest for loading packaged apps (iframe+fetch+mozapp) r=jduell (ce90ea561b)
- Bug 1186290 - Notify TabParent to switch process when loading a signed package. r=honzab, r=kanru. (c58a14554a)
- fix (15e2df75eb)
- Bug 1206124 P1 Fix "same-origin" CORS credentials in FetchDriver. r=ehsan (fae1bb6ab3)
- Bug 1206124 P2 Test fetch() with credentials and redirects. r=ehsan (ffc6254112)
- Bug 1211751: Remove nsIChannelEventSink-forwarding from EventSource and FetchDriver. It's never needed. r=smaug (adafe5737a)
- Bug 1212433 Fail fetch() calls that require preflight and also redirect. r=sicking a=abillings (c0d6742b9e)
- Bug 1193128 - Fix base64 decoding when fetching data URIs. r=baku (80bafa291a)
- Bug 1195167 part 1: Let necko handle all protocols. r=bkelly (bb932b0ada)
- Bug 1195167 part 2: Remove redundant aCORSFlag argument and instead use mCORSFlagEverSet. r=bkelly (beadafcad0)
- Bug 1195167 part 3: Remove more scheme-specific handling from FetchDriver. r=bkelly (d00b38db9e)
- Bug 1195167 part 4: Remove FetchDriver::BasicFetch since it is empty. r=bkelly (c5ed097267)
- Bug 1210413 P2 Test CORS credentials on cross-origin redirects. r=sicking a=dveditz (b4eeb8aac0)
- Bug 1210413 P1 Propagate new channel load flags from child to parent on redirect. r=jduell a=dveditz (8b329af4fa)
- Bug 1195167 part 5: Make FetchDriver use AsyncOpen2. r=bkelly (cc217c4cc1)
- Bug 1195167 part 6: Some code simplification since necko handles fetch recursion. r=bkelly (f3b6da2262)
- Bug 1195167: Followup to fix test which I forgot to change (81e7439a2e)
- Bug 1215746: Remove RequestMode::Cors_with_forced_preflight. r=bkelly (0336e812b6)
- Bug 1211000: Move CORS preflight logic from nsCORSListenerProxy to nsCORSPreflightListener. r=ehsan (bf2f71cf22)
- missing bit of Bug 1211443 - Drop scheduled update if decoder initialization isn't done yet. r=jya (f6bc074e33)
- Bug 1182571: Fix nsILoadInfo->GetContentPolicyType API to be less ambigious. Audit and fix all users of it. r=ckerschb (5af6fa7442)
- fix (e40c8e7625)
- Bug 1173811 - Part 1: Propagate the response URL to intercepted channels when necessary (non-e10s). r=mayhemer,bkelly (26f4f13c28)
- Bug 1173811 - Part 2: Propagate the response URL to intercepted channels when necessary (e10s). r=mayhemer,bkelly (a603fe1df2)
- Bug 1154309 - Add New Resource Timing Fields r=bz,hurley (1d14eb6bef)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (a5d18bb637)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (fb07d2c8aa)
- Bug 1212904 P1 Add a LoadTainting enumeration. r=jduell (a1db8a3e99)
- Bug 1212904 P2 Add LoadTainting information to nsILoadInfo. r=jduell (2482e5e334)
- Bug 1221151 - use [infallible] in nsILoadInfo.idl instead of manual %{C++ blocks; r=jduell (aae73129b6)
- Bug 1045891 - CSP 2 child-src implementation r=ckerschb (792920aeb9)
- Bug 1219931 - CSP: Don't allow removing a policy (r=sicking) (9daaab4186)
- Bug 1208661 - Dump client-side layer textures. r=BenWa (1f2d17d515)
This commit is contained in:
@@ -609,7 +609,7 @@ SendPing(void* aClosure, nsIContent* aContent, nsIURI* aURI,
|
||||
loadGroup->SetNotificationCallbacks(callbacks);
|
||||
chan->SetLoadGroup(loadGroup);
|
||||
|
||||
nsRefPtr<nsPingListener> pingListener = new nsPingListener();
|
||||
RefPtr<nsPingListener> pingListener = new nsPingListener();
|
||||
chan->AsyncOpen2(pingListener);
|
||||
|
||||
// Even if AsyncOpen failed, we still count this as a successful ping. It's
|
||||
@@ -1830,7 +1830,7 @@ nsDocShell::GetPresContext(nsPresContext** aPresContext)
|
||||
NS_IMETHODIMP_(nsIPresShell*)
|
||||
nsDocShell::GetPresShell()
|
||||
{
|
||||
nsRefPtr<nsPresContext> presContext;
|
||||
RefPtr<nsPresContext> presContext;
|
||||
(void)GetPresContext(getter_AddRefs(presContext));
|
||||
return presContext ? presContext->GetPresShell() : nullptr;
|
||||
}
|
||||
@@ -1843,7 +1843,7 @@ nsDocShell::GetEldestPresShell(nsIPresShell** aPresShell)
|
||||
NS_ENSURE_ARG_POINTER(aPresShell);
|
||||
*aPresShell = nullptr;
|
||||
|
||||
nsRefPtr<nsPresContext> presContext;
|
||||
RefPtr<nsPresContext> presContext;
|
||||
(void)GetEldestPresContext(getter_AddRefs(presContext));
|
||||
|
||||
if (presContext) {
|
||||
@@ -2539,7 +2539,7 @@ nsDocShell::GetFullscreenAllowed(bool* aFullscreenAllowed)
|
||||
// If we have no parent then we're the root docshell; no ancestor of the
|
||||
// original docshell doesn't have a allowfullscreen attribute, so
|
||||
// report fullscreen as allowed.
|
||||
nsRefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
RefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
if (!parent) {
|
||||
*aFullscreenAllowed = true;
|
||||
return NS_OK;
|
||||
@@ -2605,7 +2605,7 @@ nsDocShell::GetDocShellEnumerator(int32_t aItemType, int32_t aDirection,
|
||||
NS_ENSURE_ARG_POINTER(aResult);
|
||||
*aResult = nullptr;
|
||||
|
||||
nsRefPtr<nsDocShellEnumerator> docShellEnum;
|
||||
RefPtr<nsDocShellEnumerator> docShellEnum;
|
||||
if (aDirection == ENUMERATE_FORWARDS) {
|
||||
docShellEnum = new nsDocShellForwardsEnumerator;
|
||||
} else {
|
||||
@@ -2894,7 +2894,7 @@ nsDocShell::Now(DOMHighResTimeStamp* aWhen)
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::SetWindowDraggingAllowed(bool aValue)
|
||||
{
|
||||
nsRefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
RefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
if (!aValue && mItemType == typeChrome && !parent) {
|
||||
// Window dragging is always allowed for top level
|
||||
// chrome docshells.
|
||||
@@ -2910,7 +2910,7 @@ nsDocShell::GetWindowDraggingAllowed(bool* aValue)
|
||||
// window dragging regions in CSS (-moz-window-drag:drag)
|
||||
// can be slow. Default behavior is to only allow it for
|
||||
// chrome top level windows.
|
||||
nsRefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
RefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
if (mItemType == typeChrome && !parent) {
|
||||
// Top level chrome window
|
||||
*aValue = true;
|
||||
@@ -2972,7 +2972,7 @@ nsDocShell::GetSessionStorageForPrincipal(nsIPrincipal* aPrincipal,
|
||||
nsresult
|
||||
nsDocShell::AddSessionStorage(nsIPrincipal* aPrincipal, nsIDOMStorage* aStorage)
|
||||
{
|
||||
nsRefPtr<DOMStorage> storage = static_cast<DOMStorage*>(aStorage);
|
||||
RefPtr<DOMStorage> storage = static_cast<DOMStorage*>(aStorage);
|
||||
if (!storage) {
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
@@ -3151,7 +3151,7 @@ nsDocShell::SetItemType(int32_t aItemType)
|
||||
// disable auth prompting for anything but content
|
||||
mAllowAuth = mItemType == typeContent;
|
||||
|
||||
nsRefPtr<nsPresContext> presContext = nullptr;
|
||||
RefPtr<nsPresContext> presContext = nullptr;
|
||||
GetPresContext(getter_AddRefs(presContext));
|
||||
if (presContext) {
|
||||
presContext->UpdateIsChrome();
|
||||
@@ -3184,7 +3184,7 @@ void
|
||||
nsDocShell::RecomputeCanExecuteScripts()
|
||||
{
|
||||
bool old = mCanExecuteScripts;
|
||||
nsRefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
RefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
|
||||
// If we have no tree owner, that means that we've been detached from the
|
||||
// docshell tree (this is distinct from having no parent dochshell, which
|
||||
@@ -3349,8 +3349,8 @@ nsDocShell::GetRootTreeItem(nsIDocShellTreeItem** aRootTreeItem)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aRootTreeItem);
|
||||
|
||||
nsRefPtr<nsDocShell> root = this;
|
||||
nsRefPtr<nsDocShell> parent = root->GetParentDocshell();
|
||||
RefPtr<nsDocShell> root = this;
|
||||
RefPtr<nsDocShell> parent = root->GetParentDocshell();
|
||||
while (parent) {
|
||||
root = parent;
|
||||
parent = root->GetParentDocshell();
|
||||
@@ -3761,7 +3761,7 @@ PrintDocTree(nsIDocShellTreeItem* aParentNode, int aLevel)
|
||||
nsCOMPtr<nsIDocShell> parentAsDocShell(do_QueryInterface(aParentNode));
|
||||
int32_t type = aParentNode->ItemType();
|
||||
nsCOMPtr<nsIPresShell> presShell = parentAsDocShell->GetPresShell();
|
||||
nsRefPtr<nsPresContext> presContext;
|
||||
RefPtr<nsPresContext> presContext;
|
||||
parentAsDocShell->GetPresContext(getter_AddRefs(presContext));
|
||||
nsIDocument* doc = presShell->GetDocument();
|
||||
|
||||
@@ -3904,7 +3904,7 @@ nsDocShell::AddChild(nsIDocShellTreeItem* aChild)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aChild);
|
||||
|
||||
nsRefPtr<nsDocLoader> childAsDocLoader = GetAsDocLoader(aChild);
|
||||
RefPtr<nsDocLoader> childAsDocLoader = GetAsDocLoader(aChild);
|
||||
NS_ENSURE_TRUE(childAsDocLoader, NS_ERROR_UNEXPECTED);
|
||||
|
||||
// Make sure we're not creating a loop in the docshell tree
|
||||
@@ -4016,7 +4016,7 @@ nsDocShell::RemoveChild(nsIDocShellTreeItem* aChild)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aChild);
|
||||
|
||||
nsRefPtr<nsDocLoader> childAsDocLoader = GetAsDocLoader(aChild);
|
||||
RefPtr<nsDocLoader> childAsDocLoader = GetAsDocLoader(aChild);
|
||||
NS_ENSURE_TRUE(childAsDocLoader, NS_ERROR_UNEXPECTED);
|
||||
|
||||
nsresult rv = RemoveChildLoader(childAsDocLoader);
|
||||
@@ -4397,7 +4397,7 @@ nsDocShell::SetDeviceSizeIsPageSize(bool aValue)
|
||||
{
|
||||
if (mDeviceSizeIsPageSize != aValue) {
|
||||
mDeviceSizeIsPageSize = aValue;
|
||||
nsRefPtr<nsPresContext> presContext;
|
||||
RefPtr<nsPresContext> presContext;
|
||||
GetPresContext(getter_AddRefs(presContext));
|
||||
if (presContext) {
|
||||
presContext->MediaFeatureValuesChanged(nsRestyleHint(0));
|
||||
@@ -5906,8 +5906,8 @@ nsDocShell::GetVisibility(bool* aVisibility)
|
||||
// for a hidden view, unless we're an off screen browser, which
|
||||
// would make this test meaningless.
|
||||
|
||||
nsRefPtr<nsDocShell> docShell = this;
|
||||
nsRefPtr<nsDocShell> parentItem = docShell->GetParentDocshell();
|
||||
RefPtr<nsDocShell> docShell = this;
|
||||
RefPtr<nsDocShell> parentItem = docShell->GetParentDocshell();
|
||||
while (parentItem) {
|
||||
presShell = docShell->GetPresShell();
|
||||
|
||||
@@ -8241,7 +8241,7 @@ nsDocShell::RestorePresentation(nsISHEntry* aSHEntry, bool* aRestoring)
|
||||
"should only have one RestorePresentationEvent");
|
||||
mRestorePresentationEvent.Revoke();
|
||||
|
||||
nsRefPtr<RestorePresentationEvent> evt = new RestorePresentationEvent(this);
|
||||
RefPtr<RestorePresentationEvent> evt = new RestorePresentationEvent(this);
|
||||
nsresult rv = NS_DispatchToCurrentThread(evt);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
mRestorePresentationEvent = evt.get();
|
||||
@@ -8281,7 +8281,7 @@ public:
|
||||
private:
|
||||
nsRevocableEventPtr<nsDocShell::RestorePresentationEvent>&
|
||||
mRestorePresentationEvent;
|
||||
nsRefPtr<nsDocShell::RestorePresentationEvent> mEvent;
|
||||
RefPtr<nsDocShell::RestorePresentationEvent> mEvent;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
@@ -8354,7 +8354,7 @@ nsDocShell::RestoreFromHistory()
|
||||
// to be consistent with normal document loading, subframes cannot start
|
||||
// loading until after data arrives, which is after STATE_START completes.
|
||||
|
||||
nsRefPtr<RestorePresentationEvent> currentPresentationRestoration =
|
||||
RefPtr<RestorePresentationEvent> currentPresentationRestoration =
|
||||
mRestorePresentationEvent.get();
|
||||
Stop();
|
||||
// Make sure we're still restoring the same presentation.
|
||||
@@ -8566,7 +8566,7 @@ nsDocShell::RestoreFromHistory()
|
||||
nsCOMPtr<nsIDocument> document = do_QueryInterface(domDoc);
|
||||
uint32_t parentSuspendCount = 0;
|
||||
if (document) {
|
||||
nsRefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
RefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
if (parent) {
|
||||
nsCOMPtr<nsIDocument> d = parent->GetDocument();
|
||||
if (d) {
|
||||
@@ -9406,7 +9406,7 @@ private:
|
||||
nsXPIDLCString mTypeHint;
|
||||
nsString mSrcdoc;
|
||||
|
||||
nsRefPtr<nsDocShell> mDocShell;
|
||||
RefPtr<nsDocShell> mDocShell;
|
||||
nsCOMPtr<nsIURI> mURI;
|
||||
nsCOMPtr<nsIURI> mOriginalURI;
|
||||
bool mLoadReplace;
|
||||
@@ -9552,7 +9552,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
|
||||
requestingElement = mScriptGlobal->GetFrameElementInternal();
|
||||
}
|
||||
|
||||
nsRefPtr<nsGlobalWindow> MMADeathGrip = mScriptGlobal;
|
||||
RefPtr<nsGlobalWindow> MMADeathGrip = mScriptGlobal;
|
||||
|
||||
int16_t shouldLoad = nsIContentPolicy::ACCEPT;
|
||||
uint32_t contentType;
|
||||
@@ -10085,7 +10085,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
|
||||
// applies to aURI.
|
||||
CopyFavicon(currentURI, aURI, mInPrivateBrowsing);
|
||||
|
||||
nsRefPtr<nsGlobalWindow> win = mScriptGlobal ?
|
||||
RefPtr<nsGlobalWindow> win = mScriptGlobal ?
|
||||
mScriptGlobal->GetCurrentInnerWindowInternal() : nullptr;
|
||||
|
||||
// ScrollToAnchor doesn't necessarily cause us to scroll the window;
|
||||
@@ -13118,7 +13118,7 @@ nsDocShell::GetNestedFrameId(uint64_t* aId)
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::IsAppOfType(uint32_t aAppType, bool* aIsOfType)
|
||||
{
|
||||
nsRefPtr<nsDocShell> shell = this;
|
||||
RefPtr<nsDocShell> shell = this;
|
||||
while (shell) {
|
||||
uint32_t type;
|
||||
shell->GetAppType(&type);
|
||||
@@ -13346,7 +13346,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
nsRefPtr<nsDocShell> mHandler;
|
||||
RefPtr<nsDocShell> mHandler;
|
||||
nsCOMPtr<nsIURI> mURI;
|
||||
nsString mTargetSpec;
|
||||
nsString mFileName;
|
||||
@@ -13874,7 +13874,7 @@ OriginAttributes
|
||||
nsDocShell::GetOriginAttributes()
|
||||
{
|
||||
OriginAttributes attrs;
|
||||
nsRefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
RefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
if (parent) {
|
||||
attrs.InheritFromDocShellParent(parent->GetOriginAttributes());
|
||||
}
|
||||
@@ -13934,7 +13934,7 @@ nsDocShell::GetAsyncPanZoomEnabled(bool* aOut)
|
||||
bool
|
||||
nsDocShell::HasUnloadedParent()
|
||||
{
|
||||
nsRefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
RefPtr<nsDocShell> parent = GetParentDocshell();
|
||||
while (parent) {
|
||||
bool inUnload = false;
|
||||
parent->GetIsInUnload(&inUnload);
|
||||
@@ -14035,8 +14035,7 @@ nsDocShell::MaybeNotifyKeywordSearchLoading(const nsString& aProvider,
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDocShell::ShouldPrepareForIntercept(nsIURI* aURI, bool aIsNavigate,
|
||||
nsContentPolicyType aLoadContentType,
|
||||
nsDocShell::ShouldPrepareForIntercept(nsIURI* aURI, bool aIsNonSubresourceRequest,
|
||||
bool* aShouldIntercept)
|
||||
{
|
||||
*aShouldIntercept = false;
|
||||
@@ -14055,7 +14054,7 @@ nsDocShell::ShouldPrepareForIntercept(nsIURI* aURI, bool aIsNavigate,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
|
||||
RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
|
||||
if (!swm) {
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -14089,7 +14088,7 @@ nsDocShell::ShouldPrepareForIntercept(nsIURI* aURI, bool aIsNavigate,
|
||||
}
|
||||
}
|
||||
|
||||
if (aIsNavigate || nsContentUtils::IsWorkerLoad(aLoadContentType)) {
|
||||
if (aIsNonSubresourceRequest) {
|
||||
OriginAttributes attrs(GetAppId(), GetIsInBrowserElement());
|
||||
*aShouldIntercept = swm->IsAvailable(attrs, aURI);
|
||||
return NS_OK;
|
||||
@@ -14138,7 +14137,7 @@ NS_IMPL_ISUPPORTS(FetchEventDispatcher, nsIFetchEventDispatcher)
|
||||
NS_IMETHODIMP
|
||||
FetchEventDispatcher::Dispatch()
|
||||
{
|
||||
nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
|
||||
RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
|
||||
if (!swm) {
|
||||
mChannel->Cancel(NS_ERROR_INTERCEPTION_FAILED);
|
||||
return NS_OK;
|
||||
@@ -14159,24 +14158,19 @@ NS_IMETHODIMP
|
||||
nsDocShell::ChannelIntercepted(nsIInterceptedChannel* aChannel,
|
||||
nsIFetchEventDispatcher** aFetchDispatcher)
|
||||
{
|
||||
nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
|
||||
RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
|
||||
if (!swm) {
|
||||
aChannel->Cancel(NS_ERROR_INTERCEPTION_FAILED);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
bool isNavigation = false;
|
||||
nsresult rv = aChannel->GetIsNavigation(&isNavigation);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsContentPolicyType loadType;
|
||||
rv = aChannel->GetInternalContentPolicyType(&loadType);
|
||||
nsCOMPtr<nsIChannel> channel;
|
||||
nsresult rv = aChannel->GetChannel(getter_AddRefs(channel));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsCOMPtr<nsIDocument> doc;
|
||||
|
||||
bool isSubresourceLoad = !isNavigation &&
|
||||
!nsContentUtils::IsWorkerLoad(loadType);
|
||||
bool isSubresourceLoad = !nsContentUtils::IsNonSubresourceRequest(channel);
|
||||
if (isSubresourceLoad) {
|
||||
doc = GetDocument();
|
||||
if (!doc) {
|
||||
@@ -14196,7 +14190,7 @@ nsDocShell::ChannelIntercepted(nsIInterceptedChannel* aChannel,
|
||||
}
|
||||
|
||||
MOZ_ASSERT(runnable);
|
||||
nsRefPtr<FetchEventDispatcher> dispatcher =
|
||||
RefPtr<FetchEventDispatcher> dispatcher =
|
||||
new FetchEventDispatcher(aChannel, runnable);
|
||||
dispatcher.forget(aFetchDispatcher);
|
||||
|
||||
@@ -14237,7 +14231,7 @@ nsDocShell::GetPaymentRequestId(nsAString& aPaymentRequestId)
|
||||
bool
|
||||
nsDocShell::InFrameSwap()
|
||||
{
|
||||
nsRefPtr<nsDocShell> shell = this;
|
||||
RefPtr<nsDocShell> shell = this;
|
||||
do {
|
||||
if (shell->mInFrameSwap) {
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user