Changeset 75066 in webkit

Timestamp:

Jan 5, 2011 7:51:37 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-05 Yong Li <​yoli@rim.com>

Reviewed by Adam Barth.

Suspend HTMLParserScheduler when page load is deferred to
avoid potential JS re-entrancy. Otherwise, when JS execution is triggered
from an external script or by events, and is blocked by a modal dialog,
WebKit can parse more HTML source and also start another JS execution.

​https://bugs.webkit.org/show_bug.cgi?id=48077

Test case: WebCore/manual-tests/bugzilla-48077.html.

• dom/DocumentParser.cpp: (WebCore::DocumentParser::suspendScheduledTasks): (WebCore::DocumentParser::resumeScheduledTasks):
• dom/DocumentParser.h:
• html/parser/HTMLDocumentParser.cpp: (WebCore::HTMLDocumentParser::suspendScheduledTasks): (WebCore::HTMLDocumentParser::resumeScheduledTasks):
• html/parser/HTMLParserScheduler.cpp: (WebCore::HTMLParserScheduler::HTMLParserScheduler): (WebCore::HTMLParserScheduler::suspend): (WebCore::HTMLParserScheduler::resume):
• html/parser/HTMLParserScheduler.h: (WebCore::HTMLParserScheduler::isScheduledForResume):
• page/PageGroupLoadDeferrer.cpp: (WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer): (WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DocumentParser.cpp (modified) (1 diff)
• dom/DocumentParser.h (modified) (1 diff)
• html/parser/HTMLDocumentParser.cpp (modified) (1 diff)
• html/parser/HTMLDocumentParser.h (modified) (1 diff)
• html/parser/HTMLParserScheduler.cpp (modified) (2 diffs)
• html/parser/HTMLParserScheduler.h (modified) (2 diffs)
• page/PageGroupLoadDeferrer.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-05  Yong Li  <yoli@rim.com>
+
+        Reviewed by Adam Barth.
+
+        Suspend HTMLParserScheduler when page load is deferred to
+        avoid potential JS re-entrancy. Otherwise, when JS execution is triggered
+        from an external script or by events, and is blocked by a modal dialog,
+        WebKit can parse more HTML source and also start another JS execution.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=48077
+
+        Test case: WebCore/manual-tests/bugzilla-48077.html.
+
+        * dom/DocumentParser.cpp:
+        (WebCore::DocumentParser::suspendScheduledTasks):
+        (WebCore::DocumentParser::resumeScheduledTasks):
+        * dom/DocumentParser.h:
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::suspendScheduledTasks):
+        (WebCore::HTMLDocumentParser::resumeScheduledTasks):
+        * html/parser/HTMLParserScheduler.cpp:
+        (WebCore::HTMLParserScheduler::HTMLParserScheduler):
+        (WebCore::HTMLParserScheduler::suspend):
+        (WebCore::HTMLParserScheduler::resume):
+        * html/parser/HTMLParserScheduler.h:
+        (WebCore::HTMLParserScheduler::isScheduledForResume):
+        * page/PageGroupLoadDeferrer.cpp:
+        (WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer):
+        (WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):
+
 2011-01-05  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/dom/DocumentParser.cpp

@@ -69 +69 @@
 }
 
+void DocumentParser::suspendScheduledTasks()
+{
+}
+
+void DocumentParser::resumeScheduledTasks()
+{
+}
+
 };
 

trunk/WebCore/dom/DocumentParser.h

@@ -92 +92 @@
     bool documentWasLoadedAsPartOfNavigation() const { return m_documentWasLoadedAsPartOfNavigation; }
 
+    // FIXME: The names are not very accurate :(
+    virtual void suspendScheduledTasks();
+    virtual void resumeScheduledTasks();
+
 protected:
     DocumentParser(Document*);

trunk/WebCore/html/parser/HTMLDocumentParser.cpp

@@ -521 +521 @@
 }
 
-}
+void HTMLDocumentParser::suspendScheduledTasks()
+{
+    if (m_parserScheduler)
+        m_parserScheduler->suspend();
+}
+
+void HTMLDocumentParser::resumeScheduledTasks()
+{
+    if (m_parserScheduler)
+        m_parserScheduler->resume();
+}
+
+}

trunk/WebCore/html/parser/HTMLDocumentParser.h

@@ -73 +73 @@
 
     virtual TextPosition0 textPosition() const;
+    virtual void suspendScheduledTasks();
+    virtual void resumeScheduledTasks();
 
 protected:

trunk/WebCore/html/parser/HTMLParserScheduler.cpp

@@ -66 +66 @@
     , m_parserChunkSize(parserChunkSize(m_parser->document()->page()))
     , m_continueNextChunkTimer(this, &HTMLParserScheduler::continueNextChunkTimerFired)
+    , m_isSuspendedWithActiveTimer(false)
 {
 }
@@ -93 +94 @@
 }
 
+void HTMLParserScheduler::suspend()
+{
+    ASSERT(!m_isSuspendedWithActiveTimer);
+    if (!m_continueNextChunkTimer.isActive())
+        return;
+    m_isSuspendedWithActiveTimer = true;
+    m_continueNextChunkTimer.stop();
 }
+
+void HTMLParserScheduler::resume()
+{
+    ASSERT(!m_continueNextChunkTimer.isActive());
+    if (!m_isSuspendedWithActiveTimer)
+        return;
+    m_isSuspendedWithActiveTimer = false;
+    m_continueNextChunkTimer.startOneShot(0);
+}
+
+}

trunk/WebCore/html/parser/HTMLParserScheduler.h

@@ -72 +72 @@
     }
 
-    bool isScheduledForResume() const { return m_continueNextChunkTimer.isActive(); }
+    bool isScheduledForResume() const { return m_isSuspendedWithActiveTimer || m_continueNextChunkTimer.isActive(); }
+
+    void suspend();
+    void resume();
 
 private:
@@ -84 +87 @@
     int m_parserChunkSize;
     Timer<HTMLParserScheduler> m_continueNextChunkTimer;
+    bool m_isSuspendedWithActiveTimer;
 };
 

trunk/WebCore/page/PageGroupLoadDeferrer.cpp

@@ -23 +23 @@
 
 #include "AsyncScriptRunner.h"
+#include "DocumentParser.h"
 #include "Frame.h"
 #include "Page.h"
@@ -50 +51 @@
                     frame->document()->suspendActiveDOMObjects(ActiveDOMObject::WillShowDialog);
                     frame->document()->asyncScriptRunner()->suspend();
+                    if (DocumentParser* parser = frame->document()->parser())
+                        parser->suspendScheduledTasks();
                 }
             }
@@ -70 +73 @@
                 frame->document()->resumeActiveDOMObjects();
                 frame->document()->asyncScriptRunner()->resume();
+                if (DocumentParser* parser = frame->document()->parser())
+                    parser->resumeScheduledTasks();
             }
         }