Changeset 139760 in webkit

Timestamp:

Jan 15, 2013 11:06:25 AM (11 years ago)

Author:

tonyg@chromium.org

Message:

Make AtomicMarkupTokenBase use a bare UChar* for external characters
​https://bugs.webkit.org/show_bug.cgi?id=106919

Reviewed by Eric Seidel.

This allows an arbitrary backing for external characters which is necessary for the threaded HTML parser.

No new tests because no new functionality.

• html/parser/HTMLTreeBuilder.cpp:

(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::ExternalCharacterTokenBuffer):
(WebCore::HTMLTreeBuilder::processTokenInForeignContent):

• xml/parser/MarkupTokenBase.h:

(WebCore::AtomicMarkupTokenBase::AtomicMarkupTokenBase):
(WebCore::AtomicMarkupTokenBase::characters):
(AtomicMarkupTokenBase):
(WebCore::AtomicMarkupTokenBase::charactersLength):
(WebCore::AtomicMarkupTokenBase::clearExternalCharacters):

• xml/parser/XMLTreeBuilder.cpp:

(WebCore::XMLTreeBuilder::processCharacter):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLTreeBuilder.cpp (modified) (2 diffs)
• xml/parser/MarkupTokenBase.h (modified) (5 diffs)
• xml/parser/XMLTreeBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-15  Tony Gentilcore  <tonyg@chromium.org>
+
+        Make AtomicMarkupTokenBase use a bare UChar* for external characters
+        https://bugs.webkit.org/show_bug.cgi?id=106919
+
+        Reviewed by Eric Seidel.
+
+        This allows an arbitrary backing for external characters which is necessary for the threaded HTML parser.
+
+        No new tests because no new functionality.
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::ExternalCharacterTokenBuffer):
+        (WebCore::HTMLTreeBuilder::processTokenInForeignContent):
+        * xml/parser/MarkupTokenBase.h:
+        (WebCore::AtomicMarkupTokenBase::AtomicMarkupTokenBase):
+        (WebCore::AtomicMarkupTokenBase::characters):
+        (AtomicMarkupTokenBase):
+        (WebCore::AtomicMarkupTokenBase::charactersLength):
+        (WebCore::AtomicMarkupTokenBase::clearExternalCharacters):
+        * xml/parser/XMLTreeBuilder.cpp:
+        (WebCore::XMLTreeBuilder::processCharacter):
+
 2013-01-15  Arko Saha  <arko@motorola.com>
 

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

@@ -150 +150 @@
 public:
     explicit ExternalCharacterTokenBuffer(AtomicHTMLToken* token)
-        : m_current(token->characters().data())
-        , m_end(m_current + token->characters().size())
+        : m_current(token->characters())
+        , m_end(m_current + token->charactersLength())
         , m_isAll8BitData(token->isAll8BitData())
     {
@@ -2855 +2855 @@
         return;
     case HTMLTokenTypes::Character: {
-        String characters = String(token->characters().data(), token->characters().size());
+        String characters = String(token->characters(), token->charactersLength());
         m_tree.insertTextNode(characters);
         if (m_framesetOk && !isAllWhitespaceOrReplacementCharacters(characters))

trunk/Source/WebCore/xml/parser/MarkupTokenBase.h

@@ -459 +459 @@
             break;
         case Token::Type::Character:
-            m_externalCharacters = &token->characters();
+            m_externalCharacters = token->characters().data();
+            m_externalCharactersLength = token->characters().size();
             m_isAll8BitData = token->isAll8BitData();
             break;
@@ -471 +472 @@
         , m_name(name)
         , m_externalCharacters(0)
+        , m_externalCharactersLength(0)
         , m_isAll8BitData(false)
         , m_attributes(attributes)
@@ -515 +517 @@
     }
 
-    const typename Token::DataVector& characters() const
+    const UChar* characters() const
     {
         ASSERT(m_type == Token::Type::Character);
-        return *m_externalCharacters;
+        return m_externalCharacters;
+    }
+
+    size_t charactersLength() const
+    {
+        ASSERT(m_type == Token::Type::Character);
+        return m_externalCharactersLength;
     }
 
@@ -549 +557 @@
     {
         m_externalCharacters = 0;
+        m_externalCharactersLength = 0;
         m_isAll8BitData = false;
     }
@@ -576 +585 @@
     // FIXME: Add a mechanism for "internalizing" the characters when the
     //        HTMLToken is destructed.
-    const typename Token::DataVector* m_externalCharacters;
+    const UChar* m_externalCharacters;
+    size_t m_externalCharactersLength;
     bool m_isAll8BitData;
 

trunk/Source/WebCore/xml/parser/XMLTreeBuilder.cpp

@@ -274 +274 @@
 void XMLTreeBuilder::processCharacter(const AtomicXMLToken& token)
 {
-    appendToText(token.characters().data(), token.characters().size());
+    appendToText(token.characters(), token.charactersLength());
 }