Changeset 60712 in webkit

Timestamp:

Jun 4, 2010 3:12:39 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

A couple more cases like the previous patch that I missed.

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

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTML5Lexer.cpp (modified) (6 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
+
+        A couple more cases like the previous patch that I missed.
+
+        * html/HTML5Lexer.cpp:
+        (WebCore::HTML5Lexer::nextToken):
+
 2010-06-04  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTML5Lexer.cpp

@@ -499 +499 @@
         else if (cc == '/')
             ADVANCE_TO(SelfClosingStartTagState);
-        else if (cc == '>') {
-            EMIT_AND_RESUME_IN(DataState);
-        } else if (cc >= 'A' && cc <= 'Z') {
+        else if (cc == '>')
+            EMIT_AND_RESUME_IN(DataState);
+        else if (cc >= 'A' && cc <= 'Z') {
             m_token->appendToName(toLowerCase(cc));
             ADVANCE_TO(TagNameState);
@@ -714 +714 @@
         } else if (cc == '<')
             ADVANCE_TO(ScriptDataEscapedLessThanSignState);
-        else
-            emitCharacter(cc);
-        // FIXME: Handle EOF properly.
-        break;
+        else {
+            emitCharacter(cc);
+            ADVANCE_TO(ScriptDataEscapedState);
+        }
+        // FIXME: Handle EOF properly.
     }
     END_STATE()
@@ -837 +838 @@
             m_temporaryBuffer.append(cc);
             ADVANCE_TO(ScriptDataDoubleEscapeStartState);
-        } else {
+        } else
             RECONSUME_IN(ScriptDataEscapedState);
-        }
     }
     END_STATE()
@@ -972 +972 @@
         else if (cc == '=')
             ADVANCE_TO(BeforeAttributeValueState);
-        else if (cc == '=') {
-            EMIT_AND_RESUME_IN(DataState);
-        } else if (cc >= 'A' && cc <= 'Z') {
+        else if (cc == '=')
+            EMIT_AND_RESUME_IN(DataState);
+        else if (cc >= 'A' && cc <= 'Z') {
             m_token->addNewAttribute();
             m_token->appendToAttributeName(toLowerCase(cc));
@@ -1242 +1242 @@
             m_token->appendToComment('!');
             ADVANCE_TO(CommentEndDashState);
-        } else if (cc == '>') {
-            EMIT_AND_RESUME_IN(DataState);
-        } else {
+        } else if (cc == '>')
+            EMIT_AND_RESUME_IN(DataState);
+        else {
             m_token->appendToComment('-');
             m_token->appendToComment('-');
@@ -1545 +1545 @@
         if (cc == '\x09' || cc == '\x0A' || cc == '\x0C' || cc == ' ')
             ADVANCE_TO(AfterDOCTYPESystemIdentifierState);
-        else if (cc == '>') {
-            EMIT_AND_RESUME_IN(DataState);
-        } else {
+        else if (cc == '>')
+            EMIT_AND_RESUME_IN(DataState);
+        else {
             emitParseError();
             ADVANCE_TO(BogusDOCTYPEState);