Changeset 60940 in webkit

Timestamp:

Jun 9, 2010 11:34:46 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-06-09 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by Adam Barth.

HTML5 Parser: Fix fast/profiler tests that depend on event handler line numbers
​https://bugs.webkit.org/show_bug.cgi?id=40393

This emulated the old behavior in HTMLTokenizer:processToken()

No new tests because covered by:

• fast/profiler/dead-time.html
• fast/profiler/inline-event-handler.html
• fast/profiler/stop-profiling-after-setTimeout.html
• fast/profiler/throw-exception-from-eval.html

• html/HTML5Tokenizer.cpp: (WebCore::HTML5Tokenizer::pumpLexer):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTML5Tokenizer.cpp (modified) (1 diff)
• html/HTML5Tokenizer.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-09  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        HTML5 Parser: Fix fast/profiler tests that depend on event handler line numbers
+        https://bugs.webkit.org/show_bug.cgi?id=40393
+
+        This emulated the old behavior in HTMLTokenizer:processToken()
+
+        No new tests because covered by:
+         - fast/profiler/dead-time.html
+         - fast/profiler/inline-event-handler.html
+         - fast/profiler/stop-profiling-after-setTimeout.html
+         - fast/profiler/throw-exception-from-eval.html
+
+        * html/HTML5Tokenizer.cpp:
+        (WebCore::HTML5Tokenizer::pumpLexer):
+
 2010-06-09  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/html/HTML5Tokenizer.cpp

@@ -97 +97 @@
     ASSERT(!m_treeBuilder->isPaused());
     while (!m_parserStopped && m_lexer->nextToken(m_input.current(), m_token)) {
+        if (ScriptController* scriptController = script())
+            scriptController->setEventHandlerLineNumber(lineNumber() + 1);
+
         m_treeBuilder->constructTreeFromToken(m_token);
         m_token.clear();
+
+        if (ScriptController* scriptController = script())
+            scriptController->setEventHandlerLineNumber(0);
 
         if (!m_treeBuilder->isPaused())

trunk/WebCore/html/HTML5Tokenizer.h

@@ -28 +28 @@
 
 #include "CachedResourceClient.h"
+#include "Frame.h"
 #include "HTML5ScriptRunnerHost.h"
 #include "HTML5Token.h"
+#include "HTMLDocument.h"
 #include "SegmentedString.h"
 #include "Tokenizer.h"
@@ -39 +41 @@
 class HTML5ScriptRunner;
 class HTML5TreeBuilder;
-class HTMLDocument;
+class ScriptController;
 class ScriptSourceCode;
 
@@ -168 +170 @@
     bool inWrite() const { return m_writeNestingLevel > 0; }
 
+    ScriptController* script() const { return m_document->frame() ? m_document->frame()->script() : 0; }
+
     InputStream m_input;