Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(771)

Unified Diff: Source/core/page/ScopedPageLoadDeferrer.cpp

Issue 302213002: Convert page-level classes to handle RemoteFrames from FrameTree (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: bug fix Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/page/PageSerializer.cpp ('k') | Source/core/page/SpatialNavigation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/ScopedPageLoadDeferrer.cpp
diff --git a/Source/core/page/ScopedPageLoadDeferrer.cpp b/Source/core/page/ScopedPageLoadDeferrer.cpp
index 4f223261e726b670afde9e5ae11defa7c735a925..1387aef793672fcdcf376fd39504212cb4b80322 100644
--- a/Source/core/page/ScopedPageLoadDeferrer.cpp
+++ b/Source/core/page/ScopedPageLoadDeferrer.cpp
@@ -49,8 +49,10 @@ ScopedPageLoadDeferrer::ScopedPageLoadDeferrer(Page* exclusion)
// This code is not logically part of load deferring, but we do not want JS code executed
// beneath modal windows or sheets, which is exactly when ScopedPageLoadDeferrer is used.
- for (LocalFrame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
- frame->document()->suspendScheduledTasks();
+ for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (frame->isLocalFrame())
+ toLocalFrame(frame)->document()->suspendScheduledTasks();
+ }
}
size_t count = m_deferredFrames.size();
@@ -66,8 +68,10 @@ ScopedPageLoadDeferrer::~ScopedPageLoadDeferrer()
if (Page* page = m_deferredFrames[i]->page()) {
page->setDefersLoading(false);
- for (LocalFrame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext())
- frame->document()->resumeScheduledTasks();
+ for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (frame->isLocalFrame())
+ toLocalFrame(frame)->document()->resumeScheduledTasks();
+ }
}
}
}
« no previous file with comments | « Source/core/page/PageSerializer.cpp ('k') | Source/core/page/SpatialNavigation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698