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 1182316: Part 1 - Remove FORWARD_TO_INNER_OR_THROW. r=peterv

Browse Source
This commit is contained in:
Kyle Huey 2015-07-16 22:10:35 -07:00
parent 9c0a1e70f8
commit 5837a6e9d8
6 changed files with 92 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
dom/base/nsGlobalWindow.cpp
View File

@ -407,18 +407,6 @@ nsGlobalWindow::DOMMinTimeoutValue() const {
} \ } \
PR_END_MACRO PR_END_MACRO
#define FORWARD_TO_INNER_OR_THROW(method, args, errorresult, err_rval) \
PR_BEGIN_MACRO \
if (IsOuterWindow()) { \
if (!mInnerWindow) { \
NS_WARNING("No inner window available!"); \
errorresult.Throw(NS_ERROR_NOT_INITIALIZED); \
return err_rval; \
} \
return GetCurrentInnerWindowInternal()->method args; \
} \
PR_END_MACRO
#define FORWARD_TO_INNER_MODAL_CONTENT_WINDOW(method, args, err_rval) \ #define FORWARD_TO_INNER_MODAL_CONTENT_WINDOW(method, args, err_rval) \
PR_BEGIN_MACRO \ PR_BEGIN_MACRO \
if (IsOuterWindow()) { \ if (IsOuterWindow()) { \
@ -3565,7 +3553,7 @@ nsGlobalWindow::GetSelf(nsIDOMWindow** aWindow)
Navigator* Navigator*
nsGlobalWindow::GetNavigator(ErrorResult& aError) nsGlobalWindow::GetNavigator(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetNavigator, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mNavigator) { if (!mNavigator) {
mNavigator = new Navigator(this); mNavigator = new Navigator(this);
@ -3577,6 +3565,8 @@ nsGlobalWindow::GetNavigator(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetNavigator(nsIDOMNavigator** aNavigator) nsGlobalWindow::GetNavigator(nsIDOMNavigator** aNavigator)
{ {
FORWARD_TO_INNER(GetNavigator, (aNavigator), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsIDOMNavigator> navigator = GetNavigator(rv); nsCOMPtr<nsIDOMNavigator> navigator = GetNavigator(rv);
navigator.forget(aNavigator); navigator.forget(aNavigator);
@ -3587,7 +3577,7 @@ nsGlobalWindow::GetNavigator(nsIDOMNavigator** aNavigator)
nsScreen* nsScreen*
nsGlobalWindow::GetScreen(ErrorResult& aError) nsGlobalWindow::GetScreen(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetScreen, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mScreen) { if (!mScreen) {
mScreen = nsScreen::Create(this); mScreen = nsScreen::Create(this);
@ -3603,6 +3593,8 @@ nsGlobalWindow::GetScreen(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetScreen(nsIDOMScreen** aScreen) nsGlobalWindow::GetScreen(nsIDOMScreen** aScreen)
{ {
FORWARD_TO_INNER(GetScreen, (aScreen), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsRefPtr<nsScreen> screen = GetScreen(rv); nsRefPtr<nsScreen> screen = GetScreen(rv);
screen.forget(aScreen); screen.forget(aScreen);
@ -3613,7 +3605,7 @@ nsGlobalWindow::GetScreen(nsIDOMScreen** aScreen)
nsHistory* nsHistory*
nsGlobalWindow::GetHistory(ErrorResult& aError) nsGlobalWindow::GetHistory(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetHistory, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mHistory) { if (!mHistory) {
mHistory = new nsHistory(this); mHistory = new nsHistory(this);
@ -3625,6 +3617,8 @@ nsGlobalWindow::GetHistory(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetHistory(nsISupports** aHistory) nsGlobalWindow::GetHistory(nsISupports** aHistory)
{ {
FORWARD_TO_INNER(GetHistory, (aHistory), NS_ERROR_FAILURE);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsISupports> history = GetHistory(rv); nsCOMPtr<nsISupports> history = GetHistory(rv);
history.forget(aHistory); history.forget(aHistory);
@ -3753,7 +3747,7 @@ nsPIDOMWindow::RefreshMediaElements()
SpeechSynthesis* SpeechSynthesis*
nsGlobalWindow::GetSpeechSynthesis(ErrorResult& aError) nsGlobalWindow::GetSpeechSynthesis(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetSpeechSynthesis, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mSpeechSynthesis) { if (!mSpeechSynthesis) {
mSpeechSynthesis = new SpeechSynthesis(this); mSpeechSynthesis = new SpeechSynthesis(this);
@ -3988,6 +3982,8 @@ nsGlobalWindow::GetContent(nsIDOMWindow** aContent)
MozSelfSupport* MozSelfSupport*
nsGlobalWindow::GetMozSelfSupport(ErrorResult& aError) nsGlobalWindow::GetMozSelfSupport(ErrorResult& aError)
{ {
MOZ_ASSERT(IsInnerWindow());
if (mMozSelfSupport) { if (mMozSelfSupport) {
return mMozSelfSupport; return mMozSelfSupport;
} }
@ -4036,7 +4032,7 @@ nsGlobalWindow::GetPrompter(nsIPrompt** aPrompt)
BarProp* BarProp*
nsGlobalWindow::GetMenubar(ErrorResult& aError) nsGlobalWindow::GetMenubar(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetMenubar, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mMenubar) { if (!mMenubar) {
mMenubar = new MenubarProp(this); mMenubar = new MenubarProp(this);
@ -4048,6 +4044,8 @@ nsGlobalWindow::GetMenubar(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetMenubar(nsISupports** aMenubar) nsGlobalWindow::GetMenubar(nsISupports** aMenubar)
{ {
FORWARD_TO_INNER(GetMenubar, (aMenubar), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsISupports> menubar = GetMenubar(rv); nsCOMPtr<nsISupports> menubar = GetMenubar(rv);
menubar.forget(aMenubar); menubar.forget(aMenubar);
@ -4058,7 +4056,7 @@ nsGlobalWindow::GetMenubar(nsISupports** aMenubar)
BarProp* BarProp*
nsGlobalWindow::GetToolbar(ErrorResult& aError) nsGlobalWindow::GetToolbar(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetToolbar, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mToolbar) { if (!mToolbar) {
mToolbar = new ToolbarProp(this); mToolbar = new ToolbarProp(this);
@ -4070,6 +4068,8 @@ nsGlobalWindow::GetToolbar(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetToolbar(nsISupports** aToolbar) nsGlobalWindow::GetToolbar(nsISupports** aToolbar)
{ {
FORWARD_TO_INNER(GetToolbar, (aToolbar), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsISupports> toolbar = GetToolbar(rv); nsCOMPtr<nsISupports> toolbar = GetToolbar(rv);
toolbar.forget(aToolbar); toolbar.forget(aToolbar);
@ -4080,7 +4080,7 @@ nsGlobalWindow::GetToolbar(nsISupports** aToolbar)
BarProp* BarProp*
nsGlobalWindow::GetLocationbar(ErrorResult& aError) nsGlobalWindow::GetLocationbar(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetLocationbar, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mLocationbar) { if (!mLocationbar) {
mLocationbar = new LocationbarProp(this); mLocationbar = new LocationbarProp(this);
@ -4091,6 +4091,8 @@ nsGlobalWindow::GetLocationbar(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetLocationbar(nsISupports** aLocationbar) nsGlobalWindow::GetLocationbar(nsISupports** aLocationbar)
{ {
FORWARD_TO_INNER(GetLocationbar, (aLocationbar), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsISupports> locationbar = GetLocationbar(rv); nsCOMPtr<nsISupports> locationbar = GetLocationbar(rv);
locationbar.forget(aLocationbar); locationbar.forget(aLocationbar);
@ -4101,7 +4103,7 @@ nsGlobalWindow::GetLocationbar(nsISupports** aLocationbar)
BarProp* BarProp*
nsGlobalWindow::GetPersonalbar(ErrorResult& aError) nsGlobalWindow::GetPersonalbar(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetPersonalbar, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mPersonalbar) { if (!mPersonalbar) {
mPersonalbar = new PersonalbarProp(this); mPersonalbar = new PersonalbarProp(this);
@ -4112,6 +4114,8 @@ nsGlobalWindow::GetPersonalbar(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetPersonalbar(nsISupports** aPersonalbar) nsGlobalWindow::GetPersonalbar(nsISupports** aPersonalbar)
{ {
FORWARD_TO_INNER(GetPersonalbar, (aPersonalbar), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsISupports> personalbar = GetPersonalbar(rv); nsCOMPtr<nsISupports> personalbar = GetPersonalbar(rv);
personalbar.forget(aPersonalbar); personalbar.forget(aPersonalbar);
@ -4122,7 +4126,7 @@ nsGlobalWindow::GetPersonalbar(nsISupports** aPersonalbar)
BarProp* BarProp*
nsGlobalWindow::GetStatusbar(ErrorResult& aError) nsGlobalWindow::GetStatusbar(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetStatusbar, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mStatusbar) { if (!mStatusbar) {
mStatusbar = new StatusbarProp(this); mStatusbar = new StatusbarProp(this);
@ -4133,6 +4137,8 @@ nsGlobalWindow::GetStatusbar(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetStatusbar(nsISupports** aStatusbar) nsGlobalWindow::GetStatusbar(nsISupports** aStatusbar)
{ {
FORWARD_TO_INNER(GetStatusbar, (aStatusbar), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsISupports> statusbar = GetStatusbar(rv); nsCOMPtr<nsISupports> statusbar = GetStatusbar(rv);
statusbar.forget(aStatusbar); statusbar.forget(aStatusbar);
@ -4143,7 +4149,7 @@ nsGlobalWindow::GetStatusbar(nsISupports** aStatusbar)
BarProp* BarProp*
nsGlobalWindow::GetScrollbars(ErrorResult& aError) nsGlobalWindow::GetScrollbars(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetScrollbars, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mScrollbars) { if (!mScrollbars) {
mScrollbars = new ScrollbarsProp(this); mScrollbars = new ScrollbarsProp(this);
@ -4155,6 +4161,8 @@ nsGlobalWindow::GetScrollbars(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetScrollbars(nsISupports** aScrollbars) nsGlobalWindow::GetScrollbars(nsISupports** aScrollbars)
{ {
FORWARD_TO_INNER(GetScrollbars, (aScrollbars), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsISupports> scrollbars = GetScrollbars(rv); nsCOMPtr<nsISupports> scrollbars = GetScrollbars(rv);
scrollbars.forget(aScrollbars); scrollbars.forget(aScrollbars);
@ -4296,6 +4304,7 @@ void
nsGlobalWindow::GetOwnPropertyNames(JSContext* aCx, nsTArray<nsString>& aNames, nsGlobalWindow::GetOwnPropertyNames(JSContext* aCx, nsTArray<nsString>& aNames,
ErrorResult& aRv) ErrorResult& aRv)
{ {
MOZ_ASSERT(IsInnerWindow());
// "Components" is marked as enumerable but only resolved on demand :-/. // "Components" is marked as enumerable but only resolved on demand :-/.
//aNames.AppendElement(NS_LITERAL_STRING("Components")); //aNames.AppendElement(NS_LITERAL_STRING("Components"));
@ -4340,7 +4349,7 @@ nsGlobalWindow::IsShowModalDialogEnabled(JSContext*, JSObject*)
nsIDOMOfflineResourceList* nsIDOMOfflineResourceList*
nsGlobalWindow::GetApplicationCache(ErrorResult& aError) nsGlobalWindow::GetApplicationCache(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetApplicationCache, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mApplicationCache) { if (!mApplicationCache) {
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(GetDocShell())); nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(GetDocShell()));
@ -4372,6 +4381,8 @@ nsGlobalWindow::GetApplicationCache(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetApplicationCache(nsIDOMOfflineResourceList **aApplicationCache) nsGlobalWindow::GetApplicationCache(nsIDOMOfflineResourceList **aApplicationCache)
{ {
FORWARD_TO_INNER(GetApplicationCache, (aApplicationCache), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsIDOMOfflineResourceList> applicationCache = nsCOMPtr<nsIDOMOfflineResourceList> applicationCache =
GetApplicationCache(rv); GetApplicationCache(rv);
@ -4383,7 +4394,7 @@ nsGlobalWindow::GetApplicationCache(nsIDOMOfflineResourceList **aApplicationCach
Crypto* Crypto*
nsGlobalWindow::GetCrypto(ErrorResult& aError) nsGlobalWindow::GetCrypto(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetCrypto, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mCrypto) { if (!mCrypto) {
mCrypto = new Crypto(); mCrypto = new Crypto();
@ -4395,6 +4406,8 @@ nsGlobalWindow::GetCrypto(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetCrypto(nsIDOMCrypto** aCrypto) nsGlobalWindow::GetCrypto(nsIDOMCrypto** aCrypto)
{ {
FORWARD_TO_INNER(GetCrypto, (aCrypto), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsIDOMCrypto> crypto = GetCrypto(rv); nsCOMPtr<nsIDOMCrypto> crypto = GetCrypto(rv);
crypto.forget(aCrypto); crypto.forget(aCrypto);
@ -5300,6 +5313,8 @@ NS_IMETHODIMP
nsGlobalWindow::MozRequestAnimationFrame(nsIFrameRequestCallback* aCallback, nsGlobalWindow::MozRequestAnimationFrame(nsIFrameRequestCallback* aCallback,
int32_t *aHandle) int32_t *aHandle)
{ {
FORWARD_TO_INNER(MozRequestAnimationFrame, (aCallback, aHandle), NS_ERROR_UNEXPECTED);
if (!aCallback) { if (!aCallback) {
if (mDoc) { if (mDoc) {
mDoc->WarnOnceAbout(nsIDocument::eMozBeforePaint); mDoc->WarnOnceAbout(nsIDocument::eMozBeforePaint);
@ -5318,6 +5333,8 @@ int32_t
nsGlobalWindow::RequestAnimationFrame(FrameRequestCallback& aCallback, nsGlobalWindow::RequestAnimationFrame(FrameRequestCallback& aCallback,
ErrorResult& aError) ErrorResult& aError)
{ {
MOZ_RELEASE_ASSERT(IsInnerWindow());
nsIDocument::FrameRequestCallbackHolder holder(&aCallback); nsIDocument::FrameRequestCallbackHolder holder(&aCallback);
return RequestAnimationFrame(holder, aError); return RequestAnimationFrame(holder, aError);
} }
@ -5326,6 +5343,7 @@ int32_t
nsGlobalWindow::MozRequestAnimationFrame(nsIFrameRequestCallback* aCallback, nsGlobalWindow::MozRequestAnimationFrame(nsIFrameRequestCallback* aCallback,
ErrorResult& aError) ErrorResult& aError)
{ {
MOZ_RELEASE_ASSERT(IsInnerWindow());
nsIDocument::FrameRequestCallbackHolder holder(aCallback); nsIDocument::FrameRequestCallbackHolder holder(aCallback);
return RequestAnimationFrame(holder, aError); return RequestAnimationFrame(holder, aError);
} }
@ -5334,8 +5352,7 @@ int32_t
nsGlobalWindow::RequestAnimationFrame(const nsIDocument::FrameRequestCallbackHolder& aCallback, nsGlobalWindow::RequestAnimationFrame(const nsIDocument::FrameRequestCallbackHolder& aCallback,
ErrorResult& aError) ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(RequestAnimationFrame, (aCallback, aError), aError, MOZ_RELEASE_ASSERT(IsInnerWindow());
0);
if (!mDoc) { if (!mDoc) {
return 0; return 0;
@ -5355,6 +5372,7 @@ nsGlobalWindow::RequestAnimationFrame(JS::Handle<JS::Value> aCallback,
JSContext* cx, JSContext* cx,
int32_t* aHandle) int32_t* aHandle)
{ {
FORWARD_TO_INNER(RequestAnimationFrame, (aCallback, cx, aHandle), NS_ERROR_UNEXPECTED);
if (!aCallback.isObject() || !JS::IsCallable(&aCallback.toObject())) { if (!aCallback.isObject() || !JS::IsCallable(&aCallback.toObject())) {
return NS_ERROR_INVALID_ARG; return NS_ERROR_INVALID_ARG;
} }
@ -5372,19 +5390,21 @@ nsGlobalWindow::RequestAnimationFrame(JS::Handle<JS::Value> aCallback,
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::MozCancelRequestAnimationFrame(int32_t aHandle) nsGlobalWindow::MozCancelRequestAnimationFrame(int32_t aHandle)
{ {
FORWARD_TO_INNER(MozCancelRequestAnimationFrame, (aHandle), NS_ERROR_UNEXPECTED);
return CancelAnimationFrame(aHandle); return CancelAnimationFrame(aHandle);
} }
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::MozCancelAnimationFrame(int32_t aHandle) nsGlobalWindow::MozCancelAnimationFrame(int32_t aHandle)
{ {
FORWARD_TO_INNER(MozCancelAnimationFrame, (aHandle), NS_ERROR_UNEXPECTED);
return CancelAnimationFrame(aHandle); return CancelAnimationFrame(aHandle);
} }
void void
nsGlobalWindow::CancelAnimationFrame(int32_t aHandle, ErrorResult& aError) nsGlobalWindow::CancelAnimationFrame(int32_t aHandle, ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(CancelAnimationFrame, (aHandle, aError), aError, ); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mDoc) { if (!mDoc) {
return; return;
@ -5396,6 +5416,8 @@ nsGlobalWindow::CancelAnimationFrame(int32_t aHandle, ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::CancelAnimationFrame(int32_t aHandle) nsGlobalWindow::CancelAnimationFrame(int32_t aHandle)
{ {
FORWARD_TO_INNER(CancelAnimationFrame, (aHandle), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
CancelAnimationFrame(aHandle, rv); CancelAnimationFrame(aHandle, rv);
@ -5405,7 +5427,7 @@ nsGlobalWindow::CancelAnimationFrame(int32_t aHandle)
int64_t int64_t
nsGlobalWindow::GetMozAnimationStartTime(ErrorResult& aError) nsGlobalWindow::GetMozAnimationStartTime(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetMozAnimationStartTime, (aError), aError, 0); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (mDoc) { if (mDoc) {
nsIPresShell* presShell = mDoc->GetShell(); nsIPresShell* presShell = mDoc->GetShell();
@ -5422,6 +5444,8 @@ nsGlobalWindow::GetMozAnimationStartTime(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetMozAnimationStartTime(int64_t *aTime) nsGlobalWindow::GetMozAnimationStartTime(int64_t *aTime)
{ {
FORWARD_TO_INNER(GetMozAnimationStartTime, (aTime), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
*aTime = GetMozAnimationStartTime(rv); *aTime = GetMozAnimationStartTime(rv);
@ -7706,6 +7730,8 @@ nsGlobalWindow::MozRequestOverfill(OverfillCallback& aCallback,
void void
nsGlobalWindow::ClearTimeout(int32_t aHandle, ErrorResult& aError) nsGlobalWindow::ClearTimeout(int32_t aHandle, ErrorResult& aError)
{ {
MOZ_RELEASE_ASSERT(IsInnerWindow());
if (aHandle > 0) { if (aHandle > 0) {
ClearTimeoutOrInterval(aHandle, aError); ClearTimeoutOrInterval(aHandle, aError);
} }
@ -7714,6 +7740,8 @@ nsGlobalWindow::ClearTimeout(int32_t aHandle, ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::ClearTimeout(int32_t aHandle) nsGlobalWindow::ClearTimeout(int32_t aHandle)
{ {
FORWARD_TO_INNER(ClearTimeout, (aHandle), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
ClearTimeout(aHandle, rv); ClearTimeout(aHandle, rv);
@ -9712,11 +9740,10 @@ nsGlobalWindow::GetPrivateRoot()
return static_cast<nsGlobalWindow*>(top.get()); return static_cast<nsGlobalWindow*>(top.get());
} }
nsLocation* nsLocation*
nsGlobalWindow::GetLocation(ErrorResult& aError) nsGlobalWindow::GetLocation(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetLocation, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
nsIDocShell *docShell = GetDocShell(); nsIDocShell *docShell = GetDocShell();
if (!mLocation && docShell) { if (!mLocation && docShell) {
@ -9728,6 +9755,8 @@ nsGlobalWindow::GetLocation(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetLocation(nsIDOMLocation ** aLocation) nsGlobalWindow::GetLocation(nsIDOMLocation ** aLocation)
{ {
FORWARD_TO_INNER(GetLocation, (aLocation), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsIDOMLocation> location = GetLocation(rv); nsCOMPtr<nsIDOMLocation> location = GetLocation(rv);
location.forget(aLocation); location.forget(aLocation);
@ -10106,7 +10135,7 @@ private:
nsresult nsresult
nsGlobalWindow::DispatchAsyncHashchange(nsIURI *aOldURI, nsIURI *aNewURI) nsGlobalWindow::DispatchAsyncHashchange(nsIURI *aOldURI, nsIURI *aNewURI)
{ {
FORWARD_TO_INNER(DispatchAsyncHashchange, (aOldURI, aNewURI), NS_OK); MOZ_RELEASE_ASSERT(IsInnerWindow());
// Make sure that aOldURI and aNewURI are identical up to the '#', and that // Make sure that aOldURI and aNewURI are identical up to the '#', and that
// their hashes are different. // their hashes are different.
@ -10136,8 +10165,9 @@ nsGlobalWindow::FireHashchange(const nsAString &aOldURL,
MOZ_ASSERT(IsInnerWindow()); MOZ_ASSERT(IsInnerWindow());
// Don't do anything if the window is frozen. // Don't do anything if the window is frozen.
if (IsFrozen()) if (IsFrozen()) {
return NS_OK; return NS_OK;
}
// Get a presentation shell for use in creating the hashchange event. // Get a presentation shell for use in creating the hashchange event.
NS_ENSURE_STATE(IsCurrentInnerWindow()); NS_ENSURE_STATE(IsCurrentInnerWindow());
@ -10167,8 +10197,7 @@ nsGlobalWindow::FireHashchange(const nsAString &aOldURL,
nsresult nsresult
nsGlobalWindow::DispatchSyncPopState() nsGlobalWindow::DispatchSyncPopState()
{ {
FORWARD_TO_INNER(DispatchSyncPopState, (), NS_OK); MOZ_RELEASE_ASSERT(IsInnerWindow());
NS_ASSERTION(nsContentUtils::IsSafeToRunScript(), NS_ASSERTION(nsContentUtils::IsSafeToRunScript(),
"Must be safe to run script here."); "Must be safe to run script here.");
@ -10396,7 +10425,7 @@ nsGlobalWindow::GetComputedStyleHelper(Element& aElt,
DOMStorage* DOMStorage*
nsGlobalWindow::GetSessionStorage(ErrorResult& aError) nsGlobalWindow::GetSessionStorage(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetSessionStorage, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
nsIPrincipal *principal = GetPrincipal(); nsIPrincipal *principal = GetPrincipal();
nsIDocShell* docShell = GetDocShell(); nsIDocShell* docShell = GetDocShell();
@ -10475,6 +10504,8 @@ nsGlobalWindow::GetSessionStorage(ErrorResult& aError)
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalWindow::GetSessionStorage(nsISupports** aSessionStorage) nsGlobalWindow::GetSessionStorage(nsISupports** aSessionStorage)
{ {
FORWARD_TO_INNER(GetSessionStorage, (aSessionStorage), NS_ERROR_FAILURE);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsIDOMStorage> storage = GetSessionStorage(rv); nsCOMPtr<nsIDOMStorage> storage = GetSessionStorage(rv);
storage.forget(aSessionStorage); storage.forget(aSessionStorage);
@ -10485,7 +10516,7 @@ nsGlobalWindow::GetSessionStorage(nsISupports** aSessionStorage)
DOMStorage* DOMStorage*
nsGlobalWindow::GetLocalStorage(ErrorResult& aError) nsGlobalWindow::GetLocalStorage(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetLocalStorage, (aError), aError, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!Preferences::GetBool(kStorageEnabled)) { if (!Preferences::GetBool(kStorageEnabled)) {
return nullptr; return nullptr;
@ -10541,6 +10572,7 @@ NS_IMETHODIMP
nsGlobalWindow::GetLocalStorage(nsISupports** aLocalStorage) nsGlobalWindow::GetLocalStorage(nsISupports** aLocalStorage)
{ {
NS_ENSURE_ARG(aLocalStorage); NS_ENSURE_ARG(aLocalStorage);
FORWARD_TO_INNER(GetLocalStorage, (aLocalStorage), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
nsCOMPtr<nsIDOMStorage> storage = GetLocalStorage(rv); nsCOMPtr<nsIDOMStorage> storage = GetLocalStorage(rv);
@ -10552,6 +10584,7 @@ nsGlobalWindow::GetLocalStorage(nsISupports** aLocalStorage)
IDBFactory* IDBFactory*
nsGlobalWindow::GetIndexedDB(ErrorResult& aError) nsGlobalWindow::GetIndexedDB(ErrorResult& aError)
{ {
MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mIndexedDB) { if (!mIndexedDB) {
// This may keep mIndexedDB null without setting an error. // This may keep mIndexedDB null without setting an error.
aError = IDBFactory::CreateForWindow(this, getter_AddRefs(mIndexedDB)); aError = IDBFactory::CreateForWindow(this, getter_AddRefs(mIndexedDB));
@ -12491,8 +12524,7 @@ nsGlobalWindow::RunTimeout(nsTimeout *aTimeout)
void void
nsGlobalWindow::ClearTimeoutOrInterval(int32_t aTimerID, ErrorResult& aError) nsGlobalWindow::ClearTimeoutOrInterval(int32_t aTimerID, ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(ClearTimeoutOrInterval, (aTimerID, aError), MOZ_RELEASE_ASSERT(IsInnerWindow());
aError, );
uint32_t public_id = (uint32_t)aTimerID; uint32_t public_id = (uint32_t)aTimerID;
nsTimeout *timeout; nsTimeout *timeout;
@ -13736,6 +13768,8 @@ nsGlobalWindow::NotifyDefaultButtonLoaded(Element& aDefaultButton,
NS_IMETHODIMP NS_IMETHODIMP
nsGlobalChromeWindow::GetMessageManager(nsIMessageBroadcaster** aManager) nsGlobalChromeWindow::GetMessageManager(nsIMessageBroadcaster** aManager)
{ {
FORWARD_TO_INNER_CHROME(GetMessageManager, (aManager), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
NS_IF_ADDREF(*aManager = GetMessageManager(rv)); NS_IF_ADDREF(*aManager = GetMessageManager(rv));
return rv.StealNSResult(); return rv.StealNSResult();
@ -13744,8 +13778,8 @@ nsGlobalChromeWindow::GetMessageManager(nsIMessageBroadcaster** aManager)
nsIMessageBroadcaster* nsIMessageBroadcaster*
nsGlobalWindow::GetMessageManager(ErrorResult& aError) nsGlobalWindow::GetMessageManager(ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetMessageManager, (aError), aError, nullptr);
MOZ_ASSERT(IsChromeWindow()); MOZ_ASSERT(IsChromeWindow());
MOZ_RELEASE_ASSERT(IsInnerWindow());
nsGlobalChromeWindow* myself = static_cast<nsGlobalChromeWindow*>(this); nsGlobalChromeWindow* myself = static_cast<nsGlobalChromeWindow*>(this);
if (!myself->mMessageManager) { if (!myself->mMessageManager) {
nsCOMPtr<nsIMessageBroadcaster> globalMM = nsCOMPtr<nsIMessageBroadcaster> globalMM =
@ -13762,6 +13796,8 @@ NS_IMETHODIMP
nsGlobalChromeWindow::GetGroupMessageManager(const nsAString& aGroup, nsGlobalChromeWindow::GetGroupMessageManager(const nsAString& aGroup,
nsIMessageBroadcaster** aManager) nsIMessageBroadcaster** aManager)
{ {
FORWARD_TO_INNER_CHROME(GetGroupMessageManager, (aGroup, aManager), NS_ERROR_UNEXPECTED);
ErrorResult rv; ErrorResult rv;
NS_IF_ADDREF(*aManager = GetGroupMessageManager(aGroup, rv)); NS_IF_ADDREF(*aManager = GetGroupMessageManager(aGroup, rv));
return rv.StealNSResult(); return rv.StealNSResult();
@ -13771,8 +13807,8 @@ nsIMessageBroadcaster*
nsGlobalWindow::GetGroupMessageManager(const nsAString& aGroup, nsGlobalWindow::GetGroupMessageManager(const nsAString& aGroup,
ErrorResult& aError) ErrorResult& aError)
{ {
FORWARD_TO_INNER_OR_THROW(GetGroupMessageManager, (aGroup, aError), aError, nullptr);
MOZ_ASSERT(IsChromeWindow()); MOZ_ASSERT(IsChromeWindow());
MOZ_RELEASE_ASSERT(IsInnerWindow());
nsGlobalChromeWindow* myself = static_cast<nsGlobalChromeWindow*>(this); nsGlobalChromeWindow* myself = static_cast<nsGlobalChromeWindow*>(this);
nsCOMPtr<nsIMessageBroadcaster> messageManager = nsCOMPtr<nsIMessageBroadcaster> messageManager =
@ -13937,6 +13973,8 @@ NS_IMETHODIMP
nsGlobalWindow::GetConsole(JSContext* aCx, nsGlobalWindow::GetConsole(JSContext* aCx,
JS::MutableHandle<JS::Value> aConsole) JS::MutableHandle<JS::Value> aConsole)
{ {
FORWARD_TO_INNER(GetConsole, (aCx, aConsole), NS_ERROR_FAILURE);
ErrorResult rv; ErrorResult rv;
nsRefPtr<Console> console = GetConsole(rv); nsRefPtr<Console> console = GetConsole(rv);
if (rv.Failed()) { if (rv.Failed()) {
@ -13961,7 +13999,7 @@ nsGlobalWindow::SetConsole(JSContext* aCx, JS::Handle<JS::Value> aValue)
Console* Console*
nsGlobalWindow::GetConsole(ErrorResult& aRv) nsGlobalWindow::GetConsole(ErrorResult& aRv)
{ {
FORWARD_TO_INNER_OR_THROW(GetConsole, (aRv), aRv, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
if (!mConsole) { if (!mConsole) {
mConsole = new Console(this); mConsole = new Console(this);
@ -13973,7 +14011,7 @@ nsGlobalWindow::GetConsole(ErrorResult& aRv)
already_AddRefed<External> already_AddRefed<External>
nsGlobalWindow::GetExternal(ErrorResult& aRv) nsGlobalWindow::GetExternal(ErrorResult& aRv)
{ {
FORWARD_TO_INNER_OR_THROW(GetExternal, (aRv), aRv, nullptr); MOZ_RELEASE_ASSERT(IsInnerWindow());
#ifdef HAVE_SIDEBAR #ifdef HAVE_SIDEBAR
if (!mExternal) { if (!mExternal) {
@ -13999,7 +14037,7 @@ void
nsGlobalWindow::GetSidebar(OwningExternalOrWindowProxy& aResult, nsGlobalWindow::GetSidebar(OwningExternalOrWindowProxy& aResult,
ErrorResult& aRv) ErrorResult& aRv)
{ {
FORWARD_TO_INNER_OR_THROW(GetSidebar, (aResult, aRv), aRv, ); MOZ_RELEASE_ASSERT(IsInnerWindow());
#ifdef HAVE_SIDEBAR #ifdef HAVE_SIDEBAR
// First check for a named frame named "sidebar" // First check for a named frame named "sidebar"

1
dom/base/nsGlobalWindow.h
View File

@ -1647,6 +1647,7 @@ protected:
nsRefPtr<mozilla::dom::Navigator> mNavigator; nsRefPtr<mozilla::dom::Navigator> mNavigator;
nsRefPtr<nsScreen> mScreen; nsRefPtr<nsScreen> mScreen;
nsRefPtr<nsDOMWindowList> mFrames; nsRefPtr<nsDOMWindowList> mFrames;
// All BarProps are inner window only.
nsRefPtr<mozilla::dom::BarProp> mMenubar; nsRefPtr<mozilla::dom::BarProp> mMenubar;
nsRefPtr<mozilla::dom::BarProp> mToolbar; nsRefPtr<mozilla::dom::BarProp> mToolbar;
nsRefPtr<mozilla::dom::BarProp> mLocationbar; nsRefPtr<mozilla::dom::BarProp> mLocationbar;

1
dom/base/nsHistory.cpp
View File

@ -46,6 +46,7 @@ NS_INTERFACE_MAP_END
nsHistory::nsHistory(nsPIDOMWindow* aInnerWindow) nsHistory::nsHistory(nsPIDOMWindow* aInnerWindow)
: mInnerWindow(do_GetWeakReference(aInnerWindow)) : mInnerWindow(do_GetWeakReference(aInnerWindow))
{ {
MOZ_ASSERT(aInnerWindow->IsInnerWindow());
} }
nsHistory::~nsHistory() nsHistory::~nsHistory()

1
dom/base/nsScreen.cpp
View File

@ -25,6 +25,7 @@ using namespace mozilla::dom;
nsScreen::Create(nsPIDOMWindow* aWindow) nsScreen::Create(nsPIDOMWindow* aWindow)
{ {
MOZ_ASSERT(aWindow); MOZ_ASSERT(aWindow);
MOZ_ASSERT(aWindow->IsInnerWindow());
if (!aWindow->GetDocShell()) { if (!aWindow->GetDocShell()) {
return nullptr; return nullptr;

1
dom/media/webspeech/synth/SpeechSynthesis.cpp
View File

@ -73,6 +73,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechSynthesis)
SpeechSynthesis::SpeechSynthesis(nsPIDOMWindow* aParent) SpeechSynthesis::SpeechSynthesis(nsPIDOMWindow* aParent)
: mParent(aParent) : mParent(aParent)
{ {
MOZ_ASSERT(aParent->IsInnerWindow());
} }
SpeechSynthesis::~SpeechSynthesis() SpeechSynthesis::~SpeechSynthesis()

7
xpfe/appshell/nsXULWindow.cpp
View File

@ -1962,8 +1962,15 @@ void nsXULWindow::PlaceWindowLayersBehind(uint32_t aLowLevel,
void nsXULWindow::SetContentScrollbarVisibility(bool aVisible) void nsXULWindow::SetContentScrollbarVisibility(bool aVisible)
{ {
nsCOMPtr<nsPIDOMWindow> contentWin(do_GetInterface(mPrimaryContentShell)); nsCOMPtr<nsPIDOMWindow> contentWin(do_GetInterface(mPrimaryContentShell));
if (!contentWin) {
return;
}
MOZ_ASSERT(contentWin->IsOuterWindow());
contentWin = contentWin->GetCurrentInnerWindow();
if (contentWin) { if (contentWin) {
mozilla::ErrorResult rv; mozilla::ErrorResult rv;
nsRefPtr<nsGlobalWindow> window = static_cast<nsGlobalWindow*>(contentWin.get()); nsRefPtr<nsGlobalWindow> window = static_cast<nsGlobalWindow*>(contentWin.get());
nsRefPtr<mozilla::dom::BarProp> scrollbars = window->GetScrollbars(rv); nsRefPtr<mozilla::dom::BarProp> scrollbars = window->GetScrollbars(rv);
if (scrollbars) { if (scrollbars) {