Rebaseline an SVG layout test. The difference is that we draw two additional one-pixel-wide black lines, one horizontal and one vertical, which occur on the top and left of the box respectively. This gives the box a 3-D appearance. After reviewing the SVG code, it seems we are doing the right thing; i.e., the code specifies to draw these lines with stroke-width="1" to give the 3-D appearance. I am thinking that in the original mac baseline, these lines are not prominent due to difference in Skia SVG line handling and shading.

Review URL: http://codereview.chromium.org/28321

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10728 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 8 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.checksum
index 565c5adc..519b94a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.checksum
@@ -1 +1 @@
-4728e5b3355f8992c880777fb8f303e7
\ No newline at end of file
+807c7284d6dbace0f53330cdc0b357d5
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.png
index 9221fb68..3a9b9a9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.txt
index 6c74c5e..da3c0d9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/dominant-baseline-hanging-expected.txt
@@ -15,14 +15,14 @@ layer at (0,0) size 400x400
       RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0
         RenderSVGGradientStop {stop} at (0,0) size 0x0
         RenderSVGGradientStop {stop} at (0,0) size 0x0
-    RenderPath {rect} at (0,0) size 400x400 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FF72B47F), (1.00,#FF007B)]] [start=(0,0)] [end=(0,1)]}] [data="M0.00,0.00 L400.00,0.00 L400.00,400.00 L0.00,400.00"]
-    RenderSVGContainer {g} at (9,7) size 381x28 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,10.00)}]
-      RenderPath {rect} at (10,10) size 380x25 [opacity=0.50] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M0.00,0.00 L380.00,0.00 L380.00,25.00 L0.00,25.00"]
+    RenderPath {rect} at (0,0) size 400x400 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FF72B47F), (1.00,#FF007B)]] [start=(0,0)] [end=(0,1)]}] [data="M0.00,0.00 L400.00,0.00 L400.00,400.00 L0.00,400.00 Z"]
+    RenderSVGContainer {g} at (9,6) size 381x29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,10.00)}]
+      RenderPath {rect} at (10,10) size 380x25 [opacity=0.50] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M0.00,0.00 L380.00,0.00 L380.00,25.00 L0.00,25.00 Z"]
       RenderSVGContainer {g} at (9,9) size 380.50x25.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-0.50,-0.50)}]
         RenderPath {line} at (9.50,9) size 380x1 [stroke={[type=LINEAR-GRADIENT] [stops=[(0.00,#000000), (1.00,#00000000)]] [start=(0,0)] [end=(1,0)]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L380.00,0.00"]
         RenderPath {line} at (9,9) size 1x25.50 [stroke={[type=LINEAR-GRADIENT] [stops=[(0.00,#000000), (1.00,#00000000)]] [start=(0,0)] [end=(0,1)]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-0.50 L0.00,25.00"]
-      RenderSVGText {text} at (2,13) size 308x22 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-16) size 308x22
+      RenderSVGText {text} at (2,13) size 308x23 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-17) size 308x23
           chunk 1 text run 1 at (2.00,13.60) startOffset 0 endOffset 40 width 308.00: "This is hanging from the top-left corner"
     RenderForeignObject {foreignObject} at (0,0) size 380x136
       RenderBlock {html} at (0,0) size 380x136
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 4780975..8e52fb9 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -330,6 +330,7 @@ LINUX : LayoutTests/svg/custom/deep-dynamic-updates.svg = FAIL CRASH
 LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-33-t.svg = FAIL
 LINUX : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-17-b.svg = FAIL
 LINUX : LayoutTests/svg/custom/gradient-stroke-width.svg = FAIL
+LINUX : LayoutTests/svg/custom/dominant-baseline-hanging.svg = FAIL
 // For these two fast/frames tests it looks like the win baseline had some weird
 // artifacts on the scrollbars on one of the frames, which has now been removed.
 // This artifact does not exist on the mac baseline.
@@ -498,8 +499,6 @@ LINUX WIN : LayoutTests/svg/batik/text/textEffect3.svg = FAIL
 // 2008/12/13 - This was FAIL but is now CRASH on WIN. See issue 6869.
 LINUX WIN : LayoutTests/svg/carto.net/selectionlist.svg = FAIL CRASH
 LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL
-// Flaky on both release and debug.
-LINUX WIN : LayoutTests/svg/custom/dominant-baseline-hanging.svg = FAIL
 LINUX WIN : LayoutTests/svg/custom/focus-ring.svg = FAIL
 LINUX WIN : LayoutTests/svg/custom/image-small-width-height.svg = FAIL
 // Our green is darker and we seem to be a pixel taller.