Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 57624f26be8f (bug 702080) on the suspicion of causing a b2g mochitest-3 failure, since it touches code near remote browser stuff

Browse Source 
Landed on a CLOSED TREE
This commit is contained in:
Ehsan Akhgari 2013-06-18 23:52:07 -04:00
parent daffb2d431
commit 74512309e7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsFrameLoader.cpp
View File

@ -298,7 +298,7 @@ nsFrameLoader::Create(Element* aOwner, bool aNetworkCreated)
{
NS_ENSURE_TRUE(aOwner, nullptr);
nsIDocument* doc = aOwner->OwnerDoc();
NS_ENSURE_TRUE(!doc->IsResourceDoc() &&
NS_ENSURE_TRUE(!doc->GetDisplayDocument() &&
((!doc->IsLoadedAsData() && aOwner->GetCurrentDoc()) ||
doc->IsStaticDocument()),
nullptr);
@ -1792,7 +1792,7 @@ nsFrameLoader::GetWindowDimensions(nsRect& aRect)
return NS_ERROR_FAILURE;
}
if (doc->IsResourceDoc()) {
if (doc->GetDisplayDocument()) {
return NS_ERROR_FAILURE;
}
@ -1967,7 +1967,7 @@ nsFrameLoader::TryRemoteBrowser()
return false;
}
if (doc->IsResourceDoc()) {
if (doc->GetDisplayDocument()) {
// Don't allow subframe loads in external reference documents
return false;
}

2
layout/generic/nsFrame.cpp
View File

@ -4883,7 +4883,7 @@ nsIFrame::SchedulePaint(uint32_t aFlags)
// No need to schedule a paint for an external document since they aren't
// painted directly.
if (!pres || (pres->Document() && pres->Document()->IsResourceDoc())) {
if (!pres || (pres->Document() && pres->Document()->GetDisplayDocument())) {
return;
}