[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 12:28:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 38277ded264af2c8f7bb45d407a3484fdac12f5e
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 24 08:55:29 2010 +0000
2010-08-24 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Tor Arne Vestbø.
Disallow setting Document.xmlVersion to unsupported versions
https://bugs.webkit.org/show_bug.cgi?id=44494
Added XMLDocumentParser::supportsXMLVersion() - only returns true for "1.0"
in both implementations.
* dom/Document.cpp:
(WebCore::Document::setXMLVersion): Throw NOT_SUPPORTED_ERR
if XMLDocumentParser::supportsXMLVersion() returns false for the version.
* dom/XMLDocumentParser.h:
* dom/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::supportsXMLVersion):
* dom/XMLDocumentParserQt.cpp:
(WebCore::XMLDocumentParser::supportsXMLVersion):
2010-08-24 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Tor Arne Vestbø.
Disallow setting Document.xmlVersion to unsupported versions
https://bugs.webkit.org/show_bug.cgi?id=44494
Rebaselined tests (to expect success in 9/10 cases)
documentsetxmlversion03.xhtml fails now (but legitimately.)
* dom/xhtml/level3/core/canonicalform06-expected.txt:
* dom/xhtml/level3/core/documentsetxmlversion01-expected.txt:
* dom/xhtml/level3/core/documentsetxmlversion03-expected.txt:
* dom/xhtml/level3/core/documentsetxmlversion05-expected.txt:
* dom/xhtml/level3/core/infoset06-expected.txt:
* dom/xhtml/level3/core/infoset07-expected.txt:
* dom/xhtml/level3/core/wellformed01-expected.txt:
* dom/xhtml/level3/core/wellformed02-expected.txt:
* dom/xhtml/level3/core/wellformed03-expected.txt:
* dom/xhtml/level3/core/wellformed04-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65878 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 707ff00..5e2fbfb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-24 Andreas Kling <andreas.kling at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ Disallow setting Document.xmlVersion to unsupported versions
+ https://bugs.webkit.org/show_bug.cgi?id=44494
+
+ Rebaselined tests (to expect success in 9/10 cases)
+ documentsetxmlversion03.xhtml fails now (but legitimately.)
+
+ * dom/xhtml/level3/core/canonicalform06-expected.txt:
+ * dom/xhtml/level3/core/documentsetxmlversion01-expected.txt:
+ * dom/xhtml/level3/core/documentsetxmlversion03-expected.txt:
+ * dom/xhtml/level3/core/documentsetxmlversion05-expected.txt:
+ * dom/xhtml/level3/core/infoset06-expected.txt:
+ * dom/xhtml/level3/core/infoset07-expected.txt:
+ * dom/xhtml/level3/core/wellformed01-expected.txt:
+ * dom/xhtml/level3/core/wellformed02-expected.txt:
+ * dom/xhtml/level3/core/wellformed03-expected.txt:
+ * dom/xhtml/level3/core/wellformed04-expected.txt:
+
2010-08-24 Adam Barth <abarth at webkit.org>
Update baselines for Tiger bot. I'm not sure why these didn't turn up
diff --git a/LayoutTests/dom/xhtml/level3/core/canonicalform06-expected.txt b/LayoutTests/dom/xhtml/level3/core/canonicalform06-expected.txt
index 638218f..fcab69c 100644
--- a/LayoutTests/dom/xhtml/level3/core/canonicalform06-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/canonicalform06-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/canonicalform06
-Status error
-Message Error: INVALID_CHARACTER_ERR: DOM Exception 5
+Status Success
diff --git a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion01-expected.txt b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion01-expected.txt
index 433fffe..f3287c3 100644
--- a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion01-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion01-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion01
-Status failure
-Message NOT_SUPPORTED_ERR_documentsetversion01: assertTrue failed
+Status Success
diff --git a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion03-expected.txt b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion03-expected.txt
index 43b8785..410e075 100644
--- a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion03-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion03-expected.txt
@@ -1,2 +1,3 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion03
-Status Success
+Status error
+Message Error: NOT_SUPPORTED_ERR: DOM Exception 9
diff --git a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion05-expected.txt b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion05-expected.txt
index 895671f..29e6b80 100644
--- a/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion05-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/documentsetxmlversion05-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentsetxmlversion05
-Status failure
-Message throw_NOT_SUPPORTED_ERR: assertTrue failed
+Status Success
diff --git a/LayoutTests/dom/xhtml/level3/core/infoset06-expected.txt b/LayoutTests/dom/xhtml/level3/core/infoset06-expected.txt
index ff8224e..ba42393 100644
--- a/LayoutTests/dom/xhtml/level3/core/infoset06-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/infoset06-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset06
-Status error
-Message Error: INVALID_CHARACTER_ERR: DOM Exception 5
+Status Success
diff --git a/LayoutTests/dom/xhtml/level3/core/infoset07-expected.txt b/LayoutTests/dom/xhtml/level3/core/infoset07-expected.txt
index d13c99f..bb966c4 100644
--- a/LayoutTests/dom/xhtml/level3/core/infoset07-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/infoset07-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07
-Status error
-Message Error: INVALID_CHARACTER_ERR: DOM Exception 5
+Status Success
diff --git a/LayoutTests/dom/xhtml/level3/core/wellformed01-expected.txt b/LayoutTests/dom/xhtml/level3/core/wellformed01-expected.txt
index 3f1d8a4..f41d401 100644
--- a/LayoutTests/dom/xhtml/level3/core/wellformed01-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/wellformed01-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed01
-Status error
-Message Error: INVALID_CHARACTER_ERR: DOM Exception 5
+Status Success
diff --git a/LayoutTests/dom/xhtml/level3/core/wellformed02-expected.txt b/LayoutTests/dom/xhtml/level3/core/wellformed02-expected.txt
index f475595..2877cd0 100644
--- a/LayoutTests/dom/xhtml/level3/core/wellformed02-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/wellformed02-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed02
-Status error
-Message Error: INVALID_CHARACTER_ERR: DOM Exception 5
+Status Success
diff --git a/LayoutTests/dom/xhtml/level3/core/wellformed03-expected.txt b/LayoutTests/dom/xhtml/level3/core/wellformed03-expected.txt
index 8533c15..ab62919 100644
--- a/LayoutTests/dom/xhtml/level3/core/wellformed03-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/wellformed03-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03
-Status error
-Message Error: INVALID_CHARACTER_ERR: DOM Exception 5
+Status Success
diff --git a/LayoutTests/dom/xhtml/level3/core/wellformed04-expected.txt b/LayoutTests/dom/xhtml/level3/core/wellformed04-expected.txt
index d2a8f9d..6a67db7 100644
--- a/LayoutTests/dom/xhtml/level3/core/wellformed04-expected.txt
+++ b/LayoutTests/dom/xhtml/level3/core/wellformed04-expected.txt
@@ -1,3 +1,2 @@
Test http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed04
-Status error
-Message Error: INVALID_CHARACTER_ERR: DOM Exception 5
+Status Success
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2ac7e71..2ac93c3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-24 Andreas Kling <andreas.kling at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ Disallow setting Document.xmlVersion to unsupported versions
+ https://bugs.webkit.org/show_bug.cgi?id=44494
+
+ Added XMLDocumentParser::supportsXMLVersion() - only returns true for "1.0"
+ in both implementations.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setXMLVersion): Throw NOT_SUPPORTED_ERR
+ if XMLDocumentParser::supportsXMLVersion() returns false for the version.
+ * dom/XMLDocumentParser.h:
+ * dom/XMLDocumentParserLibxml2.cpp:
+ (WebCore::XMLDocumentParser::supportsXMLVersion):
+ * dom/XMLDocumentParserQt.cpp:
+ (WebCore::XMLDocumentParser::supportsXMLVersion):
+
2010-08-24 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Simon Hausmann.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index e75ac6a..015b18d 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -984,8 +984,11 @@ void Document::setXMLVersion(const String& version, ExceptionCode& ec)
ec = NOT_SUPPORTED_ERR;
return;
}
-
- // FIXME: Also raise NOT_SUPPORTED_ERR if the version is set to a value that is not supported by this Document.
+
+ if (!XMLDocumentParser::supportsXMLVersion(version)) {
+ ec = NOT_SUPPORTED_ERR;
+ return;
+ }
m_xmlVersion = version;
}
diff --git a/WebCore/dom/XMLDocumentParser.h b/WebCore/dom/XMLDocumentParser.h
index 39bbcd9..bebaf7c 100644
--- a/WebCore/dom/XMLDocumentParser.h
+++ b/WebCore/dom/XMLDocumentParser.h
@@ -104,6 +104,8 @@ namespace WebCore {
virtual int lineNumber() const;
virtual int columnNumber() const;
+ static bool supportsXMLVersion(const String&);
+
private:
XMLDocumentParser(Document*, FrameView* = 0);
XMLDocumentParser(DocumentFragment*, Element*, FragmentScriptingPermission);
diff --git a/WebCore/dom/XMLDocumentParserLibxml2.cpp b/WebCore/dom/XMLDocumentParserLibxml2.cpp
index 444edc5..ce25905 100644
--- a/WebCore/dom/XMLDocumentParserLibxml2.cpp
+++ b/WebCore/dom/XMLDocumentParserLibxml2.cpp
@@ -522,6 +522,11 @@ PassRefPtr<XMLParserContext> XMLParserContext::createMemoryParser(xmlSAXHandlerP
// --------------------------------
+bool XMLDocumentParser::supportsXMLVersion(const String& version)
+{
+ return version == "1.0";
+}
+
XMLDocumentParser::XMLDocumentParser(Document* document, FrameView* frameView)
: ScriptableDocumentParser(document)
, m_view(frameView)
diff --git a/WebCore/dom/XMLDocumentParserQt.cpp b/WebCore/dom/XMLDocumentParserQt.cpp
index 115a3e9..3c01cfe 100644
--- a/WebCore/dom/XMLDocumentParserQt.cpp
+++ b/WebCore/dom/XMLDocumentParserQt.cpp
@@ -78,6 +78,11 @@ QString EntityResolver::resolveUndeclaredEntity(const QString &name)
// --------------------------------
+bool XMLDocumentParser::supportsXMLVersion(const String& version)
+{
+ return version == "1.0";
+}
+
XMLDocumentParser::XMLDocumentParser(Document* document, FrameView* frameView)
: ScriptableDocumentParser(document)
, m_view(frameView)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list