Changeset 80718 in webkit

Timestamp:

Mar 10, 2011 7:17:57 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-03-10 Pavel Feldman <​pfeldman@chromium.org>

Not reviewed: rolling out r80478 and its follow ups for breaking
inspector and engadget.com.
​https://bugs.webkit.org/show_bug.cgi?id=49401

• dom/Document.cpp: (WebCore::Document::Document): (WebCore::performTask): (WebCore::Document::postTask):
• dom/Document.h:
• loader/FrameLoader.cpp: (WebCore::FrameLoader::setDefersLoading):
• manual-tests/database-callback-deferred.html: Removed.
• page/PageGroupLoadDeferrer.cpp: (WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer): (WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):

2011-03-10 Pavel Feldman <​pfeldman@chromium.org>

Not reviewed: rolling out r80478 and its follow ups for breaking
inspector and engadget.com.
​https://bugs.webkit.org/show_bug.cgi?id=49401

• platform/gtk/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (3 diffs)
• Source/WebCore/dom/Document.h (modified) (3 diffs)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• Source/WebCore/manual-tests/database-callback-deferred.html (deleted)
• Source/WebCore/page/PageGroupLoadDeferrer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-10  Pavel Feldman  <pfeldman@chromium.org>
+
+        Not reviewed: rolling out r80478 and its follow ups for breaking
+        inspector and engadget.com.
+        https://bugs.webkit.org/show_bug.cgi?id=49401
+
+        * platform/gtk/Skipped:
+
 2011-03-10  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -189 +189 @@
 # https://bugs.webkit.org/show_bug.cgi?id=55135
 http/tests/incremental/slow-utf8-html.pl
-
-# https://bugs.webkit.org/show_bug.cgi?id=55941
-inspector/console/console-api-on-call-frame.html
-inspector/debugger/debug-inlined-scripts.html
-inspector/debugger/debugger-cyclic-ref.html
-inspector/debugger/debugger-eval-on-call-frame.html
-inspector/debugger/debugger-eval-while-paused.html
-inspector/debugger/debugger-expand-scope.html
-inspector/debugger/debugger-no-nested-pause.html
-inspector/debugger/debugger-pause-in-eval-script.html
-inspector/debugger/debugger-pause-on-breakpoint.html
-inspector/debugger/debugger-pause-on-debugger-statement.html
-inspector/debugger/debugger-pause-on-exception.html
-inspector/debugger/debugger-proto-property.html
-inspector/debugger/debugger-step-in.html
-inspector/debugger/debugger-step-over.html
-inspector/debugger/debugger-suspend-active-dom-objects.html
-inspector/extensions/extensions-resources.html
 
 ###############################################################################

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-10  Pavel Feldman  <pfeldman@chromium.org>
+
+        Not reviewed: rolling out r80478 and its follow ups for breaking
+        inspector and engadget.com.
+        https://bugs.webkit.org/show_bug.cgi?id=49401
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::performTask):
+        (WebCore::Document::postTask):
+        * dom/Document.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::setDefersLoading):
+        * manual-tests/database-callback-deferred.html: Removed.
+        * page/PageGroupLoadDeferrer.cpp:
+        (WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer):
+        (WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):
+
 2011-03-10  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -8 +8 @@
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) Research In Motion, Limited 2010-2011.
  *
  * This library is free software; you can redistribute it and/or
@@ -438 +437 @@
     , m_writeRecursionIsTooDeep(false)
     , m_writeRecursionDepth(0)
-    , m_pendingTasksTimer(this, &Document::pendingTasksTimerFired)
 {
     m_document = this;
@@ -4719 +4717 @@
 };
 
-void Document::didReceiveTask(void* untypedContext)
+static void performTask(void* ctx)
 {
     ASSERT(isMainThread());
 
-    OwnPtr<PerformTaskContext> context = adoptPtr(static_cast<PerformTaskContext*>(untypedContext));
+    PerformTaskContext* context = reinterpret_cast<PerformTaskContext*>(ctx);
     ASSERT(context);
 
-    Document* document = context->documentReference->document();
-    if (!document)
-        return;
-
-    Page* page = document->page();
-    if ((page && page->defersLoading()) || !document->m_pendingTasks.isEmpty()) {
-        document->m_pendingTasks.append(context->task.release());
-        return;
-    }
-
-    context->task->performTask(document);
+    if (Document* document = context->documentReference->document())
+        context->task->performTask(document);
+
+    delete context;
 }
 
 void Document::postTask(PassOwnPtr<Task> task)
 {
-    callOnMainThread(didReceiveTask, new PerformTaskContext(m_weakReference, task));
-}
-
-void Document::pendingTasksTimerFired(Timer<Document>*)
-{
-    while (!m_pendingTasks.isEmpty()) {
-        OwnPtr<Task> task = m_pendingTasks[0].release();
-        m_pendingTasks.remove(0);
-        task->performTask(this);
-    }
-}
-
-void Document::suspendScheduledTasks()
-{
-    suspendScriptedAnimationControllerCallbacks();
-    suspendActiveDOMObjects(ActiveDOMObject::WillShowDialog);
-    asyncScriptRunner()->suspend();
-    m_pendingTasksTimer.stop();
-    if (m_parser)
-        m_parser->suspendScheduledTasks();
-}
-
-void Document::resumeScheduledTasks()
-{
-    if (m_parser)
-        m_parser->resumeScheduledTasks();
-    if (!m_pendingTasks.isEmpty())
-        m_pendingTasksTimer.startOneShot(0);
-    asyncScriptRunner()->resume();
-    resumeActiveDOMObjects();
-    resumeScriptedAnimationControllerCallbacks();
+    callOnMainThread(performTask, new PerformTaskContext(m_weakReference, task));
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -1123 +1123 @@
     ContentSecurityPolicy* contentSecurityPolicy() { return m_contentSecurityPolicy.get(); }
 
-    void suspendScheduledTasks();
-    void resumeScheduledTasks();
-
 protected:
     Document(Frame*, const KURL&, bool isXHTML, bool isHTML);
@@ -1171 +1168 @@
 
     void loadEventDelayTimerFired(Timer<Document>*);
-
-    void pendingTasksTimerFired(Timer<Document>*);
-
-    static void didReceiveTask(void*);
 
     OwnPtr<CSSStyleSelector> m_styleSelector;
@@ -1442 +1435 @@
 
     RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy;
-
-    Timer<Document> m_pendingTasksTimer;
-    Vector<OwnPtr<Task> > m_pendingTasks;
 };
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -254 +254 @@
         startCheckCompleteTimer();
     }
-
-    // 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.
-    if (defers)
-        m_frame->document()->suspendScheduledTasks();
-    else
-        m_frame->document()->resumeScheduledTasks();
 }
 

trunk/Source/WebCore/page/PageGroupLoadDeferrer.cpp

@@ -40 +40 @@
     for (HashSet<Page*>::const_iterator it = pages.begin(); it != end; ++it) {
         Page* otherPage = *it;
-        if ((deferSelf || otherPage != page) && !otherPage->defersLoading())
-            m_deferredFrames.append(otherPage->mainFrame());
+        if ((deferSelf || otherPage != page)) {
+            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.
+                // 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()->suspendScriptedAnimationControllerCallbacks();
+                    frame->document()->suspendActiveDOMObjects(ActiveDOMObject::WillShowDialog);
+                    frame->document()->asyncScriptRunner()->suspend();
+                    if (DocumentParser* parser = frame->document()->parser())
+                        parser->suspendScheduledTasks();
+                }
+            }
+        }
     }
 
@@ -53 +68 @@
 {
     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()) {
+                frame->document()->resumeActiveDOMObjects();
+                frame->document()->resumeScriptedAnimationControllerCallbacks();
+                frame->document()->asyncScriptRunner()->resume();
+                if (DocumentParser* parser = frame->document()->parser())
+                    parser->resumeScheduledTasks();
+            }
+        }
     }
 }