From 68513a70bcd92384395513322f1b801e7bf9c729 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 29 Sep 2010 17:32:26 +0100 Subject: Merge WebKit at r67908: Initial merge by Git Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972 --- WebCore/page/PageGroupLoadDeferrer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'WebCore/page/PageGroupLoadDeferrer.cpp') diff --git a/WebCore/page/PageGroupLoadDeferrer.cpp b/WebCore/page/PageGroupLoadDeferrer.cpp index 79554cf..98a4720 100644 --- a/WebCore/page/PageGroupLoadDeferrer.cpp +++ b/WebCore/page/PageGroupLoadDeferrer.cpp @@ -44,8 +44,10 @@ PageGroupLoadDeferrer::PageGroupLoadDeferrer(Page* page, bool deferSelf) // 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. + // NOTE: if PageGroupLoadDeferrer is ever used for tasks other than showing a modal window or sheet, + // the constructor will need to take a ActiveDOMObject::ReasonForSuspension. for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) { - frame->document()->suspendActiveDOMObjects(); + frame->document()->suspendActiveDOMObjects(ActiveDOMObject::WillShowDialog); frame->document()->asyncScriptRunner()->suspend(); } } -- cgit v1.1