From a7e2ae27bf53c15cd4f1088dfe426c5496eb16e7 Mon Sep 17 00:00:00 2001 From: "ap@webkit.org" Date: Sun, 6 Jan 2008 19:35:43 +0000 Subject: [PATCH] Reviewed by Darin. http://bugs.webkit.org/show_bug.cgi?id=16731 Incorrect node type for whitespace when setting innerHTML in an XHTML document Test: fast/dom/xhtml-fragment-whitespace.xhtml * dom/XMLTokenizer.cpp: (WebCore::parseXMLDocumentFragment): Use balancedCharactersHandler for ignorable whitespace. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29211 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 10 +++++++++ .../xhtml-fragment-whitespace-expected.txt | 3 +++ .../fast/dom/xhtml-fragment-whitespace.xhtml | 21 +++++++++++++++++++ WebCore/ChangeLog | 12 +++++++++++ WebCore/dom/XMLTokenizer.cpp | 2 +- 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 LayoutTests/fast/dom/xhtml-fragment-whitespace-expected.txt create mode 100644 LayoutTests/fast/dom/xhtml-fragment-whitespace.xhtml diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 1a338435f1a7..a1661bda23d2 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,13 @@ +2008-01-06 Alexey Proskuryakov + + Reviewed by Darin. + + http://bugs.webkit.org/show_bug.cgi?id=16731 + Incorrect node type for whitespace when setting innerHTML in an XHTML document + + * fast/dom/xhtml-fragment-whitespace-expected.txt: Added. + * fast/dom/xhtml-fragment-whitespace.xhtml: Added. + 2008-01-06 Alexey Proskuryakov Reviewed by Darin. diff --git a/LayoutTests/fast/dom/xhtml-fragment-whitespace-expected.txt b/LayoutTests/fast/dom/xhtml-fragment-whitespace-expected.txt new file mode 100644 index 000000000000..9ecaf66057ee --- /dev/null +++ b/LayoutTests/fast/dom/xhtml-fragment-whitespace-expected.txt @@ -0,0 +1,3 @@ +Test for bug 16731: Incorrect node type for whitespace when setting innerHTML in an XHTML document. + +SUCCESS diff --git a/LayoutTests/fast/dom/xhtml-fragment-whitespace.xhtml b/LayoutTests/fast/dom/xhtml-fragment-whitespace.xhtml new file mode 100644 index 000000000000..604490192256 --- /dev/null +++ b/LayoutTests/fast/dom/xhtml-fragment-whitespace.xhtml @@ -0,0 +1,21 @@ + + + +

Test for bug 16731: + Incorrect node type for whitespace when setting innerHTML in an XHTML document.

+ + diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 348eeb0885b6..3a7199b42f76 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2008-01-06 Alexey Proskuryakov + + Reviewed by Darin. + + http://bugs.webkit.org/show_bug.cgi?id=16731 + Incorrect node type for whitespace when setting innerHTML in an XHTML document + + Test: fast/dom/xhtml-fragment-whitespace.xhtml + + * dom/XMLTokenizer.cpp: (WebCore::parseXMLDocumentFragment): + Use balancedCharactersHandler for ignorable whitespace. + 2008-01-06 Alexey Proskuryakov Reviewed by Darin. diff --git a/WebCore/dom/XMLTokenizer.cpp b/WebCore/dom/XMLTokenizer.cpp index 0f363897d7d3..75d8dd415680 100644 --- a/WebCore/dom/XMLTokenizer.cpp +++ b/WebCore/dom/XMLTokenizer.cpp @@ -1577,7 +1577,7 @@ bool parseXMLDocumentFragment(const String& string, DocumentFragment* fragment, sax.startElementNs = balancedStartElementNsHandler; sax.endElementNs = balancedEndElementNsHandler; sax.cdataBlock = balancedCdataBlockHandler; - sax.ignorableWhitespace = balancedCdataBlockHandler; + sax.ignorableWhitespace = balancedCharactersHandler; sax.comment = balancedCommentHandler; sax.warning = balancedWarningHandler; sax.initialized = XML_SAX2_MAGIC; -- 2.36.0