Title: [152785] trunk
- Revision
- 152785
- Author
- rwlb...@webkit.org
- Date
- 2013-07-17 09:40:11 -0700 (Wed, 17 Jul 2013)
Log Message
[Mac] REGRESSION(r152685): svg/custom/xlink-prefix-in-attributes.html failed unexpectedly
https://bugs.webkit.org/show_bug.cgi?id=118701
Reviewed by Ryosuke Niwa.
Source/WebCore:
Use the computed attribute prefix, otherwise href being in xlink namespace but not having any prefix
will cause outputting the xlink namespace in appendNamespace.
Patch fixes svg/custom/xlink-prefix-in-attributes.html.
* editing/MarkupAccumulator.cpp:
(WebCore::MarkupAccumulator::appendAttribute):
LayoutTests:
* platform/mac/TestExpectations:
* platform/qt/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (152784 => 152785)
--- trunk/LayoutTests/ChangeLog 2013-07-17 16:26:52 UTC (rev 152784)
+++ trunk/LayoutTests/ChangeLog 2013-07-17 16:40:11 UTC (rev 152785)
@@ -1,3 +1,13 @@
+2013-07-17 Rob Buis <rwlb...@webkit.org>
+
+ [Mac] REGRESSION(r152685): svg/custom/xlink-prefix-in-attributes.html failed unexpectedly
+ https://bugs.webkit.org/show_bug.cgi?id=118701
+
+ Reviewed by Ryosuke Niwa.
+
+ * platform/mac/TestExpectations:
+ * platform/qt/TestExpectations:
+
2013-07-17 Chris Fleizach <cfleiz...@apple.com>
Regression: columnheader/rowheader roles not exposed correctly
Modified: trunk/LayoutTests/platform/mac/TestExpectations (152784 => 152785)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-07-17 16:26:52 UTC (rev 152784)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-07-17 16:40:11 UTC (rev 152785)
@@ -1296,5 +1296,3 @@
webkit.org/b/118269 compositing/geometry/fixed-position-flipped-writing-mode.html
webkit.org/b/118479 fast/repaint/fixed-right-in-page-scale.html [ Pass Crash ]
-
-webkit.org/b/118701 svg/custom/xlink-prefix-in-attributes.html [ Failure ]
Modified: trunk/LayoutTests/platform/qt/TestExpectations (152784 => 152785)
--- trunk/LayoutTests/platform/qt/TestExpectations 2013-07-17 16:26:52 UTC (rev 152784)
+++ trunk/LayoutTests/platform/qt/TestExpectations 2013-07-17 16:40:11 UTC (rev 152785)
@@ -1410,9 +1410,6 @@
webkit.org/b/112228 svg/custom/resources-css-scaled.html [ Skip ]
-# [GTK][Qt] After (r152685) svg/custom/xlink-prefix-in-attributes.html test fails.
-webkit.org/b/118724 svg/custom/xlink-prefix-in-attributes.html [ Skip ]
-
# ============================================================================= #
# Failing CSS Tests
# ============================================================================= #
Modified: trunk/Source/WebCore/ChangeLog (152784 => 152785)
--- trunk/Source/WebCore/ChangeLog 2013-07-17 16:26:52 UTC (rev 152784)
+++ trunk/Source/WebCore/ChangeLog 2013-07-17 16:40:11 UTC (rev 152785)
@@ -1,3 +1,18 @@
+2013-07-17 Rob Buis <rwlb...@webkit.org>
+
+ [Mac] REGRESSION(r152685): svg/custom/xlink-prefix-in-attributes.html failed unexpectedly
+ https://bugs.webkit.org/show_bug.cgi?id=118701
+
+ Reviewed by Ryosuke Niwa.
+
+ Use the computed attribute prefix, otherwise href being in xlink namespace but not having any prefix
+ will cause outputting the xlink namespace in appendNamespace.
+
+ Patch fixes svg/custom/xlink-prefix-in-attributes.html.
+
+ * editing/MarkupAccumulator.cpp:
+ (WebCore::MarkupAccumulator::appendAttribute):
+
2013-07-17 Chris Fleizach <cfleiz...@apple.com>
Regression: columnheader/rowheader roles not exposed correctly
Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (152784 => 152785)
--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2013-07-17 16:26:52 UTC (rev 152784)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2013-07-17 16:40:11 UTC (rev 152785)
@@ -465,10 +465,10 @@
result.append(' ');
+ QualifiedName prefixedName = attribute.name();
if (documentIsHTML && !attributeIsInSerializedNamespace(attribute))
result.append(attribute.name().localName());
else {
- QualifiedName prefixedName = attribute.name();
if (attribute.namespaceURI() == XLinkNames::xlinkNamespaceURI) {
if (!attribute.prefix())
prefixedName.setPrefix(xlinkAtom);
@@ -493,7 +493,7 @@
}
if ((inXMLFragmentSerialization() || !documentIsHTML) && namespaces && shouldAddNamespaceAttribute(attribute, *namespaces))
- appendNamespace(result, attribute.prefix(), attribute.namespaceURI(), *namespaces);
+ appendNamespace(result, prefixedName.prefix(), prefixedName.namespaceURI(), *namespaces);
}
void MarkupAccumulator::appendCDATASection(StringBuilder& result, const String& section)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
