Bug 1364364 - Part 6: Re-connect nsDocViewerFocusListener in nsDocumentViewer::Open. r?smaug
I noticed this error message on fixing dom/workers/test/test_suspend.html:
WARNING: NS_ENSURE_TRUE(mDocViewer) failed:
file layout/base/nsDocumentViewer.cpp, line 3863
It happens when a nsDocumentViewer::Close() is followed by a
nsDocumentViewer::Open(), the viewer would have been disconnected. Since it
takes only one-line change to fix I just include it in this bug.
MozReview-Commit-ID: LMT2PJkUqi1
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1502,16 +1502,18 @@ nsDocumentViewer::Open(nsISupports *aSta
nsCOMPtr<nsIDocShell> shell = do_QueryInterface(item);
AttachContainerRecurse(shell);
}
}
SyncParentSubDocMap();
if (mFocusListener && mDocument) {
+ // The focus listener may have been disconnected.
+ mFocusListener->Init(this);
mDocument->AddEventListener(NS_LITERAL_STRING("focus"), mFocusListener,
false, false);
mDocument->AddEventListener(NS_LITERAL_STRING("blur"), mFocusListener,
false, false);
}
// XXX re-enable image animations once that works correctly
