Changeset 60791 in webkit

Timestamp:

Jun 7, 2010 11:51:31 AM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

"Fix" fast/dom/stripNullFromTextNodes.html in HTML5 parser
​https://bugs.webkit.org/show_bug.cgi?id=40200

The proper handling of null characters is to replace them with U+FFFD.
This patch "fixes" fast/dom/stripNullFromTextNodes.html in the sense
that it makes it give the proper output w.r.t. HTML5. However, that
doesn't match the behavior of the old parser, which just stripped the
nulls.

• html/HTML5Lexer.h: (WebCore::HTML5Lexer::InputStreamPreprocessor::peek):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTML5Lexer.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-07  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        "Fix" fast/dom/stripNullFromTextNodes.html in HTML5 parser
+        https://bugs.webkit.org/show_bug.cgi?id=40200
+
+        The proper handling of null characters is to replace them with U+FFFD.
+        This patch "fixes" fast/dom/stripNullFromTextNodes.html in the sense
+        that it makes it give the proper output w.r.t. HTML5.  However, that
+        doesn't match the behavior of the old parser, which just stripped the
+        nulls.
+
+        * html/HTML5Lexer.h:
+        (WebCore::HTML5Lexer::InputStreamPreprocessor::peek):
+
 2010-06-07  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTML5Lexer.h

@@ -158 +158 @@
                     m_nextInputCharacter = '\n';
                     m_skipNextNewLine = true;
-                } else
+                } else {
                     m_skipNextNewLine = false;
+                    if (m_nextInputCharacter == '\0' || (m_nextInputCharacter >= 0xD800 && m_nextInputCharacter <= 0xDFFF))
+                        m_nextInputCharacter = 0xFFFD;
+                }
                 return true;
             }