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

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

Issue 625583002: Properly suspend HTMLDocumentParser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed wrong method called Created 6 years, 2 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
Index: Source/core/page/ScopedPageLoadDeferrer.cpp
diff --git a/Source/core/page/ScopedPageLoadDeferrer.cpp b/Source/core/page/ScopedPageLoadDeferrer.cpp
index 6f788c1060eda1b0261856b5a8b89863b595bb04..8cdc6f692431903dcd3c42abdfd3e936d2c98018 100644
--- a/Source/core/page/ScopedPageLoadDeferrer.cpp
+++ b/Source/core/page/ScopedPageLoadDeferrer.cpp
@@ -46,13 +46,6 @@ ScopedPageLoadDeferrer::ScopedPageLoadDeferrer(Page* exclusion)
// showing anything modal, to prevent spoofs while the modal window or sheet is visible.
page->deprecatedLocalMainFrame()->loader().notifyIfInitialDocumentAccessed();
}
-
- // 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 (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (frame->isLocalFrame())
- toLocalFrame(frame)->document()->suspendScheduledTasks();
João Eiras 2014/10/06 12:14:31 I moved this code into FrameLoader::setDefersLoadi
- }
}
size_t count = m_deferredFrames.size();
@@ -65,14 +58,8 @@ ScopedPageLoadDeferrer::ScopedPageLoadDeferrer(Page* exclusion)
void ScopedPageLoadDeferrer::detach()
{
for (size_t i = 0; i < m_deferredFrames.size(); ++i) {
- if (Page* page = m_deferredFrames[i]->page()) {
+ if (Page* page = m_deferredFrames[i]->page())
page->setDefersLoading(false);
-
- for (Frame* frame = page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (frame->isLocalFrame())
- toLocalFrame(frame)->document()->resumeScheduledTasks();
- }
- }
}
}
« Source/core/html/parser/HTMLDocumentParser.cpp ('K') | « Source/core/loader/FrameLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698