Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-23 16:22:55 -05:00
parent 4eded194db
commit c8b93bb67a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docshell/base/nsDocShell.cpp
View File

@ -3383,10 +3383,8 @@ nsDocShell::SetDocLoaderParent(nsDocLoader * aParent)
{
SetIsActive(value);
}
if (NS_SUCCEEDED(parentAsDocShell->GetIsPrerendered(&value))) {
if (value) {
SetIsPrerendered(true);
}
if (parentAsDocShell->GetIsPrerendered()) {
SetIsPrerendered(true);
}
if (NS_FAILED(parentAsDocShell->GetAllowDNSPrefetch(&value))) {
value = false;

2
docshell/base/nsIDocShell.idl
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);
readonly attribute boolean isPrerendered;
[infallible] readonly attribute boolean isPrerendered;
/**
* The ID of the docshell in the session history.