Changeset 249040 in webkit

Timestamp:

Aug 22, 2019, 7:06:42 PM (7 years ago)

Author:

Fujii Hironori

Message:

[SVG] -webkit-clip-path treats url(abc#xyz) as url(#xyz) because it checks only URL fragment part
​https://bugs.webkit.org/show_bug.cgi?id=201030

Reviewed by Ryosuke Niwa.

Source/WebCore:

Tests: svg/clip-path/clip-path-invalid-reference-001-expected.svg

svg/clip-path/clip-path-invalid-reference-001.svg
svg/clip-path/clip-path-invalid-reference-002-expected.svg
svg/clip-path/clip-path-invalid-reference-002.svg

• css/StyleBuilderConverter.h:

(WebCore::StyleBuilderConverter::convertClipPath): Use
SVGURIReference::fragmentIdentifierFromIRIString to get fragment
identifier from -webkit-clip-path.

LayoutTests:

• svg/clip-path/clip-path-invalid-reference-001-expected.svg: Added.
• svg/clip-path/clip-path-invalid-reference-001.svg: Added.
• svg/clip-path/clip-path-invalid-reference-002-expected.svg: Added.
• svg/clip-path/clip-path-invalid-reference-002.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/clip-path/clip-path-invalid-reference-001-expected.svg (added)
• LayoutTests/svg/clip-path/clip-path-invalid-reference-001.svg (added)
• LayoutTests/svg/clip-path/clip-path-invalid-reference-002-expected.svg (added)
• LayoutTests/svg/clip-path/clip-path-invalid-reference-002.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleBuilderConverter.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-22  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [SVG] -webkit-clip-path treats url(abc#xyz) as url(#xyz) because it checks only URL fragment part
+        https://bugs.webkit.org/show_bug.cgi?id=201030
+
+        Reviewed by Ryosuke Niwa.
+
+        * svg/clip-path/clip-path-invalid-reference-001-expected.svg: Added.
+        * svg/clip-path/clip-path-invalid-reference-001.svg: Added.
+        * svg/clip-path/clip-path-invalid-reference-002-expected.svg: Added.
+        * svg/clip-path/clip-path-invalid-reference-002.svg: Added.
+
 2019-08-22  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-22  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [SVG] -webkit-clip-path treats url(abc#xyz) as url(#xyz) because it checks only URL fragment part
+        https://bugs.webkit.org/show_bug.cgi?id=201030
+
+        Reviewed by Ryosuke Niwa.
+
+        Tests: svg/clip-path/clip-path-invalid-reference-001-expected.svg
+               svg/clip-path/clip-path-invalid-reference-001.svg
+               svg/clip-path/clip-path-invalid-reference-002-expected.svg
+               svg/clip-path/clip-path-invalid-reference-002.svg
+
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertClipPath): Use
+        SVGURIReference::fragmentIdentifierFromIRIString to get fragment
+        identifier from -webkit-clip-path.
+
 2019-08-22  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -591 +591 @@
         if (primitiveValue.primitiveType() == CSSPrimitiveValue::CSS_URI) {
             String cssURLValue = primitiveValue.stringValue();
-            URL url = styleResolver.document().completeURL(cssURLValue);
+            String fragment = SVGURIReference::fragmentIdentifierFromIRIString(cssURLValue, styleResolver.document());
             // FIXME: It doesn't work with external SVG references (see https://bugs.webkit.org/show_bug.cgi?id=126133)
-            return ReferenceClipPathOperation::create(cssURLValue, url.fragmentIdentifier());
+            return ReferenceClipPathOperation::create(cssURLValue, fragment);
         }
         ASSERT(primitiveValue.valueID() == CSSValueNone);