Backed out changeset a3cd2f1b3e33 (bug 1125351) for breaking m-oth tests on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 26 Jan 2015 16:57:10 +0100
changeset 239116 7345338634ab288fa17b128f6a0c3504b39d1a6d
parent 239115 615f118f2787be5a93c6150ab8ce805c08e851fc
child 239117 feda8ca8f832177e80f77a8c447195a9e1936811
push id487
push userbcampen@mozilla.com
push dateMon, 26 Jan 2015 23:32:56 +0000
bugs1125351
milestone38.0a1
backs outa3cd2f1b3e33446b1257e9d013293964ea4ab269
Backed out changeset a3cd2f1b3e33 (bug 1125351) for breaking m-oth tests on a CLOSED TREE
docshell/base/nsDocShell.cpp
docshell/base/nsIDocShell.idl
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -3378,17 +3378,21 @@ nsDocShell::SetDocLoaderParent(nsDocLoad
             SetAllowWindowControl(value);
         }
         SetAllowContentRetargeting(
             parentAsDocShell->GetAllowContentRetargeting());
         if (NS_SUCCEEDED(parentAsDocShell->GetIsActive(&value)))
         {
             SetIsActive(value);
         }
-        SetIsPrerendered(parentAsDocShell->GetIsPrerendered());
+        if (NS_SUCCEEDED(parentAsDocShell->GetIsPrerendered(&value))) {
+            if (value) {
+                SetIsPrerendered(true);
+            }
+        }
         if (NS_FAILED(parentAsDocShell->GetAllowDNSPrefetch(&value))) {
             value = false;
         }
         SetAllowDNSPrefetch(value);
         value = parentAsDocShell->GetAffectPrivateSessionLifetime();
         SetAffectPrivateSessionLifetime(value);
         uint32_t flags;
         if (NS_SUCCEEDED(parentAsDocShell->GetDefaultLoadFlags(&flags)))
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -619,17 +619,17 @@ interface nsIDocShell : nsIDocShellTreeI
    */
   attribute boolean isActive;
 
   /**
    * Puts the docshell in prerendering mode. noscript because we want only
    * native code to be able to put a docshell in prerendering.
    */
   [noscript] void SetIsPrerendered(in boolean prerendered);
-  [infallible] readonly attribute boolean isPrerendered;
+  readonly attribute boolean isPrerendered;
 
   /**
    * The ID of the docshell in the session history.
    */
   readonly attribute unsigned long long historyID;
 
   /**
    * Sets whether a docshell is an app tab. An app tab docshell may behave