Bug 433616 part 2. Implement loading of external resource documents. r=jst, sr=roc

2008-09-28 15:15:22 -04:00
parent 13c6f99737
commit c61b8b8341
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());