Changeset 147413 in webkit

Timestamp:

Apr 2, 2013 3:21:01 AM (11 years ago)

Author:

shinyak@chromium.org

Message:

Unreviewed, rolling out r147383.
​http://trac.webkit.org/changeset/147383
​https://bugs.webkit.org/show_bug.cgi?id=112369

Speculative rollout because of lots of layout test failure

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::~HTMLDocumentParser):
(WebCore::HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParser):
(WebCore::HTMLDocumentParser::processParsedChunkFromBackgroundParser):
(WebCore::HTMLDocumentParser::pumpPendingSpeculations):
(WebCore::HTMLDocumentParser::insert):

• html/parser/HTMLParserScheduler.cpp:

(WebCore::PumpSession::PumpSession):

• html/parser/HTMLParserScheduler.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLDocumentParser.cpp (modified) (9 diffs)
• html/parser/HTMLParserScheduler.cpp (modified) (1 diff)
• html/parser/HTMLParserScheduler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-02  Shinya Kawanaka  <shinyak@chromium.org>
+
+        Unreviewed, rolling out r147383.
+        http://trac.webkit.org/changeset/147383
+        https://bugs.webkit.org/show_bug.cgi?id=112369
+
+        Speculative rollout because of lots of layout test failure
+
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::~HTMLDocumentParser):
+        (WebCore::HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParser):
+        (WebCore::HTMLDocumentParser::processParsedChunkFromBackgroundParser):
+        (WebCore::HTMLDocumentParser::pumpPendingSpeculations):
+        (WebCore::HTMLDocumentParser::insert):
+        * html/parser/HTMLParserScheduler.cpp:
+        (WebCore::PumpSession::PumpSession):
+        * html/parser/HTMLParserScheduler.h:
+
 2013-04-02  Eugene Klyuchnikov  <eustas@chromium.org>
 

trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

@@ -128 +128 @@
     ASSERT(!m_insertionPreloadScanner);
     ASSERT(!m_haveBackgroundParser);
-    // FIXME: We should be able to ASSERT(m_speculations.isEmpty()),
-    // but there are cases where that's not true currently. For example,
-    // we we're told to stop parsing before we've consumed all the input.
 }
 
@@ -315 +312 @@
 void HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParser(PassOwnPtr<ParsedChunk> chunk)
 {
-    // alert(), runModalDialog, and the JavaScript Debugger all run nested event loops
-    // which can cause this method to be re-entered. We detect re-entry using
-    // inPumpSession(), save the chunk as a speculation, and return.
-    if (isWaitingForScripts() || !m_speculations.isEmpty() || inPumpSession()) {
+    if (isWaitingForScripts() || !m_speculations.isEmpty()) {
         m_preloader->takeAndPreload(chunk->preloads);
         m_speculations.append(chunk);
@@ -328 +322 @@
     RefPtr<HTMLDocumentParser> protect(this);
 
+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), lineNumber().zeroBasedInt());
+
     ASSERT(m_speculations.isEmpty());
     chunk->preloads.clear(); // We don't need to preload because we're going to parse immediately.
-    m_speculations.append(chunk);
-    pumpPendingSpeculations();
+    processParsedChunkFromBackgroundParser(chunk);
+
+    InspectorInstrumentation::didWriteHTML(cookie, lineNumber().zeroBasedInt());
 }
 
@@ -394 +391 @@
 void HTMLDocumentParser::processParsedChunkFromBackgroundParser(PassOwnPtr<ParsedChunk> popChunk)
 {
-    ASSERT_WITH_SECURITY_IMPLICATION(!inPumpSession());
-    ASSERT(!isParsingFragment());
-    ASSERT(!isWaitingForScripts());
-    ASSERT(!isStopped());
     // ASSERT that this object is both attached to the Document and protected.
     ASSERT(refCount() >= 2);
@@ -405 +398 @@
     ASSERT(!m_lastChunkBeforeScript);
 
-    PumpSession session(m_pumpSessionNestingLevel, contextForParsingSession());
-
+    ActiveParserSession session(contextForParsingSession());
     OwnPtr<ParsedChunk> chunk(popChunk);
     OwnPtr<CompactHTMLTokenStream> tokens = chunk->tokens.release();
@@ -435 +427 @@
             // we peek to see if this chunk has an EOF and process it anyway.
             if (tokens->last().type() == HTMLToken::EndOfFile) {
-                ASSERT(m_speculations.isEmpty()); // There should never be any chunks after the EOF.
+                ASSERT(m_speculations.isEmpty());
                 prepareToStopParsing();
             }
@@ -450 +442 @@
         if (it->type() == HTMLToken::EndOfFile) {
             ASSERT(it + 1 == tokens->end()); // The EOF is assumed to be the last token of this bunch.
-            ASSERT(m_speculations.isEmpty()); // There should never be any chunks after the EOF.
+            ASSERT(m_speculations.isEmpty());
             prepareToStopParsing();
             break;
@@ -472 +464 @@
     ASSERT(!m_token);
     ASSERT(!m_lastChunkBeforeScript);
-    ASSERT(!isWaitingForScripts());
-    ASSERT(!isStopped());
 
     // FIXME: Pass in current input length.
@@ -640 +630 @@
 #if ENABLE(THREADED_HTML_PARSER)
     if (!m_tokenizer) {
+        ASSERT(!inPumpSession());
         ASSERT(m_haveBackgroundParser || wasCreatedByScript());
         m_token = adoptPtr(new HTMLToken);

trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp

@@ -78 +78 @@
 
 PumpSession::PumpSession(unsigned& nestingLevel, Document* document)
-    : ActiveParserSession(document)
-    , NestingLevelIncrementer(nestingLevel)
+    : NestingLevelIncrementer(nestingLevel)
+    , ActiveParserSession(document)
     // Setting processedTokens to INT_MAX causes us to check for yields
     // after any token during any parse where yielding is allowed.

trunk/Source/WebCore/html/parser/HTMLParserScheduler.h

@@ -48 +48 @@
 };
 
-// In C++, base classes are destructed from right to left, which means
-// ~NestingLevelIncrementer will run before ~ActiveParserSession. This
-// is important because ~ActiveParserSession calls Document::decrementActiveParserCount,
-// which cares about the pump nesting level of the parser.
-class PumpSession : public ActiveParserSession, public NestingLevelIncrementer {
+class PumpSession : public NestingLevelIncrementer, public ActiveParserSession {
 public:
     PumpSession(unsigned& nestingLevel, Document*);