diff --git a/accessible/base/DocManager.cpp b/accessible/base/DocManager.cpp index 3dfcd58736..3ef6786ae0 100644 --- a/accessible/base/DocManager.cpp +++ b/accessible/base/DocManager.cpp @@ -177,11 +177,11 @@ DocManager::OnStateChange(nsIWebProgress* aWebProgress, aWebProgress->GetDOMWindow(getter_AddRefs(DOMWindow)); NS_ENSURE_STATE(DOMWindow); - nsCOMPtr DOMDocument; - DOMWindow->GetDocument(getter_AddRefs(DOMDocument)); - NS_ENSURE_STATE(DOMDocument); + nsCOMPtr piWindow = do_QueryInterface(DOMWindow); + MOZ_ASSERT(piWindow); - nsCOMPtr document(do_QueryInterface(DOMDocument)); + nsCOMPtr document = piWindow->GetDoc(); + NS_ENSURE_STATE(document); // Document was loaded. if (aStateFlags & STATE_STOP) { diff --git a/accessible/generic/ApplicationAccessible.cpp b/accessible/generic/ApplicationAccessible.cpp index 4a2f1a3875..69537e26b8 100644 --- a/accessible/generic/ApplicationAccessible.cpp +++ b/accessible/generic/ApplicationAccessible.cpp @@ -1,5 +1,5 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* vim:expandtab:shiftwidth=4:tabstop=4: +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:expandtab:shiftwidth=2:tabstop=2: */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -193,12 +193,10 @@ ApplicationAccessible::CacheChildren() while (hasMore) { nsCOMPtr window; windowEnumerator->GetNext(getter_AddRefs(window)); - nsCOMPtr DOMWindow = do_QueryInterface(window); + nsCOMPtr DOMWindow = do_QueryInterface(window); if (DOMWindow) { - nsCOMPtr DOMDocument; - DOMWindow->GetDocument(getter_AddRefs(DOMDocument)); - if (DOMDocument) { - nsCOMPtr docNode(do_QueryInterface(DOMDocument)); + nsCOMPtr docNode = DOMWindow->GetDoc(); + if (docNode) { GetAccService()->GetDocAccessible(docNode); // ensure creation } } diff --git a/accessible/generic/RootAccessible.cpp b/accessible/generic/RootAccessible.cpp index 6f16826ef7..b2077824e4 100644 --- a/accessible/generic/RootAccessible.cpp +++ b/accessible/generic/RootAccessible.cpp @@ -488,11 +488,9 @@ RootAccessible::RelationByType(RelationType aType) nsPIDOMWindow* rootWindow = mDocumentNode->GetWindow(); if (rootWindow) { nsCOMPtr contentWindow = nsGlobalWindow::Cast(rootWindow)->GetContent(); - if (contentWindow) { - nsCOMPtr contentDOMDocument; - contentWindow->GetDocument(getter_AddRefs(contentDOMDocument)); - nsCOMPtr contentDocumentNode = - do_QueryInterface(contentDOMDocument); + nsCOMPtr piWindow = do_QueryInterface(contentWindow); + if (piWindow) { + nsCOMPtr contentDocumentNode = piWindow->GetDoc(); if (contentDocumentNode) { DocAccessible* contentDocument = GetAccService()->GetDocAccessible(contentDocumentNode); diff --git a/accessible/windows/msaa/moz.build b/accessible/windows/msaa/moz.build index ad8169f4f6..64f811da66 100644 --- a/accessible/windows/msaa/moz.build +++ b/accessible/windows/msaa/moz.build @@ -55,6 +55,7 @@ LOCAL_INCLUDES += [ '/accessible/xpcom', '/accessible/xul', '/dom/base', + '/layout/style', ] include('/ipc/chromium/chromium-config.mozbuild') diff --git a/accessible/windows/msaa/nsWinUtils.cpp b/accessible/windows/msaa/nsWinUtils.cpp index 96a2ddb32f..15a9701a5e 100644 --- a/accessible/windows/msaa/nsWinUtils.cpp +++ b/accessible/windows/msaa/nsWinUtils.cpp @@ -15,13 +15,15 @@ #include "mozilla/Preferences.h" #include "nsArrayUtils.h" #include "nsIArray.h" +#include "nsICSSDeclaration.h" #include "nsIDocument.h" #include "nsIDocShellTreeItem.h" -#include "nsIDOMElement.h" +#include "mozilla/dom/Element.h" #include "nsXULAppAPI.h" using namespace mozilla; using namespace mozilla::a11y; +using mozilla::dom::Element; // Window property used by ipc related code in identifying accessible // tab windows. @@ -43,15 +45,18 @@ nsWinUtils::GetComputedStyleDeclaration(nsIContent* aContent) return nullptr; // Returns number of items in style declaration - nsCOMPtr window = + nsCOMPtr window = do_QueryInterface(elm->OwnerDoc()->GetWindow()); if (!window) return nullptr; - nsCOMPtr cssDecl; - nsCOMPtr domElement(do_QueryInterface(elm)); - window->GetComputedStyle(domElement, EmptyString(), getter_AddRefs(cssDecl)); - return cssDecl.forget(); + ErrorResult dummy; + nsCOMPtr cssDecl; + nsCOMPtr domElement(do_QueryInterface(elm)); + cssDecl = window->GetComputedStyle(*domElement, EmptyString(), dummy); + nsCOMPtr domDecl = do_QueryInterface(cssDecl); + dummy.SuppressException(); + return domDecl.forget(); } bool diff --git a/chrome/moz.build b/chrome/moz.build index 2ba1c2ce39..c4ee0f64f5 100644 --- a/chrome/moz.build +++ b/chrome/moz.build @@ -33,6 +33,7 @@ GENERATED_INCLUDES += [ ] LOCAL_INCLUDES += [ + '/dom/base', '/netwerk/base', '/netwerk/protocol/res', '/xpcom/components' diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp index 0fa65ca3f3..0d6f91b263 100644 --- a/chrome/nsChromeRegistry.cpp +++ b/chrome/nsChromeRegistry.cpp @@ -313,15 +313,10 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) // theme stuff -static void FlushSkinBindingsForWindow(nsIDOMWindow* aWindow) +static void FlushSkinBindingsForWindow(nsPIDOMWindow* aWindow) { - // Get the DOM document. - nsCOMPtr domDocument; - aWindow->GetDocument(getter_AddRefs(domDocument)); - if (!domDocument) - return; - - nsCOMPtr document = do_QueryInterface(domDocument); + // Get the document. + nsCOMPtr document = aWindow->GetDoc(); if (!document) return; @@ -345,7 +340,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins() nsCOMPtr protoWindow; windowEnumerator->GetNext(getter_AddRefs(protoWindow)); if (protoWindow) { - nsCOMPtr domWindow = do_QueryInterface(protoWindow); + nsCOMPtr domWindow = do_QueryInterface(protoWindow); if (domWindow) FlushSkinBindingsForWindow(domWindow); } @@ -360,7 +355,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins() nsCOMPtr protoWindow; windowEnumerator->GetNext(getter_AddRefs(protoWindow)); if (protoWindow) { - nsCOMPtr domWindow = do_QueryInterface(protoWindow); + nsCOMPtr domWindow = do_QueryInterface(protoWindow); if (domWindow) RefreshWindow(domWindow); } @@ -382,28 +377,23 @@ nsChromeRegistry::FlushSkinCaches() } // XXXbsmedberg: move this to windowmediator -nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow) +nsresult nsChromeRegistry::RefreshWindow(nsPIDOMWindow* aWindow) { // Deal with our subframes first. - nsCOMPtr frames; - aWindow->GetFrames(getter_AddRefs(frames)); + nsCOMPtr frames = aWindow->GetFrames(); uint32_t length; frames->GetLength(&length); uint32_t j; for (j = 0; j < length; j++) { nsCOMPtr childWin; frames->Item(j, getter_AddRefs(childWin)); - RefreshWindow(childWin); + nsCOMPtr piWindow = do_QueryInterface(childWin); + RefreshWindow(piWindow); } nsresult rv; - // Get the DOM document. - nsCOMPtr domDocument; - aWindow->GetDocument(getter_AddRefs(domDocument)); - if (!domDocument) - return NS_OK; - - nsCOMPtr document = do_QueryInterface(domDocument); + // Get the document. + nsCOMPtr document = aWindow->GetDoc(); if (!document) return NS_OK; @@ -521,10 +511,9 @@ nsChromeRegistry::ReloadChrome() nsCOMPtr protoWindow; rv = windowEnumerator->GetNext(getter_AddRefs(protoWindow)); if (NS_SUCCEEDED(rv)) { - nsCOMPtr domWindow = do_QueryInterface(protoWindow); + nsCOMPtr domWindow = do_QueryInterface(protoWindow); if (domWindow) { - nsCOMPtr location; - domWindow->GetLocation(getter_AddRefs(location)); + nsIDOMLocation* location = domWindow->GetLocation(); if (location) { rv = location->Reload(false); if (NS_FAILED(rv)) return rv; diff --git a/chrome/nsChromeRegistry.h b/chrome/nsChromeRegistry.h index fae047b747..904cab4d32 100644 --- a/chrome/nsChromeRegistry.h +++ b/chrome/nsChromeRegistry.h @@ -22,7 +22,7 @@ #include "mozilla/FileLocation.h" -class nsIDOMWindow; +class nsPIDOMWindow; class nsIPrefBranch; class nsIURL; @@ -95,7 +95,7 @@ protected: nsresult SelectLocaleFromPref(nsIPrefBranch* prefs); - static nsresult RefreshWindow(nsIDOMWindow* aWindow); + static nsresult RefreshWindow(nsPIDOMWindow* aWindow); static nsresult GetProviderAndPath(nsIURL* aChromeURL, nsACString& aProvider, nsACString& aPath); diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 5252b596ed..fee2b048c2 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -5011,17 +5011,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, error.AssignLiteral("corruptedContentError"); break; case NS_ERROR_INTERCEPTION_FAILED: - case NS_ERROR_OPAQUE_INTERCEPTION_DISABLED: - case NS_ERROR_BAD_OPAQUE_INTERCEPTION_REQUEST_MODE: - case NS_ERROR_INTERCEPTED_ERROR_RESPONSE: - case NS_ERROR_INTERCEPTED_USED_RESPONSE: - case NS_ERROR_CLIENT_REQUEST_OPAQUE_INTERCEPTION: - case NS_ERROR_BAD_OPAQUE_REDIRECT_INTERCEPTION: - case NS_ERROR_INTERCEPTION_CANCELED: - case NS_ERROR_REJECTED_RESPONSE_INTERCEPTION: // ServiceWorker intercepted request, but something went wrong. - nsContentUtils::MaybeReportInterceptionErrorToConsole(GetDocument(), - aError); error.AssignLiteral("corruptedContentError"); break; default: @@ -7508,7 +7498,7 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress, return NS_OK; } - thisWindow->GetFrameElement(getter_AddRefs(frameElement)); + frameElement = thisWindow->GetFrameElement(); if (!frameElement) { return NS_OK; } @@ -7701,15 +7691,7 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress, aStatus == NS_ERROR_UNWANTED_URI || aStatus == NS_ERROR_UNSAFE_CONTENT_TYPE || aStatus == NS_ERROR_REMOTE_XUL || - aStatus == NS_ERROR_OFFLINE || aStatus == NS_ERROR_INTERCEPTION_FAILED || - aStatus == NS_ERROR_OPAQUE_INTERCEPTION_DISABLED || - aStatus == NS_ERROR_BAD_OPAQUE_INTERCEPTION_REQUEST_MODE || - aStatus == NS_ERROR_INTERCEPTED_ERROR_RESPONSE || - aStatus == NS_ERROR_INTERCEPTED_USED_RESPONSE || - aStatus == NS_ERROR_CLIENT_REQUEST_OPAQUE_INTERCEPTION || - aStatus == NS_ERROR_INTERCEPTION_CANCELED || - aStatus == NS_ERROR_REJECTED_RESPONSE_INTERCEPTION || NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_SECURITY) { // Errors to be shown for any frame DisplayLoadError(aStatus, url, nullptr, aChannel); diff --git a/docshell/base/nsDocShellEditorData.cpp b/docshell/base/nsDocShellEditorData.cpp index 66a510edfb..c0d06809d2 100644 --- a/docshell/base/nsDocShellEditorData.cpp +++ b/docshell/base/nsDocShellEditorData.cpp @@ -158,9 +158,9 @@ nsDocShellEditorData::DetachFromWindow() mDetachedMakeEditable = mMakeEditable; mMakeEditable = false; - nsCOMPtr domDoc; - domWindow->GetDocument(getter_AddRefs(domDoc)); - nsCOMPtr htmlDoc = do_QueryInterface(domDoc); + nsCOMPtr window = do_QueryInterface(domWindow); + nsCOMPtr doc = window->GetDoc(); + nsCOMPtr htmlDoc = do_QueryInterface(doc); if (htmlDoc) { mDetachedEditingState = htmlDoc->GetEditingState(); } @@ -183,9 +183,9 @@ nsDocShellEditorData::ReattachToWindow(nsIDocShell* aDocShell) mIsDetached = false; mMakeEditable = mDetachedMakeEditable; - nsCOMPtr domDoc; - domWindow->GetDocument(getter_AddRefs(domDoc)); - nsCOMPtr htmlDoc = do_QueryInterface(domDoc); + nsCOMPtr window = do_QueryInterface(domWindow); + nsCOMPtr doc = window->GetDoc(); + nsCOMPtr htmlDoc = do_QueryInterface(doc); if (htmlDoc) { htmlDoc->SetEditingState(mDetachedEditingState); } diff --git a/dom/base/ConsoleReportCollector.cpp b/dom/base/ConsoleReportCollector.cpp index 73cbdf6ebc..462f7242c5 100644 --- a/dom/base/ConsoleReportCollector.cpp +++ b/dom/base/ConsoleReportCollector.cpp @@ -41,10 +41,15 @@ ConsoleReportCollector::FlushConsoleReports(nsIDocument* aDocument) { MOZ_ASSERT(NS_IsMainThread()); - MutexAutoLock lock(mMutex); + nsTArray reports; - for (uint32_t i = 0; i < mPendingReports.Length(); ++i) { - PendingReport& report = mPendingReports[i]; + { + MutexAutoLock lock(mMutex); + mPendingReports.SwapElements(reports); + } + + for (uint32_t i = 0; i < reports.Length(); ++i) { + PendingReport& report = reports[i]; // It would be nice if we did not have to do this since ReportToConsole() // just turns around and converts it back to a spec. @@ -56,24 +61,22 @@ ConsoleReportCollector::FlushConsoleReports(nsIDocument* aDocument) // Convert back from nsTArray to the char16_t** format required // by our l10n libraries and ReportToConsole. (bug 1219762) - UniquePtr params; + UniquePtr params; uint32_t paramsLength = report.mStringParams.Length(); if (paramsLength > 0) { - params.reset(new char16_t*[paramsLength]); + params = MakeUnique(paramsLength); for (uint32_t j = 0; j < paramsLength; ++j) { - params.get()[j] = const_cast(report.mStringParams[j].get()); + params[j] = report.mStringParams[j].get(); } } nsContentUtils::ReportToConsole(report.mErrorFlags, report.mCategory, aDocument, report.mPropertiesFile, report.mMessageName.get(), - const_cast(params.get()), + params.get(), paramsLength, uri, EmptyString(), report.mLineNumber, report.mColumnNumber); } - - mPendingReports.Clear(); } ConsoleReportCollector::~ConsoleReportCollector() diff --git a/dom/base/nsContentAreaDragDrop.cpp b/dom/base/nsContentAreaDragDrop.cpp index 240ec7b970..cb2394aad4 100644 --- a/dom/base/nsContentAreaDragDrop.cpp +++ b/dom/base/nsContentAreaDragDrop.cpp @@ -393,7 +393,7 @@ DragDataProducer::Produce(DataTransfer* aDataTransfer, return NS_OK; } else { - mWindow->GetSelection(getter_AddRefs(selection)); + selection = mWindow->GetSelection(); if (!selection) return NS_OK; diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index ae1d43e4f5..a124f6dd36 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -36,6 +36,7 @@ #include "mozilla/CheckedInt.h" #include "mozilla/DebugOnly.h" #include "mozilla/LoadInfo.h" +#include "mozilla/dom/ContentChild.h" #include "mozilla/dom/DocumentFragment.h" #include "mozilla/dom/DOMTypes.h" #include "mozilla/dom/Element.h" @@ -188,6 +189,7 @@ #include "nsViewManager.h" #include "nsViewportInfo.h" #include "nsWidgetsCID.h" +#include "nsIWindowProvider.h" #include "nsWrapperCacheInlines.h" #include "nsXULPopupManager.h" #include "xpcprivate.h" // nsXPConnect @@ -3482,42 +3484,6 @@ nsContentUtils::ReportToConsole(uint32_t aErrorFlags, aLineNumber, aColumnNumber); } -/* static */ nsresult -nsContentUtils::MaybeReportInterceptionErrorToConsole(nsIDocument* aDocument, - nsresult aError) -{ - const char* messageName = nullptr; - if (aError == NS_ERROR_INTERCEPTION_FAILED) { - messageName = "InterceptionFailed"; - } else if (aError == NS_ERROR_OPAQUE_INTERCEPTION_DISABLED) { - messageName = "OpaqueInterceptionDisabled"; - } else if (aError == NS_ERROR_BAD_OPAQUE_INTERCEPTION_REQUEST_MODE) { - messageName = "BadOpaqueInterceptionRequestMode"; - } else if (aError == NS_ERROR_INTERCEPTED_ERROR_RESPONSE) { - messageName = "InterceptedErrorResponse"; - } else if (aError == NS_ERROR_INTERCEPTED_USED_RESPONSE) { - messageName = "InterceptedUsedResponse"; - } else if (aError == NS_ERROR_CLIENT_REQUEST_OPAQUE_INTERCEPTION) { - messageName = "ClientRequestOpaqueInterception"; - } else if (aError == NS_ERROR_BAD_OPAQUE_REDIRECT_INTERCEPTION) { - messageName = "BadOpaqueRedirectInterception"; - } else if (aError == NS_ERROR_INTERCEPTION_CANCELED) { - messageName = "InterceptionCanceled"; - } else if (aError == NS_ERROR_REJECTED_RESPONSE_INTERCEPTION) { - messageName = "InterceptionRejectedResponse"; - } - - if (messageName) { - return ReportToConsole(nsIScriptError::warningFlag, - NS_LITERAL_CSTRING("Service Worker Interception"), - aDocument, - nsContentUtils::eDOM_PROPERTIES, - messageName); - } - - return NS_OK; -} - /* static */ nsresult nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText, @@ -5215,6 +5181,14 @@ nsContentUtils::RemoveScriptBlocker() sBlockedScriptRunners->RemoveElementsAt(originalFirstBlocker, blockersCount); } +/* static */ +nsIWindowProvider* +nsContentUtils::GetWindowProviderForContentProcess() +{ + MOZ_ASSERT(XRE_IsContentProcess()); + return ContentChild::GetSingleton(); +} + /* static */ void nsContentUtils::WarnScriptWasIgnored(nsIDocument* aDocument) @@ -6435,10 +6409,7 @@ nsContentUtils::FlushLayoutForTree(nsIDOMWindow* aWindow) // is O(N^2) in docshell tree depth. However, the docshell tree is // usually pretty shallow. - nsCOMPtr domDoc; - aWindow->GetDocument(getter_AddRefs(domDoc)); - nsCOMPtr doc = do_QueryInterface(domDoc); - if (doc) { + if (nsCOMPtr doc = piWin->GetDoc()) { doc->FlushPendingNotifications(Flush_Layout); } diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index a069e72cd5..2178948f32 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -102,6 +102,7 @@ class nsWrapperCache; class nsAttrValue; class nsITransferable; class nsPIWindowRoot; +class nsIWindowProvider; struct JSPropertyDescriptor; struct JSRuntime; @@ -900,9 +901,6 @@ public: uint32_t aLineNumber = 0, uint32_t aColumnNumber = 0); - static nsresult - MaybeReportInterceptionErrorToConsole(nsIDocument* aDocument, nsresult aError); - static void LogMessageToConsole(const char* aMsg, ...); /** @@ -1673,6 +1671,11 @@ public: return sScriptBlockerCount == 0; } + // XXXcatalinb: workaround for weird include error when trying to reference + // ipdl types in WindowWatcher. + static nsIWindowProvider* + GetWindowProviderForContentProcess(); + /** * Call this function if !IsSafeToRunScript() and we fail to run the script * (rather than using AddScriptRunner as we usually do). |aDocument| is diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index 843e8a10a0..a05cd5c810 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -1994,15 +1994,20 @@ nsDOMWindowUtils::GetVisitedDependentComputedStyle( aResult.Truncate(); nsCOMPtr window = do_QueryReferent(mWindow); + nsCOMPtr element = do_QueryInterface(aElement); + NS_ENSURE_STATE(window && element); + window = window->GetCurrentInnerWindow(); NS_ENSURE_STATE(window); nsCOMPtr decl; - nsresult rv = - window->GetComputedStyle(aElement, aPseudoElement, getter_AddRefs(decl)); - NS_ENSURE_SUCCESS(rv, rv); + { + ErrorResult rv; + decl = window->GetComputedStyle(*element, aPseudoElement, rv); + ENSURE_SUCCESS(rv, rv.StealNSResult()); + } static_cast(decl.get())->SetExposeVisitedStyle(true); - rv = decl->GetPropertyValue(aPropertyName, aResult); + nsresult rv = decl->GetPropertyValue(aPropertyName, aResult); static_cast(decl.get())->SetExposeVisitedStyle(false); return rv; diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 039f9ac320..4b60d50465 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -3184,12 +3184,11 @@ nsIDocument::HasFocus(ErrorResult& rv) const return false; } - // Are we an ancestor of the focused DOMWindow? - nsCOMPtr domDocument; - focusedWindow->GetDocument(getter_AddRefs(domDocument)); - nsCOMPtr document = do_QueryInterface(domDocument); + nsCOMPtr piWindow = do_QueryInterface(focusedWindow); + MOZ_ASSERT(piWindow); - for (nsIDocument* currentDoc = document; currentDoc; + // Are we an ancestor of the focused DOMWindow? + for (nsIDocument* currentDoc = piWindow->GetDoc(); currentDoc; currentDoc = currentDoc->GetParentDocument()) { if (currentDoc == this) { // Yes, we are an ancestor @@ -6953,9 +6952,11 @@ nsIDocument::GetLocation() const return nullptr; } - nsCOMPtr loc; - w->GetLocation(getter_AddRefs(loc)); - return loc.forget().downcast(); + nsGlobalWindow* window = static_cast(w.get()); + ErrorResult dummy; + RefPtr loc = window->GetLocation(dummy); + dummy.SuppressException(); + return loc.forget(); } Element* @@ -11729,9 +11730,7 @@ ShouldApplyFullscreenDirectly(nsIDocument* aDoc, } else { // If we are in the chrome process, and the window has not been in // fullscreen, we certainly need to make that fullscreen first. - bool fullscreen; - NS_WARN_IF(NS_FAILED(aRootWin->GetFullScreen(&fullscreen))); - if (!fullscreen) { + if (!aRootWin->GetFullScreen()) { return false; } // The iterator not being at end indicates there is still some diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index e8b57eaab4..253c92478c 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -440,9 +440,7 @@ nsGlobalWindow::DOMMinTimeoutValue() const { if (mIsClosed) { \ return err_rval; \ } \ - nsCOMPtr doc; \ - nsresult fwdic_nr = GetDocument(getter_AddRefs(doc)); \ - NS_ENSURE_SUCCESS(fwdic_nr, err_rval); \ + nsCOMPtr doc = GetDoc(); \ if (!mInnerWindow) { \ return err_rval; \ } \ @@ -2783,7 +2781,7 @@ nsGlobalWindow::DispatchDOMWindowCreated() void nsGlobalWindow::ClearStatus() { - SetStatus(EmptyString()); + SetStatusOuter(EmptyString()); } void @@ -2849,8 +2847,7 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell) // our window. nsCOMPtr parentWindow = GetParent(); if (parentWindow.get() != static_cast(this)) { - nsCOMPtr piWindow(do_QueryInterface(parentWindow)); - mChromeEventHandler = piWindow->GetChromeEventHandler(); + mChromeEventHandler = parentWindow->GetChromeEventHandler(); } else { mChromeEventHandler = NS_NewWindowRoot(this); @@ -2927,7 +2924,7 @@ nsGlobalWindow::DetachFromDocShell() } void -nsGlobalWindow::SetOpenerWindow(nsPIDOMWindow* aOpener, +nsGlobalWindow::SetOpenerWindow(nsIDOMWindow* aOpener, bool aOriginalOpener) { FORWARD_TO_OUTER_VOID(SetOpenerWindow, (aOpener, aOriginalOpener)); @@ -3492,48 +3489,18 @@ nsPIDOMWindow::UnmuteAudioContexts() } } -NS_IMETHODIMP -nsGlobalWindow::GetDocument(nsIDOMDocument** aDocument) -{ - nsCOMPtr document = do_QueryInterface(GetDocument()); - document.forget(aDocument); - return NS_OK; -} - nsGlobalWindow* nsGlobalWindow::Window() { return this; } -NS_IMETHODIMP -nsGlobalWindow::GetWindow(nsIDOMWindow** aWindow) -{ - FORWARD_TO_OUTER(GetWindow, (aWindow), NS_ERROR_UNEXPECTED); - - nsCOMPtr window = Window(); - window.forget(aWindow); - - return NS_OK; -} - nsGlobalWindow* nsGlobalWindow::Self() { return this; } -NS_IMETHODIMP -nsGlobalWindow::GetSelf(nsIDOMWindow** aWindow) -{ - FORWARD_TO_OUTER(GetSelf, (aWindow), NS_ERROR_UNEXPECTED); - - nsCOMPtr window = Self(); - window.forget(aWindow); - - return NS_OK; -} - Navigator* nsGlobalWindow::GetNavigator(ErrorResult& aError) { @@ -3546,16 +3513,15 @@ nsGlobalWindow::GetNavigator(ErrorResult& aError) return mNavigator; } -NS_IMETHODIMP -nsGlobalWindow::GetNavigator(nsIDOMNavigator** aNavigator) +nsIDOMNavigator* +nsGlobalWindow::GetNavigator() { - FORWARD_TO_INNER(GetNavigator, (aNavigator), NS_ERROR_UNEXPECTED); + FORWARD_TO_INNER(GetNavigator, (), nullptr); - ErrorResult rv; - nsCOMPtr navigator = GetNavigator(rv); - navigator.forget(aNavigator); - - return rv.StealNSResult(); + ErrorResult dummy; + nsIDOMNavigator* navigator = GetNavigator(dummy); + dummy.SuppressException(); + return navigator; } nsScreen* @@ -3574,16 +3540,15 @@ nsGlobalWindow::GetScreen(ErrorResult& aError) return mScreen; } -NS_IMETHODIMP -nsGlobalWindow::GetScreen(nsIDOMScreen** aScreen) +nsIDOMScreen* +nsGlobalWindow::GetScreen() { - FORWARD_TO_INNER(GetScreen, (aScreen), NS_ERROR_UNEXPECTED); + FORWARD_TO_INNER(GetScreen, (), nullptr); - ErrorResult rv; - RefPtr screen = GetScreen(rv); - screen.forget(aScreen); - - return rv.StealNSResult(); + ErrorResult dummy; + nsIDOMScreen* screen = GetScreen(dummy); + dummy.SuppressException(); + return screen; } nsHistory* @@ -3598,18 +3563,6 @@ nsGlobalWindow::GetHistory(ErrorResult& aError) return mHistory; } -NS_IMETHODIMP -nsGlobalWindow::GetHistory(nsISupports** aHistory) -{ - FORWARD_TO_INNER(GetHistory, (aHistory), NS_ERROR_FAILURE); - - ErrorResult rv; - nsCOMPtr history = GetHistory(rv); - history.forget(aHistory); - - return rv.StealNSResult(); -} - nsPerformance* nsPIDOMWindow::GetPerformance() { @@ -3794,7 +3747,7 @@ nsGlobalWindow::GetScriptableParent() } /** - * nsIDOMWindow::GetParent (when called from C++) is just a wrapper around + * nsPIDOMWindow::GetParent (when called from C++) is just a wrapper around * GetRealParent. */ already_AddRefed @@ -3835,7 +3788,6 @@ GetTopImpl(nsGlobalWindow* aWin, nsPIDOMWindow** aTop, bool aScriptable) prevParent = parent; nsCOMPtr newParent; - nsresult rv; if (aScriptable) { newParent = parent->GetScriptableParent(); } @@ -3870,7 +3822,6 @@ nsGlobalWindow::GetScriptableTop() return window.get(); } - already_AddRefed nsGlobalWindow::GetTop() { @@ -3997,7 +3948,7 @@ nsGlobalWindow::GetScriptableContent(JSContext* aCx, JS::MutableHandle menubar = GetMenubar(rv); - menubar.forget(aMenubar); - - return rv.StealNSResult(); -} - BarProp* nsGlobalWindow::GetToolbar(ErrorResult& aError) { @@ -4055,18 +3994,6 @@ nsGlobalWindow::GetToolbar(ErrorResult& aError) return mToolbar; } -NS_IMETHODIMP -nsGlobalWindow::GetToolbar(nsISupports** aToolbar) -{ - FORWARD_TO_INNER(GetToolbar, (aToolbar), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - nsCOMPtr toolbar = GetToolbar(rv); - toolbar.forget(aToolbar); - - return rv.StealNSResult(); -} - BarProp* nsGlobalWindow::GetLocationbar(ErrorResult& aError) { @@ -4078,18 +4005,6 @@ nsGlobalWindow::GetLocationbar(ErrorResult& aError) return mLocationbar; } -NS_IMETHODIMP -nsGlobalWindow::GetLocationbar(nsISupports** aLocationbar) -{ - FORWARD_TO_INNER(GetLocationbar, (aLocationbar), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - nsCOMPtr locationbar = GetLocationbar(rv); - locationbar.forget(aLocationbar); - - return rv.StealNSResult(); -} - BarProp* nsGlobalWindow::GetPersonalbar(ErrorResult& aError) { @@ -4101,18 +4016,6 @@ nsGlobalWindow::GetPersonalbar(ErrorResult& aError) return mPersonalbar; } -NS_IMETHODIMP -nsGlobalWindow::GetPersonalbar(nsISupports** aPersonalbar) -{ - FORWARD_TO_INNER(GetPersonalbar, (aPersonalbar), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - nsCOMPtr personalbar = GetPersonalbar(rv); - personalbar.forget(aPersonalbar); - - return rv.StealNSResult(); -} - BarProp* nsGlobalWindow::GetStatusbar(ErrorResult& aError) { @@ -4124,18 +4027,6 @@ nsGlobalWindow::GetStatusbar(ErrorResult& aError) return mStatusbar; } -NS_IMETHODIMP -nsGlobalWindow::GetStatusbar(nsISupports** aStatusbar) -{ - FORWARD_TO_INNER(GetStatusbar, (aStatusbar), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - nsCOMPtr statusbar = GetStatusbar(rv); - statusbar.forget(aStatusbar); - - return rv.StealNSResult(); -} - BarProp* nsGlobalWindow::GetScrollbars(ErrorResult& aError) { @@ -4148,18 +4039,6 @@ nsGlobalWindow::GetScrollbars(ErrorResult& aError) return mScrollbars; } -NS_IMETHODIMP -nsGlobalWindow::GetScrollbars(nsISupports** aScrollbars) -{ - FORWARD_TO_INNER(GetScrollbars, (aScrollbars), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - nsCOMPtr scrollbars = GetScrollbars(rv); - scrollbars.forget(aScrollbars); - - return rv.StealNSResult(); -} - bool nsGlobalWindow::GetClosedOuter() { @@ -4175,15 +4054,12 @@ nsGlobalWindow::GetClosed(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetClosedOuter, (), aError, false); } -NS_IMETHODIMP -nsGlobalWindow::GetClosed(bool* aClosed) +bool +nsGlobalWindow::Closed() { - FORWARD_TO_INNER(GetClosed, (aClosed), NS_ERROR_UNEXPECTED); + MOZ_ASSERT(IsOuterWindow()); - ErrorResult rv; - *aClosed = GetClosed(rv); - - return rv.StealNSResult(); + return GetClosedOuter(); } nsDOMWindowList* @@ -4198,14 +4074,13 @@ nsGlobalWindow::GetWindowList() return mFrames; } -NS_IMETHODIMP -nsGlobalWindow::GetFrames(nsIDOMWindowCollection** aFrames) +already_AddRefed +nsGlobalWindow::GetFrames() { - FORWARD_TO_OUTER(GetFrames, (aFrames), NS_ERROR_NOT_INITIALIZED); + FORWARD_TO_OUTER(GetFrames, (), nullptr); - *aFrames = GetWindowList(); - NS_IF_ADDREF(*aFrames); - return NS_OK; + nsCOMPtr frames = GetWindowList(); + return frames.forget(); } already_AddRefed @@ -4381,17 +4256,16 @@ nsGlobalWindow::GetApplicationCache(ErrorResult& aError) return mApplicationCache; } -NS_IMETHODIMP -nsGlobalWindow::GetApplicationCache(nsIDOMOfflineResourceList **aApplicationCache) +already_AddRefed +nsGlobalWindow::GetApplicationCache() { - FORWARD_TO_INNER(GetApplicationCache, (aApplicationCache), NS_ERROR_UNEXPECTED); + FORWARD_TO_INNER(GetApplicationCache, (), nullptr); - ErrorResult rv; + ErrorResult dummy; nsCOMPtr applicationCache = - GetApplicationCache(rv); - applicationCache.forget(aApplicationCache); - - return rv.StealNSResult(); + GetApplicationCache(dummy); + dummy.SuppressException(); + return applicationCache.forget(); } Crypto* @@ -4406,18 +4280,6 @@ nsGlobalWindow::GetCrypto(ErrorResult& aError) return mCrypto; } -NS_IMETHODIMP -nsGlobalWindow::GetCrypto(nsIDOMCrypto** aCrypto) -{ - FORWARD_TO_INNER(GetCrypto, (aCrypto), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - nsCOMPtr crypto = GetCrypto(rv); - crypto.forget(aCrypto); - - return rv.StealNSResult(); -} - nsIControllers* nsGlobalWindow::GetControllersOuter(ErrorResult& aError) { @@ -4458,7 +4320,7 @@ nsGlobalWindow::GetControllers(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetControllersOuter, (aError), aError, nullptr); } -NS_IMETHODIMP +nsresult nsGlobalWindow::GetControllers(nsIControllers** aResult) { FORWARD_TO_INNER(GetControllers, (aResult), NS_ERROR_UNEXPECTED); @@ -4530,7 +4392,7 @@ nsGlobalWindow::GetOpener(JSContext* aCx, JS::MutableHandle aRetval, { MOZ_ASSERT(IsInnerWindow()); - nsCOMPtr opener = GetOpenerWindow(aError); + nsCOMPtr opener = GetOpenerWindow(aError); if (aError.Failed() || !opener) { aRetval.setNull(); return; @@ -4539,19 +4401,6 @@ nsGlobalWindow::GetOpener(JSContext* aCx, JS::MutableHandle aRetval, aError = nsContentUtils::WrapNative(aCx, opener, aRetval); } -NS_IMETHODIMP -nsGlobalWindow::GetScriptableOpener(JSContext* aCx, - JS::MutableHandle aOpener) -{ - FORWARD_TO_INNER(GetScriptableOpener, (aCx, aOpener), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - GetOpener(aCx, aOpener, rv); - - return rv.StealNSResult(); -} - - already_AddRefed nsGlobalWindow::GetOpener() { @@ -4612,17 +4461,6 @@ nsGlobalWindow::SetOpener(JSContext* aCx, JS::Handle aOpener, SetOpenerWindow(win, false); } -NS_IMETHODIMP -nsGlobalWindow::SetScriptableOpener(JSContext* aCx, - JS::Handle aOpener) -{ - ErrorResult rv; - SetOpener(aCx, aOpener, rv); - - return rv.StealNSResult(); -} - - void nsGlobalWindow::GetStatusOuter(nsAString& aStatus) { @@ -4637,17 +4475,6 @@ nsGlobalWindow::GetStatus(nsAString& aStatus, ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetStatusOuter, (aStatus), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::GetStatus(nsAString& aStatus) -{ - FORWARD_TO_INNER(GetStatus, (aStatus), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - GetStatus(aStatus, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::SetStatusOuter(const nsAString& aStatus) { @@ -4677,17 +4504,6 @@ nsGlobalWindow::SetStatus(const nsAString& aStatus, ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(SetStatusOuter, (aStatus), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::SetStatus(const nsAString& aStatus) -{ - FORWARD_TO_INNER(SetStatus, (aStatus), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - SetStatus(aStatus, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::GetNameOuter(nsAString& aName) { @@ -4704,17 +4520,6 @@ nsGlobalWindow::GetName(nsAString& aName, ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetNameOuter, (aName), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::GetName(nsAString& aName) -{ - FORWARD_TO_INNER(GetName, (aName), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - GetName(aName, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::SetNameOuter(const nsAString& aName, mozilla::ErrorResult& aError) { @@ -4731,17 +4536,6 @@ nsGlobalWindow::SetName(const nsAString& aName, mozilla::ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(SetNameOuter, (aName, aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::SetName(const nsAString& aName) -{ - FORWARD_TO_INNER(SetName, (aName), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - SetName(aName, rv); - - return rv.StealNSResult(); -} - // Helper functions used by many methods below. int32_t nsGlobalWindow::DevToCSSIntPixels(int32_t px) @@ -4867,7 +4661,7 @@ nsGlobalWindow::GetInnerWidth(JSContext* aCx, aError); } -NS_IMETHODIMP +nsresult nsGlobalWindow::GetInnerWidth(int32_t* aInnerWidth) { FORWARD_TO_INNER(GetInnerWidth, (aInnerWidth), NS_ERROR_UNEXPECTED); @@ -4928,21 +4722,6 @@ nsGlobalWindow::SetInnerWidth(JSContext* aCx, JS::Handle aValue, aValue, "innerWidth", aError); } -NS_IMETHODIMP -nsGlobalWindow::SetInnerWidth(int32_t aInnerWidth) -{ - FORWARD_TO_INNER(SetInnerWidth, (aInnerWidth), NS_ERROR_UNEXPECTED); - - if (IsFrame()) { - return NS_OK; - } - - ErrorResult rv; - SetInnerWidth(aInnerWidth, rv); - - return rv.StealNSResult(); -} - int32_t nsGlobalWindow::GetInnerHeightOuter(ErrorResult& aError) { @@ -4968,7 +4747,7 @@ nsGlobalWindow::GetInnerHeight(JSContext* aCx, aError); } -NS_IMETHODIMP +nsresult nsGlobalWindow::GetInnerHeight(int32_t* aInnerHeight) { FORWARD_TO_INNER(GetInnerHeight, (aInnerHeight), NS_ERROR_UNEXPECTED); @@ -5028,21 +4807,6 @@ nsGlobalWindow::SetInnerHeight(JSContext* aCx, JS::Handle aValue, aValue, "innerHeight", aError); } -NS_IMETHODIMP -nsGlobalWindow::SetInnerHeight(int32_t aInnerHeight) -{ - FORWARD_TO_INNER(SetInnerHeight, (aInnerHeight), NS_ERROR_UNEXPECTED); - - if (IsFrame()) { - return NS_OK; - } - - ErrorResult rv; - SetInnerHeight(aInnerHeight, rv); - - return rv.StealNSResult(); -} - nsIntSize nsGlobalWindow::GetOuterSize(ErrorResult& aError) { @@ -5097,17 +4861,6 @@ nsGlobalWindow::GetOuterWidth(JSContext* aCx, aError); } -NS_IMETHODIMP -nsGlobalWindow::GetOuterWidth(int32_t* aOuterWidth) -{ - FORWARD_TO_INNER(GetOuterWidth, (aOuterWidth), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - *aOuterWidth = GetOuterWidth(rv); - - return rv.StealNSResult(); -} - int32_t nsGlobalWindow::GetOuterHeightOuter(ErrorResult& aError) { @@ -5130,17 +4883,6 @@ nsGlobalWindow::GetOuterHeight(JSContext* aCx, aError); } -NS_IMETHODIMP -nsGlobalWindow::GetOuterHeight(int32_t* aOuterHeight) -{ - FORWARD_TO_INNER(GetOuterHeight, (aOuterHeight), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - *aOuterHeight = GetOuterHeight(rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::SetOuterSize(int32_t aLengthCSSPixels, bool aIsWidth, ErrorResult& aError) @@ -5193,21 +4935,6 @@ nsGlobalWindow::SetOuterWidth(JSContext* aCx, JS::Handle aValue, aValue, "outerWidth", aError); } -NS_IMETHODIMP -nsGlobalWindow::SetOuterWidth(int32_t aOuterWidth) -{ - FORWARD_TO_INNER(SetOuterWidth, (aOuterWidth), NS_ERROR_UNEXPECTED); - - if (IsFrame()) { - return NS_OK; - } - - ErrorResult rv; - SetOuterWidth(aOuterWidth, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::SetOuterHeightOuter(int32_t aOuterHeight, ErrorResult& aError) { @@ -5230,21 +4957,6 @@ nsGlobalWindow::SetOuterHeight(JSContext* aCx, JS::Handle aValue, aValue, "outerHeight", aError); } -NS_IMETHODIMP -nsGlobalWindow::SetOuterHeight(int32_t aOuterHeight) -{ - FORWARD_TO_INNER(SetOuterHeight, (aOuterHeight), NS_ERROR_UNEXPECTED); - - if (IsFrame()) { - return NS_OK; - } - - ErrorResult rv; - SetOuterHeight(aOuterHeight, rv); - - return rv.StealNSResult(); -} - nsIntPoint nsGlobalWindow::GetScreenXY(ErrorResult& aError) { @@ -5289,17 +5001,6 @@ nsGlobalWindow::GetScreenX(JSContext* aCx, aError); } -NS_IMETHODIMP -nsGlobalWindow::GetScreenX(int32_t* aScreenX) -{ - FORWARD_TO_INNER(GetScreenX, (aScreenX), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - *aScreenX = GetScreenX(rv); - - return rv.StealNSResult(); -} - nsRect nsGlobalWindow::GetInnerScreenRect() { @@ -5351,17 +5052,6 @@ nsGlobalWindow::GetMozInnerScreenX(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetMozInnerScreenXOuter, (), aError, 0); } -NS_IMETHODIMP -nsGlobalWindow::GetMozInnerScreenX(float* aScreenX) -{ - FORWARD_TO_INNER(GetMozInnerScreenX, (aScreenX), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - *aScreenX = GetMozInnerScreenX(rv); - - return rv.StealNSResult(); -} - float nsGlobalWindow::GetMozInnerScreenYOuter() { @@ -5382,17 +5072,6 @@ nsGlobalWindow::GetMozInnerScreenY(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetMozInnerScreenYOuter, (), aError, 0); } -NS_IMETHODIMP -nsGlobalWindow::GetMozInnerScreenY(float* aScreenY) -{ - FORWARD_TO_INNER(GetMozInnerScreenY, (aScreenY), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - *aScreenY = GetMozInnerScreenY(rv); - - return rv.StealNSResult(); -} - float nsGlobalWindow::GetDevicePixelRatioOuter() { @@ -5422,7 +5101,7 @@ nsGlobalWindow::GetDevicePixelRatio(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetDevicePixelRatioOuter, (), aError, 0.0); } -NS_IMETHODIMP +nsresult nsGlobalWindow::GetDevicePixelRatio(float* aRatio) { FORWARD_TO_INNER(GetDevicePixelRatio, (aRatio), NS_ERROR_UNEXPECTED); @@ -5452,17 +5131,6 @@ nsGlobalWindow::GetMozPaintCount(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetMozPaintCountOuter, (), aError, 0); } -NS_IMETHODIMP -nsGlobalWindow::GetMozPaintCount(uint64_t* aResult) -{ - FORWARD_TO_INNER(GetMozPaintCount, (aResult), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - *aResult = GetMozPaintCount(rv); - - return rv.StealNSResult(); -} - int32_t nsGlobalWindow::RequestAnimationFrame(FrameRequestCallback& aCallback, ErrorResult& aError) @@ -5482,26 +5150,6 @@ nsGlobalWindow::RequestAnimationFrame(FrameRequestCallback& aCallback, return handle; } -NS_IMETHODIMP -nsGlobalWindow::RequestAnimationFrame(JS::Handle aCallback, - JSContext* cx, - int32_t* aHandle) -{ - FORWARD_TO_INNER(RequestAnimationFrame, (aCallback, cx, aHandle), NS_ERROR_UNEXPECTED); - if (!aCallback.isObject() || !JS::IsCallable(&aCallback.toObject())) { - return NS_ERROR_INVALID_ARG; - } - - JS::Rooted callbackObj(cx, &aCallback.toObject()); - RefPtr callback = - new FrameRequestCallback(cx, callbackObj, GetIncumbentGlobal()); - - ErrorResult rv; - *aHandle = RequestAnimationFrame(*callback, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::CancelAnimationFrame(int32_t aHandle, ErrorResult& aError) { @@ -5514,17 +5162,6 @@ nsGlobalWindow::CancelAnimationFrame(int32_t aHandle, ErrorResult& aError) mDoc->CancelFrameRequestCallback(aHandle); } -NS_IMETHODIMP -nsGlobalWindow::CancelAnimationFrame(int32_t aHandle) -{ - FORWARD_TO_INNER(CancelAnimationFrame, (aHandle), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - CancelAnimationFrame(aHandle, rv); - - return rv.StealNSResult(); -} - already_AddRefed nsGlobalWindow::MatchMediaOuter(const nsAString& aMediaQueryList) { @@ -5548,19 +5185,6 @@ nsGlobalWindow::MatchMedia(const nsAString& aMediaQueryList, FORWARD_TO_OUTER_OR_THROW(MatchMediaOuter, (aMediaQueryList), aError, nullptr); } -NS_IMETHODIMP -nsGlobalWindow::MatchMedia(const nsAString& aMediaQueryList, - nsISupports** aResult) -{ - FORWARD_TO_INNER(MatchMedia, (aMediaQueryList, aResult), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - RefPtr mediaQueryList = MatchMedia(aMediaQueryList, rv); - mediaQueryList.forget(aResult); - - return rv.StealNSResult(); -} - void nsGlobalWindow::SetScreenXOuter(int32_t aScreenX, ErrorResult& aError) { @@ -5598,21 +5222,6 @@ nsGlobalWindow::SetScreenX(JSContext* aCx, JS::Handle aValue, aValue, "screenX", aError); } -NS_IMETHODIMP -nsGlobalWindow::SetScreenX(int32_t aScreenX) -{ - FORWARD_TO_INNER(SetScreenX, (aScreenX), NS_ERROR_UNEXPECTED); - - if (IsFrame()) { - return NS_OK; - } - - ErrorResult rv; - SetScreenX(aScreenX, rv); - - return rv.StealNSResult(); -} - int32_t nsGlobalWindow::GetScreenYOuter(ErrorResult& aError) { @@ -5627,17 +5236,6 @@ nsGlobalWindow::GetScreenY(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetScreenYOuter, (aError), aError, 0); } -NS_IMETHODIMP -nsGlobalWindow::GetScreenY(int32_t* aScreenY) -{ - FORWARD_TO_INNER(GetScreenY, (aScreenY), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - *aScreenY = GetScreenY(rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::GetScreenY(JSContext* aCx, JS::MutableHandle aValue, @@ -5684,21 +5282,6 @@ nsGlobalWindow::SetScreenY(JSContext* aCx, JS::Handle aValue, aValue, "screenY", aError); } -NS_IMETHODIMP -nsGlobalWindow::SetScreenY(int32_t aScreenY) -{ - FORWARD_TO_INNER(SetScreenY, (aScreenY), NS_ERROR_UNEXPECTED); - - if (IsFrame()) { - return NS_OK; - } - - ErrorResult rv; - SetScreenY(aScreenY, rv); - - return rv.StealNSResult(); -} - // NOTE: Arguments to this function should have values scaled to // CSS pixels, not device pixels. void @@ -5788,8 +5371,7 @@ nsGlobalWindow::CheckSecurityLeftAndTop(int32_t* aLeft, int32_t* aTop) nsCOMPtr treeOwner = GetTreeOwnerWindow(); - nsCOMPtr screen; - GetScreen(getter_AddRefs(screen)); + nsCOMPtr screen = GetScreen(); if (treeOwner && screen) { int32_t screenLeft, screenTop, screenWidth, screenHeight; @@ -5844,24 +5426,12 @@ nsGlobalWindow::CheckSecurityLeftAndTop(int32_t* aLeft, int32_t* aTop) } } -NS_IMETHODIMP -nsGlobalWindow::GetPageXOffset(int32_t* aPageXOffset) -{ - return GetScrollX(aPageXOffset); -} - -NS_IMETHODIMP -nsGlobalWindow::GetPageYOffset(int32_t* aPageYOffset) -{ - return GetScrollY(aPageYOffset); -} - int32_t nsGlobalWindow::GetScrollBoundaryOuter(Side aSide) - { - MOZ_RELEASE_ASSERT(IsOuterWindow()); - - FlushPendingNotifications(Flush_Layout); +{ + MOZ_RELEASE_ASSERT(IsOuterWindow()); + + FlushPendingNotifications(Flush_Layout); if (nsIScrollableFrame *sf = GetScrollFrame()) { return nsPresContext:: AppUnitsToIntCSSPixels(sf->GetScrollRange().Edge(aSide)); @@ -5878,16 +5448,6 @@ nsGlobalWindow::GetScrollMinX(ErrorResult& aError) return scrollMinX; } -NS_IMETHODIMP -nsGlobalWindow::GetScrollMinX(int32_t* aScrollMinX) -{ - NS_ENSURE_ARG_POINTER(aScrollMinX); - ErrorResult rv; - *aScrollMinX = GetScrollMinX(rv); - - return rv.StealNSResult(); -} - int32_t nsGlobalWindow::GetScrollMinY(ErrorResult& aError) { @@ -5897,16 +5457,6 @@ nsGlobalWindow::GetScrollMinY(ErrorResult& aError) return scrollMinY; } -NS_IMETHODIMP -nsGlobalWindow::GetScrollMinY(int32_t* aScrollMinY) -{ - NS_ENSURE_ARG_POINTER(aScrollMinY); - ErrorResult rv; - *aScrollMinY = GetScrollMinY(rv); - - return rv.StealNSResult(); -} - int32_t nsGlobalWindow::GetScrollMaxX(ErrorResult& aError) { @@ -5916,18 +5466,6 @@ nsGlobalWindow::GetScrollMaxX(ErrorResult& aError) return scrollMaxX; } -NS_IMETHODIMP -nsGlobalWindow::GetScrollMaxX(int32_t* aScrollMaxX) -{ - FORWARD_TO_INNER(GetScrollMaxX, (aScrollMaxX), NS_ERROR_UNEXPECTED); - - NS_ENSURE_ARG_POINTER(aScrollMaxX); - ErrorResult rv; - *aScrollMaxX = GetScrollMaxX(rv); - - return rv.StealNSResult(); -} - int32_t nsGlobalWindow::GetScrollMaxY(ErrorResult& aError) { @@ -5937,18 +5475,6 @@ nsGlobalWindow::GetScrollMaxY(ErrorResult& aError) return scrollMaxY; } -NS_IMETHODIMP -nsGlobalWindow::GetScrollMaxY(int32_t* aScrollMaxY) -{ - FORWARD_TO_INNER(GetScrollMaxY, (aScrollMaxY), NS_ERROR_UNEXPECTED); - - NS_ENSURE_ARG_POINTER(aScrollMaxY); - ErrorResult rv; - *aScrollMaxY = GetScrollMaxY(rv); - - return rv.StealNSResult(); -} - CSSPoint nsGlobalWindow::GetScrollXY(bool aDoFlush) { @@ -5989,16 +5515,6 @@ nsGlobalWindow::GetScrollX(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetScrollXOuter, (), aError, 0); } -NS_IMETHODIMP -nsGlobalWindow::GetScrollX(int32_t* aScrollX) -{ - FORWARD_TO_INNER(GetScrollX, (aScrollX), NS_ERROR_UNEXPECTED); - NS_ENSURE_ARG_POINTER(aScrollX); - ErrorResult rv; - *aScrollX = GetScrollX(rv); - return rv.StealNSResult(); -} - double nsGlobalWindow::GetScrollYOuter() { @@ -6012,16 +5528,6 @@ nsGlobalWindow::GetScrollY(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetScrollYOuter, (), aError, 0); } -NS_IMETHODIMP -nsGlobalWindow::GetScrollY(int32_t* aScrollY) -{ - FORWARD_TO_INNER(GetScrollY, (aScrollY), NS_ERROR_UNEXPECTED); - NS_ENSURE_ARG_POINTER(aScrollY); - ErrorResult rv; - *aScrollY = GetScrollY(rv); - return rv.StealNSResult(); -} - uint32_t nsGlobalWindow::Length() { @@ -6032,13 +5538,6 @@ nsGlobalWindow::Length() return windows ? windows->GetLength() : 0; } -NS_IMETHODIMP -nsGlobalWindow::GetLength(uint32_t* aLength) -{ - *aLength = Length(); - return NS_OK; -} - already_AddRefed nsGlobalWindow::GetTopOuter() { @@ -6207,7 +5706,7 @@ nsGlobalWindow::SetFullScreen(bool aFullScreen, mozilla::ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(SetFullScreenOuter, (aFullScreen, aError), aError, /* void */); } -NS_IMETHODIMP +nsresult nsGlobalWindow::SetFullScreen(bool aFullScreen) { FORWARD_TO_OUTER(SetFullScreen, (aFullScreen), NS_ERROR_NOT_INITIALIZED); @@ -6654,15 +6153,15 @@ nsGlobalWindow::GetFullScreen(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(GetFullScreenOuter, (), aError, false); } -NS_IMETHODIMP -nsGlobalWindow::GetFullScreen(bool* aFullScreen) +bool +nsGlobalWindow::GetFullScreen() { - FORWARD_TO_INNER(GetFullScreen, (aFullScreen), NS_ERROR_UNEXPECTED); + FORWARD_TO_INNER(GetFullScreen, (), false); - ErrorResult rv; - *aFullScreen = GetFullScreen(rv); - - return rv.StealNSResult(); + ErrorResult dummy; + bool fullscreen = GetFullScreen(dummy); + dummy.SuppressException(); + return fullscreen; } void @@ -6722,37 +6221,6 @@ nsGlobalWindow::EnsureReflowFlushAndPaint() presShell->UnsuppressPainting(); } -NS_IMETHODIMP -nsGlobalWindow::GetTextZoom(float *aZoom) -{ - FORWARD_TO_OUTER(GetTextZoom, (aZoom), NS_ERROR_NOT_INITIALIZED); - - if (mDocShell) { - nsCOMPtr contentViewer; - mDocShell->GetContentViewer(getter_AddRefs(contentViewer)); - - if (contentViewer) { - return contentViewer->GetTextZoom(aZoom); - } - } - return NS_ERROR_FAILURE; -} - -NS_IMETHODIMP -nsGlobalWindow::SetTextZoom(float aZoom) -{ - FORWARD_TO_OUTER(SetTextZoom, (aZoom), NS_ERROR_NOT_INITIALIZED); - - if (mDocShell) { - nsCOMPtr contentViewer; - mDocShell->GetContentViewer(getter_AddRefs(contentViewer)); - - if (contentViewer) - return contentViewer->SetTextZoom(aZoom); - } - return NS_ERROR_FAILURE; -} - // static void nsGlobalWindow::MakeScriptDialogTitle(nsAString &aOutTitle) @@ -6963,17 +6431,6 @@ nsGlobalWindow::Alert(const nsAString& aMessage, mozilla::ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(AlertOuter, (aMessage, aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::Alert(const nsAString& aString) -{ - FORWARD_TO_INNER(Alert, (aString), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - Alert(aString, rv); - - return rv.StealNSResult(); -} - bool nsGlobalWindow::ConfirmOuter(const nsAString& aMessage, ErrorResult& aError) { @@ -6988,17 +6445,6 @@ nsGlobalWindow::Confirm(const nsAString& aMessage, ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(ConfirmOuter, (aMessage, aError), aError, false); } -NS_IMETHODIMP -nsGlobalWindow::Confirm(const nsAString& aString, bool* aReturn) -{ - FORWARD_TO_INNER(Confirm, (aString, aReturn), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - *aReturn = Confirm(aString, rv); - - return rv.StealNSResult(); -} - already_AddRefed nsGlobalWindow::Fetch(const RequestOrUSVString& aInput, const RequestInit& aInit, ErrorResult& aRv) @@ -7097,18 +6543,6 @@ nsGlobalWindow::Prompt(const nsAString& aMessage, const nsAString& aInitial, aError, ); } -NS_IMETHODIMP -nsGlobalWindow::Prompt(const nsAString& aMessage, const nsAString& aInitial, - nsAString& aReturn) -{ - FORWARD_TO_INNER(Prompt, (aMessage, aInitial, aReturn), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - Prompt(aMessage, aInitial, aReturn, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::FocusOuter(ErrorResult& aError) { @@ -7223,7 +6657,7 @@ nsGlobalWindow::Focus(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(FocusOuter, (aError), aError, ); } -NS_IMETHODIMP +nsresult nsGlobalWindow::Focus() { FORWARD_TO_INNER(Focus, (), NS_ERROR_UNEXPECTED); @@ -7272,15 +6706,6 @@ nsGlobalWindow::Blur(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(BlurOuter, (), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::Blur() -{ - ErrorResult rv; - Blur(rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::BackOuter(ErrorResult& aError) { @@ -7301,17 +6726,6 @@ nsGlobalWindow::Back(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(BackOuter, (aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::Back() -{ - FORWARD_TO_INNER(Back, (), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - Back(rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::ForwardOuter(ErrorResult& aError) { @@ -7332,17 +6746,6 @@ nsGlobalWindow::Forward(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(ForwardOuter, (aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::Forward() -{ - FORWARD_TO_INNER(Forward, (), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - Forward(rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::HomeOuter(ErrorResult& aError) { @@ -7401,17 +6804,6 @@ nsGlobalWindow::Home(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(HomeOuter, (aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::Home() -{ - FORWARD_TO_INNER(Home, (), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - Home(rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::StopOuter(ErrorResult& aError) { @@ -7429,17 +6821,6 @@ nsGlobalWindow::Stop(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(StopOuter, (aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::Stop() -{ - FORWARD_TO_INNER(Stop, (), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - Stop(rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::PrintOuter(ErrorResult& aError) { @@ -7525,17 +6906,6 @@ nsGlobalWindow::Print(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(PrintOuter, (aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::Print() -{ - FORWARD_TO_INNER(Print, (), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - Print(rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::MoveToOuter(int32_t aXPos, int32_t aYPos, ErrorResult& aError) { @@ -7570,17 +6940,6 @@ nsGlobalWindow::MoveTo(int32_t aXPos, int32_t aYPos, ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(MoveToOuter, (aXPos, aYPos, aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::MoveTo(int32_t aXPos, int32_t aYPos) -{ - FORWARD_TO_INNER(MoveTo, (aXPos, aYPos), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - MoveTo(aXPos, aYPos, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::MoveByOuter(int32_t aXDif, int32_t aYDif, ErrorResult& aError) { @@ -7630,7 +6989,7 @@ nsGlobalWindow::MoveBy(int32_t aXDif, int32_t aYDif, ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(MoveByOuter, (aXDif, aYDif, aError), aError, ); } -NS_IMETHODIMP +nsresult nsGlobalWindow::MoveBy(int32_t aXDif, int32_t aYDif) { FORWARD_TO_INNER(MoveBy, (aXDif, aYDif), NS_ERROR_UNEXPECTED); @@ -7688,17 +7047,6 @@ nsGlobalWindow::ResizeTo(int32_t aWidth, int32_t aHeight, ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(ResizeToOuter, (aWidth, aHeight, aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::ResizeTo(int32_t aWidth, int32_t aHeight) -{ - FORWARD_TO_INNER(ResizeTo, (aWidth, aHeight), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - ResizeTo(aWidth, aHeight, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::ResizeByOuter(int32_t aWidthDif, int32_t aHeightDif, ErrorResult& aError) @@ -7769,17 +7117,6 @@ nsGlobalWindow::ResizeBy(int32_t aWidthDif, int32_t aHeightDif, FORWARD_TO_OUTER_OR_THROW(ResizeByOuter, (aWidthDif, aHeightDif, aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::ResizeBy(int32_t aWidthDif, int32_t aHeightDif) -{ - FORWARD_TO_INNER(ResizeBy, (aWidthDif, aHeightDif), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - ResizeBy(aWidthDif, aHeightDif, rv); - - return rv.StealNSResult(); -} - void nsGlobalWindow::SizeToContentOuter(ErrorResult& aError) { @@ -7836,24 +7173,6 @@ nsGlobalWindow::SizeToContent(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(SizeToContentOuter, (aError), aError, ); } -NS_IMETHODIMP -nsGlobalWindow::SizeToContent() -{ - FORWARD_TO_INNER(SizeToContent, (), NS_ERROR_UNEXPECTED); - - ErrorResult rv; - SizeToContent(rv); - - return rv.StealNSResult(); -} - -NS_IMETHODIMP -nsGlobalWindow::GetWindowRoot(nsIDOMEventTarget **aWindowRoot) -{ - nsCOMPtr root = GetTopWindowRoot(); - return CallQueryInterface(root, aWindowRoot); -} - already_AddRefed nsGlobalWindow::GetTopWindowRoot() { @@ -7909,20 +7228,6 @@ nsGlobalWindow::Scroll(const ScrollToOptions& aOptions) ScrollTo(aOptions); } -NS_IMETHODIMP -nsGlobalWindow::Scroll(int32_t aXScroll, int32_t aYScroll) -{ - ScrollTo(CSSIntPoint(aXScroll, aYScroll), ScrollOptions()); - return NS_OK; -} - -NS_IMETHODIMP -nsGlobalWindow::ScrollTo(int32_t aXScroll, int32_t aYScroll) -{ - ScrollTo(CSSIntPoint(aXScroll, aYScroll), ScrollOptions()); - return NS_OK; -} - void nsGlobalWindow::ScrollTo(const CSSIntPoint& aScroll, const ScrollOptions& aOptions) @@ -7955,14 +7260,6 @@ nsGlobalWindow::ScrollTo(const CSSIntPoint& aScroll, } } -NS_IMETHODIMP -nsGlobalWindow::ScrollBy(int32_t aXScrollDif, int32_t aYScrollDif) -{ - ScrollBy(double(aXScrollDif), double(aYScrollDif)); - - return NS_OK; -} - void nsGlobalWindow::ScrollBy(double aXScrollDif, double aYScrollDif) { @@ -7999,16 +7296,6 @@ nsGlobalWindow::ScrollBy(const ScrollToOptions& aOptions) } } -NS_IMETHODIMP -nsGlobalWindow::ScrollByLines(int32_t numLines) -{ - FORWARD_TO_INNER(ScrollByLines, (numLines), NS_ERROR_UNEXPECTED); - - ScrollByLines(numLines, ScrollOptions()); - - return NS_OK; -} - void nsGlobalWindow::ScrollByLines(int32_t numLines, const ScrollOptions& aOptions) @@ -8030,16 +7317,6 @@ nsGlobalWindow::ScrollByLines(int32_t numLines, } } -NS_IMETHODIMP -nsGlobalWindow::ScrollByPages(int32_t numPages) -{ - FORWARD_TO_INNER(ScrollByPages, (numPages), NS_ERROR_UNEXPECTED); - - ScrollByPages(numPages, ScrollOptions()); - - return NS_OK; -} - void nsGlobalWindow::ScrollByPages(int32_t numPages, const ScrollOptions& aOptions) @@ -8357,8 +7634,7 @@ nsGlobalWindow::OpenDialog(const nsAString& aUrl, const nsAString& aName, const nsAString& aOptions, nsISupports* aExtraArgument, nsIDOMWindow** _retval) { - FORWARD_TO_OUTER(OpenDialog, (aUrl, aName, aOptions, aExtraArgument, _retval), - NS_ERROR_NOT_INITIALIZED); + MOZ_ASSERT(IsOuterWindow()); return OpenInternal(aUrl, aName, aOptions, true, // aDialog false, // aContentModal @@ -8649,22 +7925,6 @@ nsGlobalWindow::PostMessageMoz(JSContext* aCx, JS::Handle aMessage, PostMessageMoz(aCx, aMessage, aTargetOrigin, transferArray, aError); } -NS_IMETHODIMP -nsGlobalWindow::PostMessageMoz(JS::Handle aMessage, - const nsAString& aOrigin, - JS::Handle aTransfer, - JSContext* aCx) -{ - FORWARD_TO_INNER(PostMessageMoz, - (aMessage, aOrigin, aTransfer, aCx), - NS_ERROR_UNEXPECTED); - - ErrorResult rv; - PostMessageMoz(aCx, aMessage, aOrigin, aTransfer, rv); - - return rv.StealNSResult(); -} - class nsCloseEvent : public nsRunnable { RefPtr mWindow; @@ -8819,7 +8079,7 @@ nsGlobalWindow::Close(ErrorResult& aError) FORWARD_TO_OUTER_OR_THROW(CloseOuter, (), aError, ); } -NS_IMETHODIMP +nsresult nsGlobalWindow::Close() { FORWARD_TO_INNER(Close, (), NS_ERROR_UNEXPECTED); @@ -9022,19 +8282,15 @@ nsGlobalWindow::RunPendingTimeoutsRecursive(nsGlobalWindow *aTopWindow, return; } - nsCOMPtr frames; - aWindow->GetFrames(getter_AddRefs(frames)); - + nsCOMPtr frames = aWindow->GetFrames(); if (!frames) { return; } - uint32_t i, length; - if (NS_FAILED(frames->GetLength(&length)) || !length) { - return; - } + uint32_t length = 0; + frames->GetLength(&length); - for (i = 0; i < length && aTopWindow->mModalStateDepth == 0; i++) { + for (uint32_t i = 0; i < length && aTopWindow->mModalStateDepth == 0; i++) { nsCOMPtr child; frames->Item(i, getter_AddRefs(child)); @@ -9042,10 +8298,7 @@ nsGlobalWindow::RunPendingTimeoutsRecursive(nsGlobalWindow *aTopWindow, return; } - nsGlobalWindow *childWin = - static_cast - (static_cast - (child.get())); + auto* childWin = static_cast(child.get()); RunPendingTimeoutsRecursive(aTopWindow, childWin); } @@ -9274,29 +8527,6 @@ nsGlobalWindow::CacheXBLPrototypeHandler(nsXBLPrototypeHandler* aKey, mCachedXBLPrototypeHandlers->Put(aKey, aHandler); } -/** - * GetScriptableFrameElement is called when script reads - * nsIGlobalWindow::frameElement. - * - * In contrast to GetRealFrameElement, GetScriptableFrameElement says that the - * window contained by an