Changeset 140573 in webkit

Timestamp:

Jan 23, 2013 12:36:01 PM (11 years ago)

Author:

eric@webkit.org

Message:

HTMLCompactToken needs to include the forceQuirks bool from HTMLToken
​https://bugs.webkit.org/show_bug.cgi?id=107713

Reviewed by Tony Gentilcore.

Before we were only getting "quirks mode" when the system/public identifiers
were known quirks identifiers. Now we'll correctly get quirks mode for any
parse error during DOCTYPE parsing.
This passes a bunch more tests.

• html/parser/CompactHTMLToken.cpp:

(WebCore::CompactHTMLToken::CompactHTMLToken):

• html/parser/CompactHTMLToken.h:

(WebCore::CompactHTMLToken::doctypeForcesQuirks):
(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-23  Eric Seidel  <eric@webkit.org>
+
+        HTMLCompactToken needs to include the forceQuirks bool from HTMLToken
+        https://bugs.webkit.org/show_bug.cgi?id=107713
+
+        Reviewed by Tony Gentilcore.
+
+        Before we were only getting "quirks mode" when the system/public identifiers
+        were known quirks identifiers.  Now we'll correctly get quirks mode for any
+        parse error during DOCTYPE parsing.
+        This passes a bunch more tests.
+
+        * html/parser/CompactHTMLToken.cpp:
+        (WebCore::CompactHTMLToken::CompactHTMLToken):
+        * html/parser/CompactHTMLToken.h:
+        (WebCore::CompactHTMLToken::doctypeForcesQuirks):
+        (CompactHTMLToken):
+        * html/parser/HTMLToken.h:
+        (WebCore::AtomicHTMLToken::AtomicHTMLToken):
+
 2013-01-23  Brady Eidson  <beidson@apple.com>
 

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

@@ -46 +46 @@
     : m_type(token.type())
     , m_isAll8BitData(false)
+    , m_doctypeForcesQuirks(false)
     , m_textPosition(textPosition)
 {
@@ -59 +60 @@
         String systemIdentifier(token.systemIdentifier().data(), token.systemIdentifier().size());
         m_attributes.append(CompactAttribute(publicIdentifier, systemIdentifier));
+        m_doctypeForcesQuirks = token.forceQuirks();
         break;
     }

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

@@ -73 +73 @@
     const String& publicIdentifier() const { return m_attributes[0].name(); }
     const String& systemIdentifier() const { return m_attributes[0].value(); }
+    bool doctypeForcesQuirks() const { return m_doctypeForcesQuirks; }
 
 private:
@@ -78 +79 @@
     unsigned m_selfClosing : 1;
     unsigned m_isAll8BitData : 1;
+    unsigned m_doctypeForcesQuirks: 1;
 
     String m_data; // "name", "characters", or "data" depending on m_type

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

@@ -311 +311 @@
             m_doctypeData->m_hasSystemIdentifier = true;
             m_doctypeData->m_systemIdentifier.append(token.systemIdentifier().characters(), token.systemIdentifier().length());
+            m_doctypeData->m_forceQuirks = token.doctypeForcesQuirks();
             break;
         case HTMLTokenTypes::EndOfFile: