WebCore:
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Jan 2008 00:37:02 +0000 (00:37 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Jan 2008 00:37:02 +0000 (00:37 +0000)
        Reviewed by Darin Adler.

        - fix <rdar://problem/5666926> svg/custom/use-css-no-effect-on-shadow-tree.svg is failing

        * svg/SVGPreserveAspectRatio.cpp:
        (WebCore::SVGPreserveAspectRatio::getCTM): Changed the arguments' type
        from float to double in order to make the values passed to scale() and
        translate() on Mac OS X and on Windows the same.
        * svg/SVGPreserveAspectRatio.h:

LayoutTests:

        Reviewed by Darin Adler.

        - updated results for <rdar://problem/5666926> svg/custom/use-css-no-effect-on-shadow-tree.svg is failing

        * platform/mac-leopard/svg/hixie/viewbox/preserveAspectRatio/001-expected.txt:
        * platform/mac/svg/custom/use-css-no-effect-on-shadow-tree-expected.txt:
        * platform/mac/svg/hixie/links/001-expected.txt:
        * platform/win/Skipped:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29497 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/mac-leopard/svg/hixie/viewbox/preserveAspectRatio/001-expected.txt
LayoutTests/platform/mac/svg/custom/use-css-no-effect-on-shadow-tree-expected.txt
LayoutTests/platform/mac/svg/hixie/links/001-expected.txt
LayoutTests/platform/win/Skipped
WebCore/ChangeLog
WebCore/svg/SVGPreserveAspectRatio.cpp
WebCore/svg/SVGPreserveAspectRatio.h

index 9e5f9bdb14918b105f083cc92c437ce0eedccdaa..1b4566a887132839279257e9fad1cae36bb32f94 100644 (file)
@@ -1,3 +1,14 @@
+2008-01-15  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - updated results for <rdar://problem/5666926> svg/custom/use-css-no-effect-on-shadow-tree.svg is failing
+
+        * platform/mac-leopard/svg/hixie/viewbox/preserveAspectRatio/001-expected.txt:
+        * platform/mac/svg/custom/use-css-no-effect-on-shadow-tree-expected.txt:
+        * platform/mac/svg/hixie/links/001-expected.txt:
+        * platform/win/Skipped:
+
 2008-01-15  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.
index 916df76ca045a93b8f9206dfaa5b17cb59f84618..455a03ae88344250e5104a0ad262f73dede515b5 100644 (file)
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (97.88,-2.12) size 604.24x604.24
-    RenderPath {rect} at (100.00,0) size 600x600 [fill={[type=SOLID] [color=#000080]}] [data="M0.00,0.00L100.00,0.00L100.00,100.00L0.00,100.00"]
+    RenderPath {rect} at (100,0) size 600x600 [fill={[type=SOLID] [color=#000080]}] [data="M0.00,0.00L100.00,0.00L100.00,100.00L0.00,100.00"]
     RenderPath {line} at (97.88,-2.12) size 604.24x604.24 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L100.00,100.00"]
     RenderPath {line} at (97.88,-2.12) size 604.24x604.24 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#000000]}] [data="M100.00,0.00L0.00,100.00"]
     RenderSVGText {text} at (9,30) size 82x8 contains 1 chunk(s)
index 058a4515ec24b2060c810182a36c3df1d65149be..c2d5775dfd73227c8ea4d551e5dbf45d5535e878 100644 (file)
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 453x113
-  RenderSVGRoot {svg} at (-0.06,-0.56) size 453.13x114.13
+  RenderSVGRoot {svg} at (-0.07,-0.56) size 453.13x114.13
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderPath {path} at (300,49.50) size 600.50x201 [stroke={[type=SOLID] [color=#FF0000] [opacity=0.50] [miter limit=10.00] [line join=BEVEL] [dash array={300.00, 100.00}]}] [fill={[type=SOLID] [color=#000000]}] [data="M300.00,50.00L900.00,50.00L900.00,250.00L300.00,250.00"]
-    RenderPath {rect} at (-0.06,-0.56) size 453.13x114.13 [stroke={[type=SOLID] [color=#0000FF] [stroke width=3.00]}] [data="M0.00,0.00L1200.00,0.00L1200.00,300.00L0.00,300.00"]
+    RenderPath {rect} at (-0.07,-0.56) size 453.13x114.13 [stroke={[type=SOLID] [color=#0000FF] [stroke width=3.00]}] [data="M0.00,0.00L1200.00,0.00L1200.00,300.00L0.00,300.00"]
     RenderSVGContainer {g} at (105.97,11.30) size 241.07x90.40
       RenderSVGContainer {use} at (105.97,11.30) size 241.07x90.40
         RenderSVGContainer {g} at (105.97,11.30) size 241.07x90.40
index 9d51c3bbfb73db0046331c27eb0c018c2b216db8..e2b2edebf4f9e31f36afda3c91ebefe119ac3951 100644 (file)
@@ -1,11 +1,11 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (250.00,90) size 300x420
-    RenderSVGContainer {a} at (250.00,90) size 300x180
-      RenderPath {circle} at (250.00,90) size 180x180 [fill={[type=SOLID] [color=#0000FF]}] [data="M55.00,30.00L54.97,30.94L54.88,31.88L54.73,32.81L54.53,33.73L54.27,34.64L53.95,35.52L53.57,36.39L53.14,37.23L52.66,38.04L52.14,38.82L51.56,39.56L50.93,40.27L50.27,40.93L49.56,41.56L48.82,42.14L48.04,42.66L47.23,43.14L46.39,43.57L45.52,43.95L44.64,44.27L43.73,44.53L42.81,44.73L41.88,44.88L40.94,44.97L40.00,45.00L39.06,44.97L38.12,44.88L37.19,44.73L36.27,44.53L35.36,44.27L34.48,43.95L33.61,43.57L32.77,43.14L31.96,42.66L31.18,42.14L30.44,41.56L29.73,40.93L29.07,40.27L28.44,39.56L27.86,38.82L27.34,38.04L26.86,37.23L26.43,36.39L26.05,35.52L25.73,34.64L25.47,33.73L25.27,32.81L25.12,31.88L25.03,30.94L25.00,30.00L25.03,29.06L25.12,28.12L25.27,27.19L25.47,26.27L25.73,25.36L26.05,24.48L26.43,23.61L26.86,22.77L27.34,21.96L27.86,21.18L28.44,20.44L29.07,19.73L29.73,19.07L30.44,18.44L31.18,17.86L31.96,17.34L32.77,16.86L33.61,16.43L34.48,16.05L35.36,15.73L36.27,15.47L37.19,15.27L38.12,15.12L39.06,15.03L40.00,15.00L40.94,15.03L41.88,15.12L42.81,15.27L43.73,15.47L44.64,15.73L45.52,16.05L46.39,16.43L47.23,16.86L48.04,17.34L48.82,17.86L49.56,18.44L50.27,19.07L50.93,19.73L51.56,20.44L52.14,21.18L52.66,21.96L53.14,22.77L53.57,23.61L53.95,24.48L54.27,25.36L54.53,26.27L54.73,27.19L54.88,28.12L54.97,29.06"]
+  RenderSVGRoot {svg} at (250,90) size 300x420
+    RenderSVGContainer {a} at (250,90) size 300x180
+      RenderPath {circle} at (250,90) size 180x180 [fill={[type=SOLID] [color=#0000FF]}] [data="M55.00,30.00L54.97,30.94L54.88,31.88L54.73,32.81L54.53,33.73L54.27,34.64L53.95,35.52L53.57,36.39L53.14,37.23L52.66,38.04L52.14,38.82L51.56,39.56L50.93,40.27L50.27,40.93L49.56,41.56L48.82,42.14L48.04,42.66L47.23,43.14L46.39,43.57L45.52,43.95L44.64,44.27L43.73,44.53L42.81,44.73L41.88,44.88L40.94,44.97L40.00,45.00L39.06,44.97L38.12,44.88L37.19,44.73L36.27,44.53L35.36,44.27L34.48,43.95L33.61,43.57L32.77,43.14L31.96,42.66L31.18,42.14L30.44,41.56L29.73,40.93L29.07,40.27L28.44,39.56L27.86,38.82L27.34,38.04L26.86,37.23L26.43,36.39L26.05,35.52L25.73,34.64L25.47,33.73L25.27,32.81L25.12,31.88L25.03,30.94L25.00,30.00L25.03,29.06L25.12,28.12L25.27,27.19L25.47,26.27L25.73,25.36L26.05,24.48L26.43,23.61L26.86,22.77L27.34,21.96L27.86,21.18L28.44,20.44L29.07,19.73L29.73,19.07L30.44,18.44L31.18,17.86L31.96,17.34L32.77,16.86L33.61,16.43L34.48,16.05L35.36,15.73L36.27,15.47L37.19,15.27L38.12,15.12L39.06,15.03L40.00,15.00L40.94,15.03L41.88,15.12L42.81,15.27L43.73,15.47L44.64,15.73L45.52,16.05L46.39,16.43L47.23,16.86L48.04,17.34L48.82,17.86L49.56,18.44L50.27,19.07L50.93,19.73L51.56,20.44L52.14,21.18L52.66,21.96L53.14,22.77L53.57,23.61L53.95,24.48L54.27,25.36L54.53,26.27L54.73,27.19L54.88,28.12L54.97,29.06"]
       RenderPath {circle} at (370,90) size 180x180 [fill={[type=SOLID] [color=#0000FF]}] [data="M75.00,30.00L74.97,30.94L74.88,31.88L74.73,32.81L74.53,33.73L74.27,34.64L73.95,35.52L73.57,36.39L73.14,37.23L72.66,38.04L72.14,38.82L71.56,39.56L70.93,40.27L70.27,40.93L69.56,41.56L68.82,42.14L68.04,42.66L67.23,43.14L66.39,43.57L65.52,43.95L64.64,44.27L63.73,44.53L62.81,44.73L61.88,44.88L60.94,44.97L60.00,45.00L59.06,44.97L58.12,44.88L57.19,44.73L56.27,44.53L55.36,44.27L54.48,43.95L53.61,43.57L52.77,43.14L51.96,42.66L51.18,42.14L50.44,41.56L49.73,40.93L49.07,40.27L48.44,39.56L47.86,38.82L47.34,38.04L46.86,37.23L46.43,36.39L46.05,35.52L45.73,34.64L45.47,33.73L45.27,32.81L45.12,31.88L45.03,30.94L45.00,30.00L45.03,29.06L45.12,28.12L45.27,27.19L45.47,26.27L45.73,25.36L46.05,24.48L46.43,23.61L46.86,22.77L47.34,21.96L47.86,21.18L48.44,20.44L49.07,19.73L49.73,19.07L50.44,18.44L51.18,17.86L51.96,17.34L52.77,16.86L53.61,16.43L54.48,16.05L55.36,15.73L56.27,15.47L57.19,15.27L58.12,15.12L59.06,15.03L60.00,15.00L60.94,15.03L61.88,15.12L62.81,15.27L63.73,15.47L64.64,15.73L65.52,16.05L66.39,16.43L67.23,16.86L68.04,17.34L68.82,17.86L69.56,18.44L70.27,19.07L70.93,19.73L71.56,20.44L72.14,21.18L72.66,21.96L73.14,22.77L73.57,23.61L73.95,24.48L74.27,25.36L74.53,26.27L74.73,27.19L74.88,28.12L74.97,29.06"]
-    RenderSVGContainer {a} at (250.00,330) size 300x180
-      RenderSVGContainer {g} at (250.00,330) size 300x180
-        RenderPath {circle} at (250.00,330) size 180x180 [fill={[type=SOLID] [color=#0000FF]}] [data="M55.00,70.00L54.97,70.94L54.88,71.88L54.73,72.81L54.53,73.73L54.27,74.64L53.95,75.52L53.57,76.39L53.14,77.23L52.66,78.04L52.14,78.82L51.56,79.56L50.93,80.27L50.27,80.93L49.56,81.56L48.82,82.14L48.04,82.66L47.23,83.14L46.39,83.57L45.52,83.95L44.64,84.27L43.73,84.53L42.81,84.73L41.88,84.88L40.94,84.97L40.00,85.00L39.06,84.97L38.12,84.88L37.19,84.73L36.27,84.53L35.36,84.27L34.48,83.95L33.61,83.57L32.77,83.14L31.96,82.66L31.18,82.14L30.44,81.56L29.73,80.93L29.07,80.27L28.44,79.56L27.86,78.82L27.34,78.04L26.86,77.23L26.43,76.39L26.05,75.52L25.73,74.64L25.47,73.73L25.27,72.81L25.12,71.88L25.03,70.94L25.00,70.00L25.03,69.06L25.12,68.12L25.27,67.19L25.47,66.27L25.73,65.36L26.05,64.48L26.43,63.61L26.86,62.77L27.34,61.96L27.86,61.18L28.44,60.44L29.07,59.73L29.73,59.07L30.44,58.44L31.18,57.86L31.96,57.34L32.77,56.86L33.61,56.43L34.48,56.05L35.36,55.73L36.27,55.47L37.19,55.27L38.12,55.12L39.06,55.03L40.00,55.00L40.94,55.03L41.88,55.12L42.81,55.27L43.73,55.47L44.64,55.73L45.52,56.05L46.39,56.43L47.23,56.86L48.04,57.34L48.82,57.86L49.56,58.44L50.27,59.07L50.93,59.73L51.56,60.44L52.14,61.18L52.66,61.96L53.14,62.77L53.57,63.61L53.95,64.48L54.27,65.36L54.53,66.27L54.73,67.19L54.88,68.12L54.97,69.06"]
+    RenderSVGContainer {a} at (250,330) size 300x180
+      RenderSVGContainer {g} at (250,330) size 300x180
+        RenderPath {circle} at (250,330) size 180x180 [fill={[type=SOLID] [color=#0000FF]}] [data="M55.00,70.00L54.97,70.94L54.88,71.88L54.73,72.81L54.53,73.73L54.27,74.64L53.95,75.52L53.57,76.39L53.14,77.23L52.66,78.04L52.14,78.82L51.56,79.56L50.93,80.27L50.27,80.93L49.56,81.56L48.82,82.14L48.04,82.66L47.23,83.14L46.39,83.57L45.52,83.95L44.64,84.27L43.73,84.53L42.81,84.73L41.88,84.88L40.94,84.97L40.00,85.00L39.06,84.97L38.12,84.88L37.19,84.73L36.27,84.53L35.36,84.27L34.48,83.95L33.61,83.57L32.77,83.14L31.96,82.66L31.18,82.14L30.44,81.56L29.73,80.93L29.07,80.27L28.44,79.56L27.86,78.82L27.34,78.04L26.86,77.23L26.43,76.39L26.05,75.52L25.73,74.64L25.47,73.73L25.27,72.81L25.12,71.88L25.03,70.94L25.00,70.00L25.03,69.06L25.12,68.12L25.27,67.19L25.47,66.27L25.73,65.36L26.05,64.48L26.43,63.61L26.86,62.77L27.34,61.96L27.86,61.18L28.44,60.44L29.07,59.73L29.73,59.07L30.44,58.44L31.18,57.86L31.96,57.34L32.77,56.86L33.61,56.43L34.48,56.05L35.36,55.73L36.27,55.47L37.19,55.27L38.12,55.12L39.06,55.03L40.00,55.00L40.94,55.03L41.88,55.12L42.81,55.27L43.73,55.47L44.64,55.73L45.52,56.05L46.39,56.43L47.23,56.86L48.04,57.34L48.82,57.86L49.56,58.44L50.27,59.07L50.93,59.73L51.56,60.44L52.14,61.18L52.66,61.96L53.14,62.77L53.57,63.61L53.95,64.48L54.27,65.36L54.53,66.27L54.73,67.19L54.88,68.12L54.97,69.06"]
         RenderPath {circle} at (370,330) size 180x180 [fill={[type=SOLID] [color=#0000FF]}] [data="M75.00,70.00L74.97,70.94L74.88,71.88L74.73,72.81L74.53,73.73L74.27,74.64L73.95,75.52L73.57,76.39L73.14,77.23L72.66,78.04L72.14,78.82L71.56,79.56L70.93,80.27L70.27,80.93L69.56,81.56L68.82,82.14L68.04,82.66L67.23,83.14L66.39,83.57L65.52,83.95L64.64,84.27L63.73,84.53L62.81,84.73L61.88,84.88L60.94,84.97L60.00,85.00L59.06,84.97L58.12,84.88L57.19,84.73L56.27,84.53L55.36,84.27L54.48,83.95L53.61,83.57L52.77,83.14L51.96,82.66L51.18,82.14L50.44,81.56L49.73,80.93L49.07,80.27L48.44,79.56L47.86,78.82L47.34,78.04L46.86,77.23L46.43,76.39L46.05,75.52L45.73,74.64L45.47,73.73L45.27,72.81L45.12,71.88L45.03,70.94L45.00,70.00L45.03,69.06L45.12,68.12L45.27,67.19L45.47,66.27L45.73,65.36L46.05,64.48L46.43,63.61L46.86,62.77L47.34,61.96L47.86,61.18L48.44,60.44L49.07,59.73L49.73,59.07L50.44,58.44L51.18,57.86L51.96,57.34L52.77,56.86L53.61,56.43L54.48,56.05L55.36,55.73L56.27,55.47L57.19,55.27L58.12,55.12L59.06,55.03L60.00,55.00L60.94,55.03L61.88,55.12L62.81,55.27L63.73,55.47L64.64,55.73L65.52,56.05L66.39,56.43L67.23,56.86L68.04,57.34L68.82,57.86L69.56,58.44L70.27,59.07L70.93,59.73L71.56,60.44L72.14,61.18L72.66,61.96L73.14,62.77L73.57,63.61L73.95,64.48L74.27,65.36L74.53,66.27L74.73,67.19L74.88,68.12L74.97,69.06"]
index 5cc2bcc90bb4b1b086f14743fe462632dd7f3062..fcdd6615bae486d25b583bd6a4c5409fbf97d0b1 100644 (file)
@@ -228,11 +228,9 @@ svg/custom/mask-excessive-malloc.svg
 # String::Number prints floating point numbers differently on Win than X. <rdar://problem/5127993>
 svg/custom/path-bad-data.svg
 svg/dom/length-list-parser.html
-svg/hixie/links/001.xml
 svg/hixie/perf/001.xml
 svg/hixie/perf/002.xml
 svg/hixie/perf/007.xml
-svg/hixie/viewbox/preserveAspectRatio/001.xml
 
 # <rdar://problem/5663632> TextStream::operator<<(float) rounding differs between Mac OS X and Windows
 svg/batik/paints/patternRegions.svg
@@ -336,9 +334,6 @@ svg/custom/control-points-for-S-and-T.svg
 # <rdar://problem/5539818> REGRESSION (Leopard): http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase.html failing
 http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase.html
 
-# <rdar://5666926>
-svg/custom/use-css-no-effect-on-shadow-tree.svg
-
 # <rdar://5667007> 2 SVG text tests failing (due to bad rounding?)
 svg/batik/text/textOnPath.svg
 svg/batik/text/verticalTextOnPath.svg
@@ -349,8 +344,8 @@ editing/selection/5131716-1.html
 # <rdar://5667273>
 editing/selection/fake-drag.html
 
-# <rdar://5667279> Undefined value exception\r
-http/tests/xmlhttprequest/XMLHttpRequestException.html\r
+# <rdar://5667279> Undefined value exception
+http/tests/xmlhttprequest/XMLHttpRequestException.html
 
 # <rdar://5667302>
 svg/dom/animated-tearoff-equality.xhtml
index 8a973c4c414d3a474aa2691c8cb65f826efc8da1..d61345e252d770fdf7c8e05cd0e92ce325114f49 100644 (file)
@@ -1,3 +1,15 @@
+2008-01-15  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix <rdar://problem/5666926> svg/custom/use-css-no-effect-on-shadow-tree.svg is failing
+
+        * svg/SVGPreserveAspectRatio.cpp:
+        (WebCore::SVGPreserveAspectRatio::getCTM): Changed the arguments' type
+        from float to double in order to make the values passed to scale() and
+        translate() on Mac OS X and on Windows the same.
+        * svg/SVGPreserveAspectRatio.h:
+
 2008-01-15  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.
index 50750df71f29ce80d61502d8293421bc97f4e6ec..cbeda807541dca7ef83cf7ebdecff14b34546923 100644 (file)
@@ -163,18 +163,18 @@ bail_out:
     return ret;
 }
 
-AffineTransform SVGPreserveAspectRatio::getCTM(float logicX, float logicY,
-                                               float logicWidth, float logicHeight,
-                                               float /*physX*/, float /*physY*/,
-                                               float physWidth, float physHeight)
+AffineTransform SVGPreserveAspectRatio::getCTM(double logicX, double logicY,
+                                               double logicWidth, double logicHeight,
+                                               double /*physX*/, double /*physY*/,
+                                               double physWidth, double physHeight)
 {
     AffineTransform temp;
 
     if (align() == SVG_PRESERVEASPECTRATIO_UNKNOWN)
         return temp;
 
-    float vpar = logicWidth / logicHeight;
-    float svgar = physWidth / physHeight;
+    double vpar = logicWidth / logicHeight;
+    double svgar = physWidth / physHeight;
 
     if (align() == SVG_PRESERVEASPECTRATIO_NONE) {
         temp.scale(physWidth / logicWidth, physHeight / logicHeight);
index 8deae2bd27b8bf74b17bc62c4b0ec86f21cd6076..e9d737ca8ab4fdd9832c5fddbc456823ce4efa50 100644 (file)
@@ -65,10 +65,10 @@ namespace WebCore {
         void setMeetOrSlice(unsigned short);
         unsigned short meetOrSlice() const;
         
-        AffineTransform getCTM(float logicX, float logicY,
-                               float logicWidth, float logicHeight,
-                               float physX, float physY,
-                               float physWidth, float physHeight);
+        AffineTransform getCTM(double logicX, double logicY,
+                               double logicWidth, double logicHeight,
+                               double physX, double physY,
+                               double physWidth, double physHeight);
 
         // Helper
         bool parsePreserveAspectRatio(const UChar*& currParam, const UChar* end, bool validate = true);