un-revert 36487 (re-committing 36486) and move the missing baselines.

  BUG=none
  TEST=none
  TBR=victorw@chromium.org


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

15 files changed, 106 insertions, 279 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-mac/fast/js/date-toisostring-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/date-toisostring-expected.txt
index ec9b8a4..ec9b8a4 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/fast/js/date-toisostring-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/date-toisostring-expected.txt
diff --git a/webkit/data/layout_tests/platform/chromium-win/fast/js/date-toisostring-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/date-toisostring-expected.txt
index ec9b8a4..ec9b8a4 100644
--- a/webkit/data/layout_tests/platform/chromium-win/fast/js/date-toisostring-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/date-toisostring-expected.txt
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
index e1c5193..c0095e1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
@@ -8,6 +8,9 @@ layer at (0,0) size 480x360
       RenderSVGInlineText {#text} at (0,-16) size 354x20
         chunk 1 (middle anchor) text run 1 at (63.50,35.00) startOffset 0 endOffset 51 width 353.00: "Testing stroke inclusion for 'clip-path' and 'mask'"
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderPath {circle} at (0.02,0.22) size 0.55x0.55 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [data="M0.50,0.50 L0.50,0.51 L0.50,0.53 L0.50,0.54 L0.49,0.55 L0.49,0.56 L0.49,0.57 L0.48,0.59 L0.48,0.60 L0.47,0.61 L0.46,0.62 L0.45,0.63 L0.45,0.64 L0.44,0.65 L0.43,0.65 L0.42,0.66 L0.41,0.67 L0.40,0.68 L0.39,0.68 L0.37,0.69 L0.36,0.69 L0.35,0.69 L0.34,0.70 L0.33,0.70 L0.31,0.70 L0.30,0.70 L0.29,0.70 L0.27,0.70 L0.26,0.70 L0.25,0.69 L0.24,0.69 L0.23,0.69 L0.21,0.68 L0.20,0.68 L0.19,0.67 L0.18,0.66 L0.17,0.65 L0.16,0.65 L0.15,0.64 L0.15,0.63 L0.14,0.62 L0.13,0.61 L0.12,0.60 L0.12,0.59 L0.11,0.57 L0.11,0.56 L0.11,0.55 L0.10,0.54 L0.10,0.53 L0.10,0.51 L0.10,0.50 L0.10,0.49 L0.10,0.47 L0.10,0.46 L0.11,0.45 L0.11,0.44 L0.11,0.43 L0.12,0.41 L0.12,0.40 L0.13,0.39 L0.14,0.38 L0.15,0.37 L0.15,0.36 L0.16,0.35 L0.17,0.35 L0.18,0.34 L0.19,0.33 L0.20,0.32 L0.21,0.32 L0.23,0.31 L0.24,0.31 L0.25,0.31 L0.26,0.30 L0.27,0.30 L0.29,0.30 L0.30,0.30 L0.31,0.30 L0.33,0.30 L0.34,0.30 L0.35,0.31 L0.36,0.31 L0.37,0.31 L0.39,0.32 L0.40,0.32 L0.41,0.33 L0.42,0.34 L0.43,0.35 L0.44,0.35 L0.45,0.36 L0.45,0.37 L0.46,0.38 L0.47,0.39 L0.48,0.40 L0.48,0.41 L0.49,0.43 L0.49,0.44 L0.49,0.45 L0.50,0.46 L0.50,0.47 L0.50,0.49 Z"]
+        RenderPath {circle} at (0.50,0.30) size 0.40x0.40 [data="M0.90,0.50 L0.90,0.51 L0.90,0.53 L0.90,0.54 L0.89,0.55 L0.89,0.56 L0.89,0.57 L0.88,0.59 L0.88,0.60 L0.87,0.61 L0.86,0.62 L0.85,0.63 L0.85,0.64 L0.84,0.65 L0.83,0.65 L0.82,0.66 L0.81,0.67 L0.80,0.68 L0.79,0.68 L0.77,0.69 L0.76,0.69 L0.75,0.69 L0.74,0.70 L0.73,0.70 L0.71,0.70 L0.70,0.70 L0.69,0.70 L0.67,0.70 L0.66,0.70 L0.65,0.69 L0.64,0.69 L0.63,0.69 L0.61,0.68 L0.60,0.68 L0.59,0.67 L0.58,0.66 L0.57,0.65 L0.56,0.65 L0.55,0.64 L0.55,0.63 L0.54,0.62 L0.53,0.61 L0.52,0.60 L0.52,0.59 L0.51,0.57 L0.51,0.56 L0.51,0.55 L0.50,0.54 L0.50,0.53 L0.50,0.51 L0.50,0.50 L0.50,0.49 L0.50,0.47 L0.50,0.46 L0.51,0.45 L0.51,0.44 L0.51,0.43 L0.52,0.41 L0.52,0.40 L0.53,0.39 L0.54,0.38 L0.55,0.37 L0.55,0.36 L0.56,0.35 L0.57,0.35 L0.58,0.34 L0.59,0.33 L0.60,0.32 L0.61,0.32 L0.63,0.31 L0.64,0.31 L0.65,0.31 L0.66,0.30 L0.67,0.30 L0.69,0.30 L0.70,0.30 L0.71,0.30 L0.73,0.30 L0.74,0.30 L0.75,0.31 L0.76,0.31 L0.77,0.31 L0.79,0.32 L0.80,0.32 L0.81,0.33 L0.82,0.34 L0.83,0.35 L0.84,0.35 L0.85,0.36 L0.85,0.37 L0.86,0.38 L0.87,0.39 L0.88,0.40 L0.88,0.41 L0.89,0.43 L0.89,0.44 L0.89,0.45 L0.90,0.46 L0.90,0.47 L0.90,0.49 Z"]
     RenderPath {rect} at (170,60) size 160x80 [fill={[type=SOLID] [color=#00008B]}] [clip path="one"] [data="M150.00,0.00 L350.00,0.00 L350.00,200.00 L150.00,200.00 Z"]
     RenderSVGText {text} at (50,110) size 106x19 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-15) size 106x19
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
index 738f022..a6e5a75 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
@@ -6,6 +6,11 @@ layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0.50,0.50) size 479x359
     RenderSVGContainer {g} at (20,17.50) size 320x269.50
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+          RenderPath {rect} at (200,10) size 60x100 [fill={[type=SOLID] [color=#000000]}] [data="M200.00,10.00 L260.00,10.00 L260.00,110.00 L200.00,110.00 Z"]
+        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+          RenderPath {rect} at (90,150) size 175x100 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,150.00 L265.00,150.00 L265.00,250.00 L90.00,250.00 Z"]
+          RenderPath {rect} at (225,160) size 95x75 [fill={[type=SOLID] [color=#000000]}] [data="M225.00,160.00 L320.00,160.00 L320.00,235.00 L225.00,235.00 Z"]
       RenderPath {rect} at (200,17.50) size 60x65 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FF0000]}] [clip path="clip1"] [data="M20.00,20.00 L460.00,20.00 L460.00,80.00 L20.00,80.00 Z"]
       RenderSVGText {text} at (20,130) size 320x35 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-28) size 320x35
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
index 8af6eb6..38f382f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
@@ -5,6 +5,10 @@ layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (0.50,0.50) size 479x359
     RenderSVGContainer {g} at (20,20) size 420x310
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+          RenderSVGText {text} at (45,270) size 353x122 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-101) size 353x122
+              chunk 1 text run 1 at (45.00,270.00) startOffset 0 endOffset 9 width 353.00: "Clip Test"
       RenderSVGContainer {g} at (30,20) size 410x140
         RenderSVGImage {image} at (30,20) size 410x140
         RenderSVGText {text} at (55,130) size 353x122 contains 1 chunk(s)
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
index ccfc49a..6078183 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
@@ -10,6 +10,10 @@ layer at (0,0) size 480x360
   RenderSVGRoot {svg} at (-0.80,-0.80) size 480.30x360.30
     RenderSVGContainer {g} at (-0.80,-0.80) size 448.80x273.80
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+          RenderPath {rect} at (0,0) size 2x2 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L2.00,0.00 L2.00,2.00 L0.00,2.00 Z"]
+        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+          RenderPath {rect} at (0,0) size 4x4 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L4.00,0.00 L4.00,4.00 L0.00,4.00 Z"]
       RenderSVGText {text} at (125,30) size 183x16 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-13) size 183x16
           chunk 1 text run 1 at (125.00,30.00) startOffset 0 endOffset 27 width 183.00: "Marker Rendering Properties"
diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
deleted file mode 100644
index c0095e1..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-KCanvasResource {id="one" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [bounding box mode=1] [path=M0.50,0.50 L0.50,0.51 L0.50,0.53 L0.50,0.54 L0.49,0.55 L0.49,0.56 L0.49,0.57 L0.48,0.59 L0.48,0.60 L0.47,0.61 L0.46,0.62 L0.45,0.63 L0.45,0.64 L0.44,0.65 L0.43,0.65 L0.42,0.66 L0.41,0.67 L0.40,0.68 L0.39,0.68 L0.37,0.69 L0.36,0.69 L0.35,0.69 L0.34,0.70 L0.33,0.70 L0.31,0.70 L0.30,0.70 L0.29,0.70 L0.27,0.70 L0.26,0.70 L0.25,0.69 L0.24,0.69 L0.23,0.69 L0.21,0.68 L0.20,0.68 L0.19,0.67 L0.18,0.66 L0.17,0.65 L0.16,0.65 L0.15,0.64 L0.15,0.63 L0.14,0.62 L0.13,0.61 L0.12,0.60 L0.12,0.59 L0.11,0.57 L0.11,0.56 L0.11,0.55 L0.10,0.54 L0.10,0.53 L0.10,0.51 L0.10,0.50 L0.10,0.49 L0.10,0.47 L0.10,0.46 L0.11,0.45 L0.11,0.44 L0.11,0.43 L0.12,0.41 L0.12,0.40 L0.13,0.39 L0.14,0.38 L0.15,0.37 L0.15,0.36 L0.16,0.35 L0.17,0.35 L0.18,0.34 L0.19,0.33 L0.20,0.32 L0.21,0.32 L0.23,0.31 L0.24,0.31 L0.25,0.31 L0.26,0.30 L0.27,0.30 L0.29,0.30 L0.30,0.30 L0.31,0.30 L0.33,0.30 L0.34,0.30 L0.35,0.31 L0.36,0.31 L0.37,0.31 L0.39,0.32 L0.40,0.32 L0.41,0.33 L0.42,0.34 L0.43,0.35 L0.44,0.35 L0.45,0.36 L0.45,0.37 L0.46,0.38 L0.47,0.39 L0.48,0.40 L0.48,0.41 L0.49,0.43 L0.49,0.44 L0.49,0.45 L0.50,0.46 L0.50,0.47 L0.50,0.49 Z], [winding=NON-ZERO] [bounding box mode=1] [path=M0.90,0.50 L0.90,0.51 L0.90,0.53 L0.90,0.54 L0.89,0.55 L0.89,0.56 L0.89,0.57 L0.88,0.59 L0.88,0.60 L0.87,0.61 L0.86,0.62 L0.85,0.63 L0.85,0.64 L0.84,0.65 L0.83,0.65 L0.82,0.66 L0.81,0.67 L0.80,0.68 L0.79,0.68 L0.77,0.69 L0.76,0.69 L0.75,0.69 L0.74,0.70 L0.73,0.70 L0.71,0.70 L0.70,0.70 L0.69,0.70 L0.67,0.70 L0.66,0.70 L0.65,0.69 L0.64,0.69 L0.63,0.69 L0.61,0.68 L0.60,0.68 L0.59,0.67 L0.58,0.66 L0.57,0.65 L0.56,0.65 L0.55,0.64 L0.55,0.63 L0.54,0.62 L0.53,0.61 L0.52,0.60 L0.52,0.59 L0.51,0.57 L0.51,0.56 L0.51,0.55 L0.50,0.54 L0.50,0.53 L0.50,0.51 L0.50,0.50 L0.50,0.49 L0.50,0.47 L0.50,0.46 L0.51,0.45 L0.51,0.44 L0.51,0.43 L0.52,0.41 L0.52,0.40 L0.53,0.39 L0.54,0.38 L0.55,0.37 L0.55,0.36 L0.56,0.35 L0.57,0.35 L0.58,0.34 L0.59,0.33 L0.60,0.32 L0.61,0.32 L0.63,0.31 L0.64,0.31 L0.65,0.31 L0.66,0.30 L0.67,0.30 L0.69,0.30 L0.70,0.30 L0.71,0.30 L0.73,0.30 L0.74,0.30 L0.75,0.31 L0.76,0.31 L0.77,0.31 L0.79,0.32 L0.80,0.32 L0.81,0.33 L0.82,0.34 L0.83,0.35 L0.84,0.35 L0.85,0.36 L0.85,0.37 L0.86,0.38 L0.87,0.39 L0.88,0.40 L0.88,0.41 L0.89,0.43 L0.89,0.44 L0.89,0.45 L0.90,0.46 L0.90,0.47 L0.90,0.49 Z]]]}
-KCanvasResource {id="two" [type=MASKER]}
-layer at (0,0) size 480x360
-  RenderView at (0,0) size 480x360
-layer at (0,0) size 480x360
-  RenderSVGRoot {svg} at (0.50,0.50) size 479x359
-    RenderSVGText {text} at (63,35) size 354x20 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-16) size 354x20
-        chunk 1 (middle anchor) text run 1 at (63.50,35.00) startOffset 0 endOffset 51 width 353.00: "Testing stroke inclusion for 'clip-path' and 'mask'"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
-        RenderPath {circle} at (0.02,0.22) size 0.55x0.55 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [data="M0.50,0.50 L0.50,0.51 L0.50,0.53 L0.50,0.54 L0.49,0.55 L0.49,0.56 L0.49,0.57 L0.48,0.59 L0.48,0.60 L0.47,0.61 L0.46,0.62 L0.45,0.63 L0.45,0.64 L0.44,0.65 L0.43,0.65 L0.42,0.66 L0.41,0.67 L0.40,0.68 L0.39,0.68 L0.37,0.69 L0.36,0.69 L0.35,0.69 L0.34,0.70 L0.33,0.70 L0.31,0.70 L0.30,0.70 L0.29,0.70 L0.27,0.70 L0.26,0.70 L0.25,0.69 L0.24,0.69 L0.23,0.69 L0.21,0.68 L0.20,0.68 L0.19,0.67 L0.18,0.66 L0.17,0.65 L0.16,0.65 L0.15,0.64 L0.15,0.63 L0.14,0.62 L0.13,0.61 L0.12,0.60 L0.12,0.59 L0.11,0.57 L0.11,0.56 L0.11,0.55 L0.10,0.54 L0.10,0.53 L0.10,0.51 L0.10,0.50 L0.10,0.49 L0.10,0.47 L0.10,0.46 L0.11,0.45 L0.11,0.44 L0.11,0.43 L0.12,0.41 L0.12,0.40 L0.13,0.39 L0.14,0.38 L0.15,0.37 L0.15,0.36 L0.16,0.35 L0.17,0.35 L0.18,0.34 L0.19,0.33 L0.20,0.32 L0.21,0.32 L0.23,0.31 L0.24,0.31 L0.25,0.31 L0.26,0.30 L0.27,0.30 L0.29,0.30 L0.30,0.30 L0.31,0.30 L0.33,0.30 L0.34,0.30 L0.35,0.31 L0.36,0.31 L0.37,0.31 L0.39,0.32 L0.40,0.32 L0.41,0.33 L0.42,0.34 L0.43,0.35 L0.44,0.35 L0.45,0.36 L0.45,0.37 L0.46,0.38 L0.47,0.39 L0.48,0.40 L0.48,0.41 L0.49,0.43 L0.49,0.44 L0.49,0.45 L0.50,0.46 L0.50,0.47 L0.50,0.49 Z"]
-        RenderPath {circle} at (0.50,0.30) size 0.40x0.40 [data="M0.90,0.50 L0.90,0.51 L0.90,0.53 L0.90,0.54 L0.89,0.55 L0.89,0.56 L0.89,0.57 L0.88,0.59 L0.88,0.60 L0.87,0.61 L0.86,0.62 L0.85,0.63 L0.85,0.64 L0.84,0.65 L0.83,0.65 L0.82,0.66 L0.81,0.67 L0.80,0.68 L0.79,0.68 L0.77,0.69 L0.76,0.69 L0.75,0.69 L0.74,0.70 L0.73,0.70 L0.71,0.70 L0.70,0.70 L0.69,0.70 L0.67,0.70 L0.66,0.70 L0.65,0.69 L0.64,0.69 L0.63,0.69 L0.61,0.68 L0.60,0.68 L0.59,0.67 L0.58,0.66 L0.57,0.65 L0.56,0.65 L0.55,0.64 L0.55,0.63 L0.54,0.62 L0.53,0.61 L0.52,0.60 L0.52,0.59 L0.51,0.57 L0.51,0.56 L0.51,0.55 L0.50,0.54 L0.50,0.53 L0.50,0.51 L0.50,0.50 L0.50,0.49 L0.50,0.47 L0.50,0.46 L0.51,0.45 L0.51,0.44 L0.51,0.43 L0.52,0.41 L0.52,0.40 L0.53,0.39 L0.54,0.38 L0.55,0.37 L0.55,0.36 L0.56,0.35 L0.57,0.35 L0.58,0.34 L0.59,0.33 L0.60,0.32 L0.61,0.32 L0.63,0.31 L0.64,0.31 L0.65,0.31 L0.66,0.30 L0.67,0.30 L0.69,0.30 L0.70,0.30 L0.71,0.30 L0.73,0.30 L0.74,0.30 L0.75,0.31 L0.76,0.31 L0.77,0.31 L0.79,0.32 L0.80,0.32 L0.81,0.33 L0.82,0.34 L0.83,0.35 L0.84,0.35 L0.85,0.36 L0.85,0.37 L0.86,0.38 L0.87,0.39 L0.88,0.40 L0.88,0.41 L0.89,0.43 L0.89,0.44 L0.89,0.45 L0.90,0.46 L0.90,0.47 L0.90,0.49 Z"]
-    RenderPath {rect} at (170,60) size 160x80 [fill={[type=SOLID] [color=#00008B]}] [clip path="one"] [data="M150.00,0.00 L350.00,0.00 L350.00,200.00 L150.00,200.00 Z"]
-    RenderSVGText {text} at (50,110) size 106x19 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-15) size 106x19
-        chunk 1 text run 1 at (50.00,110.00) startOffset 0 endOffset 19 width 106.00: "With a 'clip-path':"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGContainer {mask} at (0.02,0.22) size 0.88x0.55
-        RenderPath {circle} at (0.02,0.22) size 0.55x0.55 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M0.50,0.50 L0.50,0.51 L0.50,0.53 L0.50,0.54 L0.49,0.55 L0.49,0.56 L0.49,0.57 L0.48,0.59 L0.48,0.60 L0.47,0.61 L0.46,0.62 L0.45,0.63 L0.45,0.64 L0.44,0.65 L0.43,0.65 L0.42,0.66 L0.41,0.67 L0.40,0.68 L0.39,0.68 L0.37,0.69 L0.36,0.69 L0.35,0.69 L0.34,0.70 L0.33,0.70 L0.31,0.70 L0.30,0.70 L0.29,0.70 L0.27,0.70 L0.26,0.70 L0.25,0.69 L0.24,0.69 L0.23,0.69 L0.21,0.68 L0.20,0.68 L0.19,0.67 L0.18,0.66 L0.17,0.65 L0.16,0.65 L0.15,0.64 L0.15,0.63 L0.14,0.62 L0.13,0.61 L0.12,0.60 L0.12,0.59 L0.11,0.57 L0.11,0.56 L0.11,0.55 L0.10,0.54 L0.10,0.53 L0.10,0.51 L0.10,0.50 L0.10,0.49 L0.10,0.47 L0.10,0.46 L0.11,0.45 L0.11,0.44 L0.11,0.43 L0.12,0.41 L0.12,0.40 L0.13,0.39 L0.14,0.38 L0.15,0.37 L0.15,0.36 L0.16,0.35 L0.17,0.35 L0.18,0.34 L0.19,0.33 L0.20,0.32 L0.21,0.32 L0.23,0.31 L0.24,0.31 L0.25,0.31 L0.26,0.30 L0.27,0.30 L0.29,0.30 L0.30,0.30 L0.31,0.30 L0.33,0.30 L0.34,0.30 L0.35,0.31 L0.36,0.31 L0.37,0.31 L0.39,0.32 L0.40,0.32 L0.41,0.33 L0.42,0.34 L0.43,0.35 L0.44,0.35 L0.45,0.36 L0.45,0.37 L0.46,0.38 L0.47,0.39 L0.48,0.40 L0.48,0.41 L0.49,0.43 L0.49,0.44 L0.49,0.45 L0.50,0.46 L0.50,0.47 L0.50,0.49 Z"]
-        RenderPath {circle} at (0.50,0.30) size 0.40x0.40 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.90,0.50 L0.90,0.51 L0.90,0.53 L0.90,0.54 L0.89,0.55 L0.89,0.56 L0.89,0.57 L0.88,0.59 L0.88,0.60 L0.87,0.61 L0.86,0.62 L0.85,0.63 L0.85,0.64 L0.84,0.65 L0.83,0.65 L0.82,0.66 L0.81,0.67 L0.80,0.68 L0.79,0.68 L0.77,0.69 L0.76,0.69 L0.75,0.69 L0.74,0.70 L0.73,0.70 L0.71,0.70 L0.70,0.70 L0.69,0.70 L0.67,0.70 L0.66,0.70 L0.65,0.69 L0.64,0.69 L0.63,0.69 L0.61,0.68 L0.60,0.68 L0.59,0.67 L0.58,0.66 L0.57,0.65 L0.56,0.65 L0.55,0.64 L0.55,0.63 L0.54,0.62 L0.53,0.61 L0.52,0.60 L0.52,0.59 L0.51,0.57 L0.51,0.56 L0.51,0.55 L0.50,0.54 L0.50,0.53 L0.50,0.51 L0.50,0.50 L0.50,0.49 L0.50,0.47 L0.50,0.46 L0.51,0.45 L0.51,0.44 L0.51,0.43 L0.52,0.41 L0.52,0.40 L0.53,0.39 L0.54,0.38 L0.55,0.37 L0.55,0.36 L0.56,0.35 L0.57,0.35 L0.58,0.34 L0.59,0.33 L0.60,0.32 L0.61,0.32 L0.63,0.31 L0.64,0.31 L0.65,0.31 L0.66,0.30 L0.67,0.30 L0.69,0.30 L0.70,0.30 L0.71,0.30 L0.73,0.30 L0.74,0.30 L0.75,0.31 L0.76,0.31 L0.77,0.31 L0.79,0.32 L0.80,0.32 L0.81,0.33 L0.82,0.34 L0.83,0.35 L0.84,0.35 L0.85,0.36 L0.85,0.37 L0.86,0.38 L0.87,0.39 L0.88,0.40 L0.88,0.41 L0.89,0.43 L0.89,0.44 L0.89,0.45 L0.90,0.46 L0.90,0.47 L0.90,0.49 Z"]
-    RenderPath {rect} at (150,150) size 200x200 [fill={[type=SOLID] [color=#00008B]}] [data="M150.00,150.00 L350.00,150.00 L350.00,350.00 L150.00,350.00 Z"]
-    RenderSVGText {text} at (50,260) size 85x19 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-15) size 85x19
-        chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 14 width 85.00: "With a 'mask':"
-    RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-36) size 261x46
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.7 $"
-    RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 Z"]
diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
deleted file mode 100644
index a6e5a75..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-01-b-expected.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-KCanvasResource {id="clip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M200.00,10.00 L260.00,10.00 L260.00,110.00 L200.00,110.00 Z]]]}
-KCanvasResource {id="clip2" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M90.00,150.00 L265.00,150.00 L265.00,250.00 L90.00,250.00 Z], [winding=NON-ZERO] [path=M225.00,160.00 L320.00,160.00 L320.00,235.00 L225.00,235.00 Z]]]}
-layer at (0,0) size 480x360
-  RenderView at (0,0) size 480x360
-layer at (0,0) size 480x360
-  RenderSVGRoot {svg} at (0.50,0.50) size 479x359
-    RenderSVGContainer {g} at (20,17.50) size 320x269.50
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
-          RenderPath {rect} at (200,10) size 60x100 [fill={[type=SOLID] [color=#000000]}] [data="M200.00,10.00 L260.00,10.00 L260.00,110.00 L200.00,110.00 Z"]
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
-          RenderPath {rect} at (90,150) size 175x100 [fill={[type=SOLID] [color=#000000]}] [data="M90.00,150.00 L265.00,150.00 L265.00,250.00 L90.00,250.00 Z"]
-          RenderPath {rect} at (225,160) size 95x75 [fill={[type=SOLID] [color=#000000]}] [data="M225.00,160.00 L320.00,160.00 L320.00,235.00 L225.00,235.00 Z"]
-      RenderPath {rect} at (200,17.50) size 60x65 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FF0000]}] [clip path="clip1"] [data="M20.00,20.00 L460.00,20.00 L460.00,80.00 L20.00,80.00 Z"]
-      RenderSVGText {text} at (20,130) size 320x35 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 320x35
-          chunk 1 text run 1 at (20.00,130.00) startOffset 0 endOffset 23 width 320.00: "Rectangle being clipped"
-      RenderSVGContainer {g} at (112.50,152) size 207.50x98 [clip path="clip2"]
-        RenderPath {rect} at (112.50,187.50) size 230x45 [stroke={[type=SOLID] [color=#0000FF] [stroke width=5.00]}] [fill={[type=SOLID] [color=#00FFFF]}] [data="M115.00,190.00 L340.00,190.00 L340.00,230.00 L115.00,230.00 Z"]
-        RenderPath {rect} at (112.50,237.50) size 230x45 [stroke={[type=SOLID] [color=#008000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#00FF00]}] [data="M115.00,240.00 L340.00,240.00 L340.00,280.00 L115.00,280.00 Z"]
-        RenderSVGText {text} at (115,180) size 320x35 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-28) size 320x35
-            chunk 1 text run 1 at (115.00,180.00) startOffset 0 endOffset 26 width 320.00: "Line of text to be clipped"
-      RenderSVGText {text} at (20,280) size 269x35 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 269x35
-          chunk 1 text run 1 at (20.00,280.00) startOffset 0 endOffset 19 width 269.00: "Group being clipped"
-      RenderSVGContainer {g} at (89,149) size 232x102
-        RenderPath {rect} at (89,149) size 177x102 [stroke={[type=SOLID] [color=#999999] [stroke width=2.00]}] [data="M90.00,150.00 L265.00,150.00 L265.00,250.00 L90.00,250.00 Z"]
-        RenderPath {rect} at (224,159) size 97x77 [stroke={[type=SOLID] [color=#999999] [stroke width=2.00]}] [data="M225.00,160.00 L320.00,160.00 L320.00,235.00 L225.00,235.00 Z"]
-    RenderSVGText {text} at (10,340) size 281x46 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-36) size 281x46
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 17 width 281.00: "$Revision: 1.10 $"
-    RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 Z"]
diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
deleted file mode 100644
index 38f382f..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/masking-path-04-b-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-KCanvasResource {id="sample" [type=CLIPPER] [clip data=[[winding=EVEN-ODD] [path=M0.00,0.00 L0.00,0.00 L0.00,0.00 L0.00,0.00 Z]]]}
-layer at (0,0) size 480x360
-  RenderView at (0,0) size 480x360
-layer at (0,0) size 480x360
-  RenderSVGRoot {svg} at (0.50,0.50) size 479x359
-    RenderSVGContainer {g} at (20,20) size 420x310
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
-          RenderSVGText {text} at (45,270) size 353x122 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-101) size 353x122
-              chunk 1 text run 1 at (45.00,270.00) startOffset 0 endOffset 9 width 353.00: "Clip Test"
-      RenderSVGContainer {g} at (30,20) size 410x140
-        RenderSVGImage {image} at (30,20) size 410x140
-        RenderSVGText {text} at (55,130) size 353x122 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-101) size 353x122
-            chunk 1 text run 1 at (55.00,130.00) startOffset 0 endOffset 9 width 353.00: "Clip Test"
-      RenderSVGContainer {g} at (20,170) size 410x160
-        RenderSVGImage {image} at (20,170) size 410x160 [clip path="sample"]
-    RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-36) size 261x46
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.8 $"
-    RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 Z"]
diff --git a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt b/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
deleted file mode 100644
index 6078183..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-KCanvasResource {id="overflowHiddenClip1" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L2.00,0.00 L2.00,2.00 L0.00,2.00 Z]]]}
-KCanvasResource {id="overflowHiddenClip" [type=CLIPPER] [clip data=[[winding=NON-ZERO] [path=M0.00,0.00 L4.00,0.00 L4.00,4.00 L0.00,4.00 Z]]]}
-KCanvasResource {id="marker1" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]}
-KCanvasResource {id="marker2" [type=MARKER] [angle=0.00] [ref x=10.00 y=10.00]}
-KCanvasResource {id="marker3" [type=MARKER] [angle=0.00] [ref x=10.00 y=10.00]}
-KCanvasResource {id="marker4" [type=MARKER] [angle=0.00] [ref x=5.00 y=5.00]}
-layer at (0,0) size 480x360
-  RenderView at (0,0) size 480x360
-layer at (0,0) size 480x360
-  RenderSVGRoot {svg} at (-0.80,-0.80) size 480.30x360.30
-    RenderSVGContainer {g} at (-0.80,-0.80) size 448.80x273.80
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
-          RenderPath {rect} at (0,0) size 2x2 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L2.00,0.00 L2.00,2.00 L0.00,2.00 Z"]
-        RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
-          RenderPath {rect} at (0,0) size 4x4 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L4.00,0.00 L4.00,4.00 L0.00,4.00 Z"]
-      RenderSVGText {text} at (125,30) size 183x16 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 183x16
-          chunk 1 text run 1 at (125.00,30.00) startOffset 0 endOffset 27 width 183.00: "Marker Rendering Properties"
-      RenderSVGContainer {g} at (0,0) size 208x143
-        RenderSVGViewportContainer {marker} at (0,0) size 2x2
-          RenderPath {rect} at (0,0) size 2x2 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
-        RenderSVGText {text} at (100,140) size 57x13 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-10) size 57x13
-            chunk 1 text run 1 at (100.00,140.00) startOffset 0 endOffset 13 width 57.00: "Fill Property"
-        RenderPath {path} at (22,52) size 66x66 [fill={[type=SOLID] [color=#000000]}] [start marker=marker1] [middle marker=marker1] [end marker=marker1] [data="M30.00,60.00 L80.00,60.00 L80.00,110.00 Z"]
-        RenderSVGContainer {g} at (142,52) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
-          RenderPath {path} at (150,60) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M30.00,60.00 L80.00,60.00 L80.00,110.00 Z"]
-          RenderSVGContainer {g} at (142,52) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(22.00,52.00)}]
-            RenderSVGContainer {g} at (142,52) size 16x16 [clip path="overflowHiddenClip1"]
-              RenderSVGContainer {g} at (142,52) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                RenderPath {rect} at (142,52) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
-          RenderSVGContainer {g} at (192,52) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(72.00,52.00)}]
-            RenderSVGContainer {g} at (192,52) size 16x16 [clip path="overflowHiddenClip1"]
-              RenderSVGContainer {g} at (192,52) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                RenderPath {rect} at (192,52) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
-          RenderSVGContainer {g} at (192,102) size 16x16 [transform={m=((8.00,0.00)(0.00,8.00)) t=(72.00,102.00)}]
-            RenderSVGContainer {g} at (192,102) size 16x16 [clip path="overflowHiddenClip1"]
-              RenderSVGContainer {g} at (192,102) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                RenderPath {rect} at (192,102) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
-      RenderSVGContainer {g} at (-0.40,-0.40) size 448.40x143.40
-        RenderSVGViewportContainer {marker} at (-0.40,-0.40) size 4.80x4.80
-          RenderPath {rect} at (-0.40,-0.40) size 4.80x4.80 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
-        RenderSVGText {text} at (340,140) size 71x13 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-10) size 71x13
-            chunk 1 text run 1 at (340.00,140.00) startOffset 0 endOffset 15 width 71.00: "Stroke Property"
-        RenderPath {path} at (260.40,50.40) size 69.20x69.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [start marker=marker2] [middle marker=marker2] [end marker=marker2] [data="M270.00,60.00 L320.00,60.00 L320.00,110.00 Z"]
-        RenderSVGContainer {g} at (382,52) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
-          RenderPath {path} at (385.17,58) size 56.83x56.83 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M270.00,60.00 L320.00,60.00 L320.00,110.00 Z"]
-          RenderSVGContainer {g} at (382,52) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(262.00,52.00)}]
-            RenderSVGContainer {g} at (382,52) size 16x16 [clip path="overflowHiddenClip"]
-              RenderSVGContainer {g} at (380.40,50.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                RenderPath {rect} at (380.40,50.40) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
-          RenderSVGContainer {g} at (432,52) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,52.00)}]
-            RenderSVGContainer {g} at (432,52) size 16x16 [clip path="overflowHiddenClip"]
-              RenderSVGContainer {g} at (430.40,50.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                RenderPath {rect} at (430.40,50.40) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
-          RenderSVGContainer {g} at (432,102) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,102.00)}]
-            RenderSVGContainer {g} at (432,102) size 16x16 [clip path="overflowHiddenClip"]
-              RenderSVGContainer {g} at (430.40,100.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                RenderPath {rect} at (430.40,100.40) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
-      RenderSVGContainer {g} at (-0.80,-0.80) size 5.60x5.60
-        RenderSVGViewportContainer {marker} at (-0.80,-0.80) size 5.60x5.60
-          RenderPath {rect} at (-0.80,-0.80) size 5.60x5.60 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
-        RenderSVGViewportContainer {marker} at (-0.80,-0.80) size 5.60x5.60
-          RenderPath {rect} at (-0.80,-0.80) size 5.60x5.60 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
-      RenderSVGContainer {g} at (18.80,178.80) size 189.20x94.20
-        RenderSVGText {text} at (90,270) size 79x13 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-10) size 79x13
-            chunk 1 text run 1 at (90.00,270.00) startOffset 0 endOffset 16 width 79.00: "Mixed Properties"
-        RenderPath {path} at (18.80,178.80) size 72.40x72.40 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [start marker=marker3] [middle marker=marker3] [end marker=marker3] [data="M30.00,190.00 L80.00,190.00 L80.00,240.00 Z"]
-        RenderSVGContainer {g} at (142,182) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
-          RenderPath {path} at (145.17,188) size 56.83x56.83 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M30.00,190.00 L80.00,190.00 L80.00,240.00 Z"]
-          RenderSVGContainer {g} at (142,182) size 66x66
-            RenderSVGContainer {g} at (142,182) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(22.00,182.00)}]
-              RenderSVGContainer {g} at (142,182) size 16x16 [clip path="overflowHiddenClip"]
-                RenderSVGContainer {g} at (138.80,178.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  RenderPath {rect} at (138.80,178.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
-            RenderSVGContainer {g} at (192,182) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(72.00,182.00)}]
-              RenderSVGContainer {g} at (192,182) size 16x16 [clip path="overflowHiddenClip"]
-                RenderSVGContainer {g} at (188.80,178.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  RenderPath {rect} at (188.80,178.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
-            RenderSVGContainer {g} at (192,232) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(72.00,232.00)}]
-              RenderSVGContainer {g} at (192,232) size 16x16 [clip path="overflowHiddenClip"]
-                RenderSVGContainer {g} at (188.80,228.80) size 22.40x22.40 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
-                  RenderPath {rect} at (188.80,228.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L20.00,0.00 L20.00,20.00 L0.00,20.00 Z"]
-      RenderSVGContainer {g} at (258.80,178.80) size 189.20x94.20
-        RenderSVGText {text} at (340,270) size 79x13 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-10) size 79x13
-            chunk 1 text run 1 at (340.00,270.00) startOffset 0 endOffset 16 width 79.00: "Mixed Properties"
-        RenderPath {path} at (258.80,178.80) size 72.40x72.40 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [start marker=marker4] [middle marker=marker4] [end marker=marker4] [data="M270.00,190.00 L320.00,190.00 L320.00,240.00 Z"]
-        RenderSVGContainer {g} at (382,182) size 66x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(120.00,0.00)}]
-          RenderPath {path} at (385.17,188) size 56.83x56.83 [stroke={[type=SOLID] [color=#800080] [stroke width=4.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M270.00,190.00 L320.00,190.00 L320.00,240.00 Z"]
-          RenderSVGContainer {g} at (382,182) size 66x66
-            RenderSVGContainer {g} at (382,182) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(262.00,182.00)}]
-              RenderSVGContainer {g} at (382,182) size 16x16 [clip path="overflowHiddenClip"]
-                RenderSVGContainer {g} at (378.80,178.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
-                  RenderPath {rect} at (378.80,178.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
-            RenderSVGContainer {g} at (432,182) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,182.00)}]
-              RenderSVGContainer {g} at (432,182) size 16x16 [clip path="overflowHiddenClip"]
-                RenderSVGContainer {g} at (428.80,178.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
-                  RenderPath {rect} at (428.80,178.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
-            RenderSVGContainer {g} at (432,232) size 16x16 [transform={m=((4.00,0.00)(0.00,4.00)) t=(312.00,232.00)}]
-              RenderSVGContainer {g} at (432,232) size 16x16 [clip path="overflowHiddenClip"]
-                RenderSVGContainer {g} at (428.80,228.80) size 22.40x22.40 [transform={m=((0.40,0.00)(0.00,0.40)) t=(0.00,0.00)}]
-                  RenderPath {rect} at (428.80,228.80) size 22.40x22.40 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L10.00,0.00 L10.00,10.00 L0.00,10.00 Z"]
-    RenderSVGText {text} at (10,340) size 261x46 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-36) size 261x46
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.8 $"
-    RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 Z"]
diff --git a/webkit/tools/layout_tests/layout_package/path_utils.py b/webkit/tools/layout_tests/layout_package/path_utils.py
index b10a54d..ce4bf75 100644
--- a/webkit/tools/layout_tests/layout_package/path_utils.py
+++ b/webkit/tools/layout_tests/layout_package/path_utils.py
@@ -23,7 +23,7 @@ import platform_utils_linux
 # Cache some values so we don't have to recalculate them. _basedir is
 # used by PathFromBase() and caches the full (native) path to the top
 # of the source tree (/src). _baseline_search_path is used by
-# ExpectedBaseline() and caches the list of native paths to search
+# ExpectedBaselines() and caches the list of native paths to search
 # for baseline results.
 _basedir = None
 _baseline_search_path = None
@@ -38,10 +38,22 @@ def LayoutTestsDir():
 def ChromiumBaselinePath(platform=None):
   """Returns the full path to the directory containing expected
   baseline results from chromium ports. If |platform| is None, the
-  currently executing platform is used."""
-  if platform is None:
-    platform = platform_utils.PlatformName()
-  return PathFromBase('webkit', 'data', 'layout_tests', 'platform', platform)
+  currently executing platform is used.
+
+  Note: although directly referencing individual platform_utils_* files is
+  usually discouraged, we allow it here so that the rebaselining tool can
+  pull baselines for platforms other than the host platform."""
+
+  # Normalize the platform string.
+  platform = PlatformName(platform)
+  if platform.startswith('chromium-mac'):
+    return platform_utils_mac.BaselinePath(platform)
+  elif platform.startswith('chromium-win'):
+    return platform_utils_win.BaselinePath(platform)
+  elif platform.startswith('chromium-linux'):
+    return platform_utils_linux.BaselinePath(platform)
+
+  return platform_utils.BaselinePath()
 
 def WebKitBaselinePath(platform):
   """Returns the full path to the directory containing expected
@@ -53,28 +65,24 @@ def BaselineSearchPath(platform=None):
   """Returns the list of directories to search for baselines/results for a
   given platform, in order of preference. Paths are relative to the top of the
   source tree. If parameter platform is None, returns the list for the current
-  platform that the script is running on."""
-  if platform is None:
-    return platform_utils.BaselineSearchPath(False)
-  elif platform.startswith('mac'):
-    return platform_utils_mac.BaselineSearchPath(True)
-  elif platform.startswith('win'):
-    return platform_utils_win.BaselineSearchPath(True)
-  elif platform.startswith('linux'):
-    return platform_utils_linux.BaselineSearchPath(True)
-  else:
-    return platform_utils.BaselineSearchPath(False)
+  platform that the script is running on.
 
-def ExpectedBaseline(filename, suffix, platform=None, all_baselines=False):
-  """Given a test name, finds where the baseline result is located. The
-  result is returned as a pair of values, the absolute path to top of the test
-  results directory, and the relative path from there to the results file.
+  Note: although directly referencing individual platform_utils_* files is
+  usually discouraged, we allow it here so that the rebaselining tool can
+  pull baselines for platforms other than the host platform."""
 
-  Both return values will be in the format appropriate for the
-  current platform (e.g., "\\" for path separators on Windows).
+  # Normalize the platform name.
+  platform = PlatformName(platform)
+  if platform.startswith('chromium-mac'):
+    return platform_utils_mac.BaselineSearchPath(platform)
+  elif platform.startswith('chromium-win'):
+    return platform_utils_win.BaselineSearchPath(platform)
+  elif platform.startswith('chromium-linux'):
+    return platform_utils_linux.BaselineSearchPath(platform)
+  return platform_utils.BaselineSearchPath()
 
-  If the results file is not found, then None will be returned for the
-  directory, but the expected relative pathname will still be returned.
+def ExpectedBaselines(filename, suffix, platform=None, all_baselines=False):
+  """Given a test name, finds where the baseline results are located.
 
   Args:
      filename: absolute filename to test file
@@ -91,6 +99,10 @@ def ExpectedBaseline(filename, suffix, platform=None, all_baselines=False):
        results_filename - relative path from top of tree to the results file
          (os.path.join of the two gives you the full path to the file, unless
           None was returned.)
+    Return values will be in the format appropriate for the current platform
+    (e.g., "\\" for path separators on Windows). If the results file is not
+    found, then None will be returned for the directory, but the expected
+    relative pathname will still be returned.
   """
   global _baseline_search_path
   global _search_path_platform
@@ -102,21 +114,13 @@ def ExpectedBaseline(filename, suffix, platform=None, all_baselines=False):
     _baseline_search_path = BaselineSearchPath(platform)
     _search_path_platform = platform
 
-  current_platform_dir = ChromiumBaselinePath(PlatformName(platform))
-
   baselines = []
-  foundCurrentPlatform = False
   for platform_dir in _baseline_search_path:
-    # Find current platform from baseline search paths and start from there.
-    if platform_dir == current_platform_dir:
-      foundCurrentPlatform = True
-
-    if foundCurrentPlatform:
-      if os.path.exists(os.path.join(platform_dir, baseline_filename)):
-        baselines.append((platform_dir, baseline_filename))
+    if os.path.exists(os.path.join(platform_dir, baseline_filename)):
+      baselines.append((platform_dir, baseline_filename))
 
-      if not all_baselines and baselines:
-        return baselines
+    if not all_baselines and baselines:
+      return baselines
 
   # If it wasn't found in a platform directory, return the expected result
   # in the test directory, even if no such file actually exists.
@@ -145,7 +149,7 @@ def ExpectedFilename(filename, suffix):
          search list of directories, e.g., 'chromium-win', or
          'chromium-mac-leopard' (we follow the WebKit format)
   """
-  platform_dir, baseline_filename = ExpectedBaseline(filename, suffix)[0]
+  platform_dir, baseline_filename = ExpectedBaselines(filename, suffix)[0]
   if platform_dir:
     return os.path.join(platform_dir, baseline_filename)
   return os.path.join(LayoutTestsDir(), baseline_filename)
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
index a153547..d14ca00 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
@@ -12,6 +12,7 @@ import sys
 import logging
 
 import path_utils
+import platform_utils_win
 
 def PlatformName():
   """Returns the name of the platform we're currently running on."""
@@ -31,16 +32,20 @@ def GetNumCores():
     return num_cores
   return 1
 
-def BaselineSearchPath(all_versions=False):
+def BaselinePath(platform=None):
+  """Returns the path relative to the top of the source tree for the
+  baselines for the specified platform version. If |platform| is None,
+  then the version currently in use is used."""
+  if platform is None:
+    platform = PlatformName()
+  return path_utils.PathFromBase('webkit', 'data', 'layout_tests',
+                                 'platform', platform, 'LayoutTests')
+
+def BaselineSearchPath(platform=None):
   """Returns the list of directories to search for baselines/results, in
   order of preference. Paths are relative to the top of the source tree."""
-  # TODO(dpranke): remove the 'LayoutTests' dirs once we move the baselines.
-  return [path_utils.ChromiumBaselinePath(PlatformName()),
-          os.path.join(path_utils.ChromiumBaselinePath(PlatformName()),
-                       "LayoutTests"),
-          path_utils.ChromiumBaselinePath('chromium-win'),
-          os.path.join(path_utils.ChromiumBaselinePath('chromium-win'),
-                       "LayoutTests"),
+  return [BaselinePath(platform),
+          platform_utils_win.BaselinePath('chromium-win'),
           path_utils.WebKitBaselinePath('win'),
           path_utils.WebKitBaselinePath('mac')]
 
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py
index bb78c89..11d434e 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py
@@ -41,15 +41,21 @@ def GetNumCores():
   this will be double the number of actual processors."""
   return int(os.popen2("sysctl -n hw.ncpu")[1].read())
 
+def BaselinePath(platform=None):
+  """Returns the path relative to the top of the source tree for the
+  baselines for the specified platform version. If |platform| is None,
+  then the version currently in use is used."""
+  if platform is None:
+    platform = PlatformName()
+  return path_utils.PathFromBase('webkit', 'data', 'layout_tests',
+                                 'platform', platform, 'LayoutTests')
+
 # TODO: We should add leopard and snowleopard to the list of paths to check
 # once we start running the tests from snowleopard.
-def BaselineSearchPath(all_versions=False):
+def BaselineSearchPath(platform=None):
   """Returns the list of directories to search for baselines/results, in
   order of preference. Paths are relative to the top of the source tree."""
-  # TODO(dpranke): remove the 'LayoutTests' dirs once we move the baselines.
-  return [path_utils.ChromiumBaselinePath(PlatformName()),
-          os.path.join(path_utils.ChromiumBaselinePath(PlatformName()),
-                       "LayoutTests"),
+  return [BaselinePath(platform),
           path_utils.WebKitBaselinePath('mac' + PlatformVersion()),
           path_utils.WebKitBaselinePath('mac')]
 
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_win.py b/webkit/tools/layout_tests/layout_package/platform_utils_win.py
index 947327e..63a8908 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_win.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_win.py
@@ -34,37 +34,27 @@ def GetNumCores():
   this will be double the number of actual processors."""
   return int(os.environ.get('NUMBER_OF_PROCESSORS', 1))
 
-def BaselineSearchPath(all_versions=False):
+def BaselinePath(platform=None):
+  """Returns the path relative to the top of the source tree for the
+  baselines for the specified platform version. If |platform| is None,
+  then the version currently in use is used."""
+  if platform is None:
+    platform = PlatformName()
+  return path_utils.PathFromBase('webkit', 'data', 'layout_tests',
+                                 'platform', platform, 'LayoutTests')
+
+def BaselineSearchPath(platform=None):
   """Returns the list of directories to search for baselines/results, in
-  order of preference. Paths are relative to the top of the source tree.
-
-  If all_versions is True, returns the full list of search directories
-  for all versions instead of the current version that the script
-  is running on. This is for case that the platform or version of
-  the search paths is different from the platform or version that the
-  script is running on. For example, the rebaseline tool may run on Mac,
-  Linux or Windows Vista to rebaseline for Windows XP, in which case,
-  it gets a full list, finds the rebaselining dir (XP) and compares
-  the XP baseline with fallback baselines.
-  """
-
+  order of preference. Paths are relative to the top of the source tree."""
   dirs = []
-  # TODO(dpranke): remove the 'LayoutTests' dirs once we move the baselines.
-  if all_versions or PlatformVersion() == "-xp":
-    dirs.append(path_utils.ChromiumBaselinePath('chromium-win-xp'))
-    dirs.append(os.path.join(
-        path_utils.ChromiumBaselinePath('chromium-win-xp'), 'LayoutTests'))
-  if all_versions or PlatformVersion() in ("-vista", "-xp"):
-    dirs.append(path_utils.ChromiumBaselinePath('chromium-win-vista'))
-    dirs.append(os.path.join(
-        path_utils.ChromiumBaselinePath('chromium-win-vista'), 'LayoutTests'))
-  if all_versions or PlatformVersion() in ("-7", "-vista", "-xp"):
-    dirs.append(path_utils.ChromiumBaselinePath('chromium-win-7'))
-    dirs.append(os.path.join(
-        path_utils.ChromiumBaselinePath('chromium-win-7'), 'LayoutTests'))
-  dirs.append(path_utils.ChromiumBaselinePath('chromium-win'))
-  dirs.append(os.path.join(
-        path_utils.ChromiumBaselinePath('chromium-win'), 'LayoutTests'))
+  if platform is None:
+    platform = PlatformName()
+
+  if platform == 'chromium-win-xp':
+    dirs.append(BaselinePath(platform))
+  if platform in ('chromium-win-xp', 'chromium-win-vista'):
+    dirs.append(BaselinePath('chromium-win-vista'))
+  dirs.append(BaselinePath('chromium-win'))
   dirs.append(path_utils.WebKitBaselinePath('win'))
   dirs.append(path_utils.WebKitBaselinePath('mac'))
   return dirs
diff --git a/webkit/tools/layout_tests/rebaseline.py b/webkit/tools/layout_tests/rebaseline.py
index c64358d..81104fc 100644
--- a/webkit/tools/layout_tests/rebaseline.py
+++ b/webkit/tools/layout_tests/rebaseline.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!usr/bin/env python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -394,7 +394,7 @@ class Rebaseliner(object):
 
         expected_filename = '%s-expected%s' % (test_basename, suffix)
         expected_fullpath = os.path.join(
-            path_utils.ChromiumBaselinePath(platform), "LayoutTests", expected_filename)
+            path_utils.ChromiumBaselinePath(platform), expected_filename)
         expected_fullpath = os.path.normpath(expected_fullpath)
         logging.debug('  Expected file full path: "%s"', expected_fullpath)
 
@@ -455,10 +455,10 @@ class Rebaseliner(object):
       False otherwise.
     """
     test_filepath = os.path.join(path_utils.LayoutTestsDir(), test)
-    all_baselines = path_utils.ExpectedBaseline(test_filepath,
-                                                suffix,
-                                                platform,
-                                                True)
+    all_baselines = path_utils.ExpectedBaselines(test_filepath,
+                                                 suffix,
+                                                 platform,
+                                                 True)
     for (fallback_dir, fallback_file) in all_baselines:
       if fallback_dir and fallback_file:
         fallback_fullpath = os.path.normpath(