mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-26 18:31:29 +00:00
Some overlay ids getting registered twice or not at all b=351217 r=jst sr=bz
This commit is contained in:
parent
69905acac4
commit
391a283035
@ -3641,7 +3641,15 @@ nsXULDocument::OverlayForwardReference::Resolve()
|
||||
return eResolve_Error;
|
||||
}
|
||||
|
||||
mDocument->InsertElement(mDocument->mRootContent, mOverlay, notify);
|
||||
rv = mDocument->InsertElement(mDocument->mRootContent, mOverlay, notify);
|
||||
if (NS_FAILED(rv)) return eResolve_Error;
|
||||
|
||||
if (!notify) {
|
||||
// Add child and any descendants to the element map
|
||||
rv = mDocument->AddSubtreeToDocument(mOverlay);
|
||||
if (NS_FAILED(rv)) return eResolve_Error;
|
||||
}
|
||||
|
||||
mResolved = PR_TRUE;
|
||||
return eResolve_Succeeded;
|
||||
}
|
||||
@ -3670,9 +3678,11 @@ nsXULDocument::OverlayForwardReference::Resolve()
|
||||
target->SetScriptTypeID(oldDefLang);
|
||||
if (NS_FAILED(rv)) return eResolve_Error;
|
||||
|
||||
// Add child and any descendants to the element map
|
||||
rv = mDocument->AddSubtreeToDocument(target);
|
||||
if (NS_FAILED(rv)) return eResolve_Error;
|
||||
if (!notify) {
|
||||
// Add child and any descendants to the element map
|
||||
rv = mDocument->AddSubtreeToDocument(target);
|
||||
if (NS_FAILED(rv)) return eResolve_Error;
|
||||
}
|
||||
|
||||
#ifdef PR_LOGGING
|
||||
if (PR_LOG_TEST(gXULLog, PR_LOG_NOTICE)) {
|
||||
|
Loading…
Reference in New Issue
Block a user