Changeset 140485 in webkit

Timestamp:

Jan 22, 2013 4:06:35 PM (11 years ago)

Author:

tonyg@chromium.org

Message:

Fix assertions in make8BitFrom16BitSource() with threaded parser
​https://bugs.webkit.org/show_bug.cgi?id=107596

Reviewed by Adam Barth.

This fixes an assertion in several fast/parser tests. We need to keep track of whether the data is all 8bit.
Luckily this doesn't cost us any size on CompactHTMLToken because the bitfields are collapsed (verified by COMPILE_ASSERT).

No new tests because covered by existing fast/parser tests.

• html/parser/CompactHTMLToken.cpp:

(WebCore::CompactHTMLToken::CompactHTMLToken):

• html/parser/CompactHTMLToken.h:

(WebCore::CompactHTMLToken::isAll8BitData):
(CompactHTMLToken):

• html/parser/HTMLToken.h:

(WebCore::AtomicHTMLToken::AtomicHTMLToken):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/CompactHTMLToken.cpp (modified) (2 diffs)
• html/parser/CompactHTMLToken.h (modified) (2 diffs)
• html/parser/HTMLToken.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-22  Tony Gentilcore  <tonyg@chromium.org>
+
+        Fix assertions in make8BitFrom16BitSource() with threaded parser
+        https://bugs.webkit.org/show_bug.cgi?id=107596
+
+        Reviewed by Adam Barth.
+
+        This fixes an assertion in several fast/parser tests. We need to keep track of whether the data is all 8bit.
+        Luckily this doesn't cost us any size on CompactHTMLToken because the bitfields are collapsed (verified by COMPILE_ASSERT).
+
+        No new tests because covered by existing fast/parser tests.
+
+        * html/parser/CompactHTMLToken.cpp:
+        (WebCore::CompactHTMLToken::CompactHTMLToken):
+        * html/parser/CompactHTMLToken.h:
+        (WebCore::CompactHTMLToken::isAll8BitData):
+        (CompactHTMLToken):
+        * html/parser/HTMLToken.h:
+        (WebCore::AtomicHTMLToken::AtomicHTMLToken):
+
 2013-01-22  Tony Gentilcore  <tonyg@chromium.org>
 

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

@@ -45 +45 @@
 CompactHTMLToken::CompactHTMLToken(const HTMLToken& token, const TextPosition& textPosition)
     : m_type(token.type())
+    , m_isAll8BitData(false)
     , m_textPosition(textPosition)
 {
@@ -72 +73 @@
     case HTMLTokenTypes::Comment:
     case HTMLTokenTypes::Character:
-        if (token.isAll8BitData())
+        if (token.isAll8BitData()) {
             m_data = String::make8BitFrom16BitSource(token.data().data(), token.data().size());
-        else
+            m_isAll8BitData = true;
+        } else
             m_data = String(token.data().data(), token.data().size());
         break;

trunk/Source/WebCore/html/parser/CompactHTMLToken.h

@@ -65 +65 @@
     const String& data() const { return m_data; }
     bool selfClosing() const { return m_selfClosing; }
+    bool isAll8BitData() const { return m_isAll8BitData; }
     const Vector<CompactAttribute>& attributes() const { return m_attributes; }
     const TextPosition& textPosition() const { return m_textPosition; }
@@ -76 +77 @@
     unsigned m_type : 4;
     unsigned m_selfClosing : 1;
+    unsigned m_isAll8BitData : 1;
 
     String m_data; // "name", "characters", or "data" depending on m_type

trunk/Source/WebCore/html/parser/HTMLToken.h

@@ -243 +243 @@
             m_externalCharacters = token.data().characters();
             m_externalCharactersLength = token.data().length();
+            m_isAll8BitData = token.isAll8BitData();
             break;
         default: