Attachment 84704 Details for Bug 55750 – Patch

[patch] Patch

wk55750.diff.submit (text/plain), 5.27 KB, created by Cosmin Truta on 2011-03-04 00:30:39 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Cosmin Truta

Created: 2011-03-04 00:30:39 PST

Size: 5.27 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index d5faab6..57ec3d1 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2011-03-03  Cosmin Truta  <ctruta@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        SVG <image> referenced by <use> is displayed incorrectly
>+        https://bugs.webkit.org/show_bug.cgi?id=55750
>+
>+        * svg/custom/resources/rgb.svg: Added.
>+        * svg/custom/use-image-in-g-expected.checksum: Added.
>+        * svg/custom/use-image-in-g-expected.png: Added.
>+        * svg/custom/use-image-in-g-expected.txt: Added.
>+        * svg/custom/use-image-in-g.svg: Added.
>+
> 2011-03-03  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Reviewed by Martin Robinson.
>diff --git a/LayoutTests/svg/custom/resources/rgb.svg b/LayoutTests/svg/custom/resources/rgb.svg
>new file mode 100644
>index 0000000..dc55816
>--- /dev/null
>+++ b/LayoutTests/svg/custom/resources/rgb.svg
>@@ -0,0 +1,5 @@
>+<svg width="192" height="64" xmlns="http://www.w3.org/2000/svg">
>+  <rect x="0" y="0" width="64" height="64" fill="#c00"/>
>+  <rect x="64" y="0" width="64" height="64" fill="#090"/>
>+  <rect x="128" y="0" width="64" height="64" fill="#00f"/>
>+</svg>
>diff --git a/LayoutTests/svg/custom/use-image-in-g-expected.checksum b/LayoutTests/svg/custom/use-image-in-g-expected.checksum
>new file mode 100644
>index 0000000..dc867ae
>--- /dev/null
>+++ b/LayoutTests/svg/custom/use-image-in-g-expected.checksum
>@@ -0,0 +1 @@
>+1a7441075f2757736e291d4caf3c0d93
>\ No newline at end of file
>diff --git a/LayoutTests/svg/custom/use-image-in-g-expected.png b/LayoutTests/svg/custom/use-image-in-g-expected.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..8c5253b7310c199baf1913d6255effdf34097873
>GIT binary patch
>literal 2422
>zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>i0*Z)=h^jL%aN2shIEGZ*dVBXEZ;OI}
>z!^Ki(_Y0S=rT9DhZf2cPG4b?+>TqYJ2M^Qr<YxY4WJs91UYUVGAOdI#H-ke0BZI;Q
>z1_l-}hK2)7U@nIaL&L9Ie;->eH%{7lZ?`i;Lb4h{F;Et!7-R&9+sMkWq48VBSBa-)
>zHs_kQe>q*WUgn`Z1H+!_oDfr?c7YT^?Sfg2W*X2zgcU)p#BUOkA|#)pS%+N_Qg9&o
>z5G0CZQo%*JwS5}fAFinIHmqIA5YR!;t2qx&_$+5&*f4>x$_01r=M`HiPkX)BnuWnE
>ztqC4%NKpg|ClD9pCh3g+u>Qcj!;f_;y!Y#TKPC8&k>Nn~OkmU!^dTtzNl^r|5@*su
>zb{A@N;&42wBIJaD<U=$?;%_g$>L`-#>)I}Ic{&$E>kLA^IKb9-rUaOWxQB6|K%)d2
>zn@ABwI7^`gFOo^nase$P07a1_3cDht+yZhFbrcbmIgu36I(=g=Kk1SQu*VWnQOR^#
>z5MFen6>M}2JEU|;#j*h@Sa260NQ#isB~f9AR9cQ^1LP_Zd&<FH4$&sQNsUTid^arp
>Z=P04NdV0Y56kvOb!PC{xWt~$(69ANUhnxTa
>
>literal 0
>HcmV?d00001
>
>diff --git a/LayoutTests/svg/custom/use-image-in-g-expected.txt b/LayoutTests/svg/custom/use-image-in-g-expected.txt
>new file mode 100644
>index 0000000..151c211
>--- /dev/null
>+++ b/LayoutTests/svg/custom/use-image-in-g-expected.txt
>@@ -0,0 +1,12 @@
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderSVGRoot {svg} at (10,10) size 200x170
>+    RenderSVGContainer {g} at (10,10) size 200x80
>+      RenderSVGPath {rect} at (10,10) size 200x80 [fill={[type=SOLID] [color=#CCCCCC]}] [x=10.00] [y=10.00] [width=200.00] [height=80.00]
>+      RenderSVGImage {image} at (20,20) size 180x60
>+    RenderSVGContainer {use} at (10,100) size 200x80
>+      RenderSVGContainer {g} at (10,100) size 200x80 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,90.00)}]
>+        RenderSVGContainer {g} at (10,100) size 200x80
>+          RenderSVGPath {rect} at (10,100) size 200x80 [fill={[type=SOLID] [color=#CCCCCC]}] [x=10.00] [y=10.00] [width=200.00] [height=80.00]
>+          RenderSVGImage {image} at (20,110) size 180x60
>diff --git a/LayoutTests/svg/custom/use-image-in-g.svg b/LayoutTests/svg/custom/use-image-in-g.svg
>new file mode 100644
>index 0000000..4130cad
>--- /dev/null
>+++ b/LayoutTests/svg/custom/use-image-in-g.svg
>@@ -0,0 +1,7 @@
>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
>+  <g id="foo">
>+    <rect x="10" y="10" width="200" height="80" fill="#ccc"/>
>+    <image x="20" y="20" width="180" height="60" xlink:href="resources/rgb.svg"/>
>+  </g>
>+  <use x="0" y="90" xlink:href="#foo"/>
>+</svg>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9fa35e9..4eb8f5a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2011-03-03  Cosmin Truta  <ctruta@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        SVG <image> referenced by <use> is displayed incorrectly
>+        https://bugs.webkit.org/show_bug.cgi?id=55750
>+
>+        The result of sourceURI must use the URL of the enclosing document as base.
>+        Otherwise, the base may sometimes be empty, and, as a consequence,
>+        the intermediate KURL object may be invalid.
>+
>+        Test: svg/custom/use-image-in-g.svg
>+
>+        * svg/SVGImageLoader.cpp:
>+        (WebCore::SVGImageLoader::sourceURI):
>+
> 2011-03-03  Dimitri Glazkov  <dglazkov@chromium.org>
> 
>         Reviewed by Eric Carlson.
>diff --git a/Source/WebCore/svg/SVGImageLoader.cpp b/Source/WebCore/svg/SVGImageLoader.cpp
>index 17e9004..7c60191 100644
>--- a/Source/WebCore/svg/SVGImageLoader.cpp
>+++ b/Source/WebCore/svg/SVGImageLoader.cpp
>@@ -49,7 +49,7 @@ void SVGImageLoader::dispatchLoadEvent()
> 
> String SVGImageLoader::sourceURI(const AtomicString& attr) const
> {
>-    return KURL(element()->baseURI(), stripLeadingAndTrailingHTMLSpaces(attr)).string();
>+    return element()->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(attr));
> }
> 
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 55750: 84704 | 87546 | 87747