Backed out 7 changesets (bug 1580565) for bc failures on a CLOSED TREE
Backed out changeset e44e0a6366f8 (bug 1580565) Backed out changeset c0849928f934 (bug 1580565) Backed out changeset 3d4f155096be (bug 1580565) Backed out changeset 108d5fb4418e (bug 1580565) Backed out changeset d8dea951a032 (bug 1580565) Backed out changeset f9ab41f29552 (bug 1580565) Backed out changeset fd5d76304c09 (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