Backed out 7 changesets (bug 1580565) for Gecko-view failures in Test.crashParent. CLOSED TREE
Backed out changeset 7da9785ebb06 (bug 1580565) Backed out changeset a80e177a91b2 (bug 1580565) Backed out changeset 2cf821f2a6ea (bug 1580565) Backed out changeset a30f158eba45 (bug 1580565) Backed out changeset 276b131190a8 (bug 1580565) Backed out changeset 3c15e4c600c4 (bug 1580565) Backed out changeset bf8877cdb10f (bug 1580565)
This commit is contained in:
@@ -121,7 +121,7 @@ Nullable<WindowProxyHolder> nsGenericHTMLFrameElement::GetContentWindow() {
|
||||
}
|
||||
|
||||
void nsGenericHTMLFrameElement::EnsureFrameLoader() {
|
||||
if (!IsInComposedDoc() || mFrameLoader || OwnerDoc()->IsStaticDocument()) {
|
||||
if (!IsInComposedDoc() || mFrameLoader) {
|
||||
// If frame loader is there, we just keep it around, cached
|
||||
return;
|
||||
}
|
||||
@@ -320,7 +320,10 @@ nsresult nsGenericHTMLFrameElement::CopyInnerTo(Element* aDest) {
|
||||
if (doc->IsStaticDocument() && mFrameLoader) {
|
||||
nsGenericHTMLFrameElement* dest =
|
||||
static_cast<nsGenericHTMLFrameElement*>(aDest);
|
||||
doc->AddPendingFrameStaticClone(dest, mFrameLoader);
|
||||
RefPtr<nsFrameLoader> fl = nsFrameLoader::Create(dest, false);
|
||||
NS_ENSURE_STATE(fl);
|
||||
dest->mFrameLoader = fl;
|
||||
mFrameLoader->CreateStaticClone(fl);
|
||||
}
|
||||
|
||||
return rv;
|
||||
|
||||
Reference in New Issue
Block a user