Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 865745 - Check mGlobal instead of mCx to see if we're in a functional state. r=smaug

Browse Source 
Their lifetimes should be the same, and the latter is going away.
This commit is contained in:
Bobby Holley 2013-06-29 18:44:05 -06:00
parent e6907d8bb4
commit 195d6b98ba
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsInProcessTabChildGlobal.cpp
View File

@ -247,7 +247,7 @@ nsInProcessTabChildGlobal::DelayedDisconnect()
if (!mLoadingScript) {
nsContentUtils::ReleaseWrapper(static_cast<EventTarget*>(this), this);
if (mCx) {
if (mGlobal) {
DestroyCx();
}
} else {

14
dom/ipc/TabChild.cpp
View File

@ -1145,7 +1145,7 @@ TabChild::~TabChild()
if (webBrowser) {
webBrowser->SetContainerWindow(nullptr);
}
if (mCx) {
if (mGlobal) {
DestroyCx();
}
@ -1486,7 +1486,7 @@ TabChild::RecvUpdateFrame(const FrameMetrics& aFrameMetrics)
bool
TabChild::ProcessUpdateFrame(const FrameMetrics& aFrameMetrics)
{
if (!mCx || !mTabChildGlobal) {
if (!mGlobal || !mTabChildGlobal) {
return true;
}
@ -1556,7 +1556,7 @@ TabChild::ProcessUpdateFrame(const FrameMetrics& aFrameMetrics)
bool
TabChild::RecvHandleDoubleTap(const CSSIntPoint& aPoint)
{
if (!mCx || !mTabChildGlobal) {
if (!mGlobal || !mTabChildGlobal) {
return true;
}
@ -1573,7 +1573,7 @@ TabChild::RecvHandleDoubleTap(const CSSIntPoint& aPoint)
bool
TabChild::RecvHandleSingleTap(const CSSIntPoint& aPoint)
{
if (!mCx || !mTabChildGlobal) {
if (!mGlobal || !mTabChildGlobal) {
return true;
}
@ -1587,7 +1587,7 @@ TabChild::RecvHandleSingleTap(const CSSIntPoint& aPoint)
bool
TabChild::RecvHandleLongTap(const CSSIntPoint& aPoint)
{
if (!mCx || !mTabChildGlobal) {
if (!mGlobal || !mTabChildGlobal) {
return true;
}
@ -1996,7 +1996,7 @@ TabChild::DeallocPOfflineCacheUpdate(POfflineCacheUpdateChild* actor)
bool
TabChild::RecvLoadRemoteScript(const nsString& aURL)
{
if (!mCx && !InitTabChildGlobal())
if (!mGlobal && !InitTabChildGlobal())
// This can happen if we're half-destroyed. It's not a fatal
// error.
return true;
@ -2095,7 +2095,7 @@ TabChild::DeallocPRenderFrame(PRenderFrameChild* aFrame)
bool
TabChild::InitTabChildGlobal(FrameScriptLoading aScriptLoading)
{
if (!mCx && !mTabChildGlobal) {
if (!mGlobal && !mTabChildGlobal) {
nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mWebNav);
NS_ENSURE_TRUE(window, false);
nsCOMPtr<EventTarget> chromeHandler =