Changeset 60701 in webkit

Timestamp:

Jun 4, 2010 12:44:26 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-06-04 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Make HTML5Lexer go fast
​https://bugs.webkit.org/show_bug.cgi?id=40048

This patch handles the FLUSH_AND_ADVANCE_TO case. Again, this patch
introduces style errors that will be fixed shortly.

• html/HTML5Lexer.cpp: (WebCore::HTML5Lexer::nextToken):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTML5Lexer.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Make HTML5Lexer go fast
+        https://bugs.webkit.org/show_bug.cgi?id=40048
+
+        This patch handles the FLUSH_AND_ADVANCE_TO case.  Again, this patch
+        introduces style errors that will be fixed shortly.
+
+        * html/HTML5Lexer.cpp:
+        (WebCore::HTML5Lexer::nextToken):
+
 2010-06-04  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTML5Lexer.cpp

@@ -343 +343 @@
     }
 
+// When we move away from using a jump table, these macros will be different.
+#define FLUSH_AND_ADVANCE_TO(stateName) FLUSH_EMIT_AND_RESUME_IN(stateName)
+
 bool HTML5Lexer::nextToken(SegmentedString& source, HTML5Token& token)
 {
@@ -540 +543 @@
                 if (cc == '\x09' || cc == '\x0A' || cc == '\x0C' || cc == ' ') {
                     if (isAppropriateEndTag()) {
-                        m_state = BeforeAttributeNameState;
-                        maybeFlushBufferedEndTag();
-                        break;
+                        FLUSH_AND_ADVANCE_TO(BeforeAttributeNameState);
                     }
                 } else if (cc == '/') {
                     if (isAppropriateEndTag()) {
-                        m_state = SelfClosingStartTagState;
-                        maybeFlushBufferedEndTag();
-                        break;
+                        FLUSH_AND_ADVANCE_TO(SelfClosingStartTagState);
                     }
                 } else if (cc == '>') {
@@ -606 +605 @@
                 if (cc == '\x09' || cc == '\x0A' || cc == '\x0C' || cc == ' ') {
                     if (isAppropriateEndTag()) {
-                        m_state = BeforeAttributeNameState;
-                        maybeFlushBufferedEndTag();
-                        break;
+                        FLUSH_AND_ADVANCE_TO(BeforeAttributeNameState);
                     }
                 } else if (cc == '/') {
                     if (isAppropriateEndTag()) {
-                        m_state = SelfClosingStartTagState;
-                        maybeFlushBufferedEndTag();
-                        break;
+                        FLUSH_AND_ADVANCE_TO(SelfClosingStartTagState);
                     }
                 } else if (cc == '>') {
@@ -676 +671 @@
                 if (cc == '\x09' || cc == '\x0A' || cc == '\x0C' || cc == ' ') {
                     if (isAppropriateEndTag()) {
-                        m_state = BeforeAttributeNameState;
-                        maybeFlushBufferedEndTag();
-                        break;
+                        FLUSH_AND_ADVANCE_TO(BeforeAttributeNameState);
                     }
                 } else if (cc == '/') {
                     if (isAppropriateEndTag()) {
-                        m_state = SelfClosingStartTagState;
-                        maybeFlushBufferedEndTag();
-                        break;
+                        FLUSH_AND_ADVANCE_TO(SelfClosingStartTagState);
                     }
                 } else if (cc == '>') {
@@ -821 +812 @@
                 if (cc == '\x09' || cc == '\x0A' || cc == '\x0C' || cc == ' ') {
                     if (isAppropriateEndTag()) {
-                        m_state = BeforeAttributeNameState;
-                        maybeFlushBufferedEndTag();
-                        break;
+                        FLUSH_AND_ADVANCE_TO(BeforeAttributeNameState);
                     }
                 } else if (cc == '/') {
                     if (isAppropriateEndTag()) {
-                        m_state = SelfClosingStartTagState;
-                        maybeFlushBufferedEndTag();
-                        break;
+                        FLUSH_AND_ADVANCE_TO(SelfClosingStartTagState);
                     }
                 } else if (cc == '>') {