Backed out changeset 4e7a2d27d636: relanding Bug 433616 part 2. Implement loading of external resource documents. r=jst, sr=roc

2008-10-04 13:00:09 -07:00
parent f1f9e98ea0
commit 370a4d698b
11 changed files with 847 additions and 35 deletions
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -727,6 +727,11 @@ nsFrameLoader::EnsureDocShell()
    return NS_ERROR_UNEXPECTED;
  }

+  if (doc->GetDisplayDocument()) {
+    // Don't allow subframe loads in external reference documents
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
  nsCOMPtr<nsIWebNavigation> parentAsWebNav =
    do_GetInterface(doc->GetScriptGlobalObject());