Merge mozilla-central into Electrolysis

2009-08-26 12:15:27 -04:00
parent 2a473769d9 c56b64284d
commit c8e0926cdd
2750 changed files with 86279 additions and 105812 deletions
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -148,6 +148,17 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFrameLoader)
  NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END

+nsFrameLoader*
+nsFrameLoader::Create(nsIContent* aOwner)
+{
+  NS_ENSURE_TRUE(aOwner, nsnull);
+  nsIDocument* doc = aOwner->GetCurrentDoc();
+  NS_ENSURE_TRUE(doc && !doc->GetDisplayDocument() &&
+                 !doc->IsLoadedAsData(), nsnull);
+
+  return new nsFrameLoader(aOwner);
+}
+
 NS_IMETHODIMP
 nsFrameLoader::LoadFrame()
 {