Backed out changeset a3cd2f1b3e33 (bug 1125351) for breaking m-oth tests on a CLOSED TREE

2015-01-26 16:57:10 +01:00
parent a7516bf8b9
commit a0bf98edd8
2 changed files with 6 additions and 2 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -3383,7 +3383,11 @@ nsDocShell::SetDocLoaderParent(nsDocLoader * aParent)
        {
            SetIsActive(value);
        }
-        SetIsPrerendered(parentAsDocShell->GetIsPrerendered());
+        if (NS_SUCCEEDED(parentAsDocShell->GetIsPrerendered(&value))) {
+            if (value) {
+                SetIsPrerendered(true);
+            }
+        }
        if (NS_FAILED(parentAsDocShell->GetAllowDNSPrefetch(&value))) {
            value = false;
        }