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

This commit is contained in:
Carsten "Tomcat" Book 2015-01-26 16:57:10 +01:00
parent c55613069a
commit 2bcfbeed7e
2 changed files with 6 additions and 2 deletions

View File

@ -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;
}

View File

@ -624,7 +624,7 @@ interface nsIDocShell : nsIDocShellTreeItem
* 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.