Changeset 61974 in webkit

Timestamp:

Jun 27, 2010 4:19:15 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

Clean up some loose ends in HTML5 tree builder
​https://bugs.webkit.org/show_bug.cgi?id=41265

This patch cleans up a few loose ends in HTML5 tree builder.
Technically, we could do each of these as individual patches, but that
didn't seem worth while.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processStartTag):
  • Add missing break before default case statement. I don't think this change is observable.

(WebCore::HTMLTreeBuilder::processComment):

• Originally I thought that comments had special processing in the InHeadNoscriptMode, but it turns out that when you unwind the definitions, it amounts to exactly the same thing.

(WebCore::HTMLTreeBuilder::processEndOfFile):

• Add missing break before default case statement. I don't think this change is observable.

(WebCore::HTMLTreeBuilder::insertComment):

• Eliminate one unnecessary ref/deref pair.

(WebCore::HTMLTreeBuilder::insertSelfClosingElement):

• When we insert self-closing elements, there's no reason to push them onto the stack of open elements just to pop them off again. This change saves a malloc/free pair as well as a ref/deref pair. Go team.

• html/HTMLTreeBuilder.h:
  • Remove unused function.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLTreeBuilder.cpp (modified) (7 diffs)
• html/HTMLTreeBuilder.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Clean up some loose ends in HTML5 tree builder
+        https://bugs.webkit.org/show_bug.cgi?id=41265
+
+        This patch cleans up a few loose ends in HTML5 tree builder.
+        Technically, we could do each of these as individual patches, but that
+        didn't seem worth while.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processStartTag):
+            - Add missing break before default case statement.  I don't think
+              this change is observable.
+        (WebCore::HTMLTreeBuilder::processComment):
+            - Originally I thought that comments had special processing in the
+              InHeadNoscriptMode, but it turns out that when you unwind the
+              definitions, it amounts to exactly the same thing.
+        (WebCore::HTMLTreeBuilder::processEndOfFile):
+            - Add missing break before default case statement.  I don't think
+              this change is observable.
+        (WebCore::HTMLTreeBuilder::insertComment):
+            - Eliminate one unnecessary ref/deref pair.
+        (WebCore::HTMLTreeBuilder::insertSelfClosingElement):
+            - When we insert self-closing elements, there's no reason to push
+              them onto the stack of open elements just to pop them off again.
+              This change saves a malloc/free pair as well as a ref/deref pair.
+              Go team.
+        * html/HTMLTreeBuilder.h:
+            - Remove unused function.
+
 2010-06-27  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -373 +373 @@
         processDefaultForInHeadNoscriptMode(token);
         processToken(token);
+        break;
     default:
         notImplemented();
@@ -463 +464 @@
 void HTMLTreeBuilder::processComment(AtomicHTMLToken& token)
 {
-    if (insertionMode() == InHeadNoscriptMode) {
-        notImplemented();
-        return;
-    }
     insertComment(token);
 }
@@ -511 +508 @@
         processDefaultForInHeadNoscriptMode(token);
         processToken(token);
+        break;
     default:
         notImplemented();
@@ -608 +606 @@
 {
     ASSERT(token.type() == HTMLToken::Comment);
-    RefPtr<Node> element = Comment::create(m_document, token.comment());
-    currentElement()->addChild(element);
+    currentElement()->addChild(Comment::create(m_document, token.comment()));
 }
 
@@ -615 +612 @@
 {
     ASSERT(token.type() == HTMLToken::StartTag);
-    RefPtr<Element> element = HTMLElementFactory::createHTMLElement(QualifiedName(nullAtom, token.name(), xhtmlNamespaceURI), m_document, 0);
+    RefPtr<Element> element = createElement(token);
     currentElement()->addChild(element);
     m_openElements.push(element.release());
@@ -623 +620 @@
 {
     ASSERT(token.type() == HTMLToken::StartTag);
-    insertElement(token);
-    m_openElements.pop();
+    currentElement()->addChild(createElement(token));
     // FIXME: Do we want to acknowledge the token's self-closing flag?
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#acknowledge-self-closing-flag
-}
-
-void HTMLTreeBuilder::insertCharacter(UChar cc)
-{
-    ASSERT_UNUSED(cc, cc);
 }
 
@@ -663 +654 @@
 }
 
+PassRefPtr<Element> HTMLTreeBuilder::createElement(AtomicHTMLToken& token)
+{
+    return HTMLElementFactory::createHTMLElement(QualifiedName(nullAtom, token.name(), xhtmlNamespaceURI), m_document, 0);
+}
+
 void HTMLTreeBuilder::finished()
 {

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -180 +180 @@
     void insertElement(AtomicHTMLToken&);
     void insertSelfClosingElement(AtomicHTMLToken&);
-    void insertCharacter(UChar cc);
     void insertGenericRCDATAElement(AtomicHTMLToken&);
     void insertGenericRawTextElement(AtomicHTMLToken&);
@@ -187 +186 @@
     void insertHTMLStartTagBeforeHTML(AtomicHTMLToken&);
     void insertHTMLStartTagInBody(AtomicHTMLToken&);
+
+    PassRefPtr<Element> createElement(AtomicHTMLToken&);
 
     Element* currentElement() { return m_openElements.top(); }