Bug 1125351 - Make nsIDocShell.isPrerendered infallible; r=bzbarsky

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