Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1450266 P2 Remove duplicate cleanup code from FreeInnerObjects(). r=smaug

Browse Source
This commit is contained in:
Ben Kelly 2018-04-03 17:10:16 -07:00
parent 2c5666c6d8
commit 7af4cde135
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dom/base/nsGlobalWindowInner.cpp
View File

@ -1200,9 +1200,7 @@ nsGlobalWindowInner::FreeInnerObjects()
mNavigator = nullptr;
}
if (mScreen) {
mScreen = nullptr;
}
mScreen = nullptr;
#if defined(MOZ_WIDGET_ANDROID)
mOrientationChangeObserver = nullptr;
@ -1296,22 +1294,12 @@ nsGlobalWindowInner::FreeInnerObjects()
mObserver->Forget();
}
if (mNavigator) {
mNavigator->Invalidate();
mNavigator = nullptr;
}
mScreen = nullptr;
mMenubar = nullptr;
mToolbar = nullptr;
mLocationbar = nullptr;
mPersonalbar = nullptr;
mStatusbar = nullptr;
mScrollbars = nullptr;
mHistory = nullptr;
mCustomElements = nullptr;
mApplicationCache = nullptr;
mIndexedDB = nullptr;
mConsole = nullptr;
@ -1327,20 +1315,8 @@ nsGlobalWindowInner::FreeInnerObjects()
mSpeechSynthesis = nullptr;
#endif
#if defined(MOZ_WIDGET_ANDROID)
mOrientationChangeObserver = nullptr;
#endif
mChromeEventHandler = nullptr; // Forces Release
mParentTarget = nullptr;
DisableGamepadUpdates();
mHasGamepad = false;
DisableVRUpdates();
mHasVREvents = false;
mHasVRDisplayActivateEvents = false;
DisableIdleCallbackRequests();
if (mCleanMessageManager) {
MOZ_ASSERT(mIsChrome, "only chrome should have msg manager cleaned");
if (mChromeFields.mMessageManager) {
@ -1348,18 +1324,6 @@ nsGlobalWindowInner::FreeInnerObjects()
}
}
CleanupCachedXBLHandlers();
for (uint32_t i = 0; i < mAudioContexts.Length(); ++i) {
mAudioContexts[i]->Shutdown();
}
mAudioContexts.Clear();
if (mIdleTimer) {
mIdleTimer->Cancel();
mIdleTimer = nullptr;
}
mIntlUtils = nullptr;
}