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

Unified Diff: WebCore/page/PageGroupLoadDeferrer.cpp

Issue 3446004: Merge 66813 - 2010-08-31 Yury Semikhatsky <yurys@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 3 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 | « LayoutTests/inspector/debugger-suspend-active-dom-objects-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/page/PageGroupLoadDeferrer.cpp
===================================================================
--- WebCore/page/PageGroupLoadDeferrer.cpp (revision 67541)
+++ WebCore/page/PageGroupLoadDeferrer.cpp (working copy)
@@ -39,14 +39,15 @@
for (HashSet<Page*>::const_iterator it = pages.begin(); it != end; ++it) {
Page* otherPage = *it;
if ((deferSelf || otherPage != page)) {
- if (!otherPage->defersLoading())
+ if (!otherPage->defersLoading()) {
m_deferredFrames.append(otherPage->mainFrame());
- // 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 PageGroupLoadDeferrer is used.
- for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
- frame->document()->suspendActiveDOMObjects();
- frame->document()->asyncScriptRunner()->suspend();
+ // 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 PageGroupLoadDeferrer is used.
+ for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+ frame->document()->suspendActiveDOMObjects();
+ frame->document()->asyncScriptRunner()->suspend();
+ }
}
}
}
« no previous file with comments | « LayoutTests/inspector/debugger-suspend-active-dom-objects-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698