Rebaseline some tests that were changed upstream.

These baselines are wrong, but correspond to http://trac.webkit.org/changeset/36855, where CSS variable support was turned off upstream.

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

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

52 files changed, 58 insertions, 74 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.checksum
index d3efba8..63edfbf 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.checksum
@@ -1 +1 @@
-49e99bb8e03d7b731fed66c2b3f1fc66
\ No newline at end of file
+d6daeed42cdb0b85a5d8dc786e37c50f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.png
index 6980bd2..a82ccfa 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.txt
index e9206d0..99a7f10 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/block-cycle-test-expected.txt
@@ -7,4 +7,4 @@ layer at (0,0) size 800x136
         RenderText {#text} at (0,0) size 452x19
           text run at (0,0) width 234: "You should see a green square below. "
           text run at (234,0) width 218: "There should be no red on the page."
-      RenderBlock {DIV} at (0,20) size 100x100 [bgcolor=#008000]
+      RenderBlock {DIV} at (0,20) size 100x100 [bgcolor=#FF0000]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/color-hex-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/color-hex-test-expected.txt
new file mode 100755
index 0000000..83da327
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/color-hex-test-expected.txt
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: line 27: Uncaught TypeError: Cannot call method 'getVariableValue' of undefined

+FAILED

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.checksum
index cb7a3e7..54b7155 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.checksum
@@ -1 +1 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
+c579a6187df2a657d2084895b272d13a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.png
index 179a8be..721738a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.txt
index 341a083..9e44a2a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/colors-test-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36
-    RenderBody {BODY} at (8,8) size 784x20 [color=#008000] [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (8,8) size 784x20 [bgcolor=#FF0000]
       RenderText {#text} at (0,0) size 485x19
         text run at (0,0) width 300: "This text should be green on a white background. "
         text run at (300,0) width 185: "There should be no red visible."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.checksum
index 52b0b83..cc81cb9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.checksum
@@ -1 +1 @@
-69c1956795285390af425c9518e9d240
\ No newline at end of file
+b00bf663877af49e22d29b4afca97ab5
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.png
index d19643d..a3603c7 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.txt
index 6546cc3..4bcae8a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/declaration-block-test-expected.txt
@@ -7,9 +7,5 @@ layer at (0,0) size 800x36
         text run at (0,0) width 297: "You should see a 5em wide green square below. "
         text run at (297,0) width 222: "There should be no red on the page. "
       RenderText {#text} at (0,0) size 0x0
-layer at (8,28) size 160x240
+layer at (8,28) size 160x160
   RenderBlock (positioned) {DIV} at (8,28) size 160x160
-layer at (40,108) size 80x80
-  RenderBlock (positioned) {DIV} at (32,80) size 80x80 [bgcolor=#FF0000]
-layer at (40,108) size 80x80
-  RenderBlock (relative positioned) {DIV} at (32,80) size 80x80 [bgcolor=#008000]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.checksum
index a8e3a9e..3e6a5a6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.checksum
@@ -1 +1 @@
-5373ee50083a104a2c725b862d08b4b0
\ No newline at end of file
+c377eccda22646efcda8b5ebf3e6f11f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.png
index f8e838e..1f458ec 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.txt
index 8d119a4..52db8d9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/font-test-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x104
-  RenderBlock {HTML} at (0,0) size 800x104
-    RenderBody {BODY} at (8,16) size 784x80
+layer at (0,0) size 800x100
+  RenderBlock {HTML} at (0,0) size 800x100
+    RenderBody {BODY} at (8,16) size 784x76
       RenderBlock {P} at (0,0) size 784x40
         RenderText {#text} at (0,0) size 760x39
           text run at (0,0) width 760: "You should see a green rectangle below. If you see individual \"X\" glyphs, the test has failed. (The Ahem font is required for this"
           text run at (0,20) width 30: "test.)"
-      RenderBlock {DIV} at (0,56) size 784x24 [color=#008000]
-        RenderText {#text} at (0,0) size 240x24
-          text run at (0,0) width 240: "XXXXXXXXXX"
+      RenderBlock {DIV} at (0,56) size 784x20 [color=#008000]
+        RenderText {#text} at (0,0) size 110x19
+          text run at (0,0) width 110: "XXXXXXXXXX"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.checksum
index 9e9dbea..4831c78 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.checksum
@@ -1 +1 @@
-22cc407b6d4c4822c38cf865227bdc8a
\ No newline at end of file
+558d4604d0b1ad684d4521b758eb4e65
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.png
index 5835e25..70092e8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.txt
index 0053d93..953257d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/image-test-expected.txt
@@ -9,14 +9,14 @@ layer at (0,0) size 800x120
           text run at (347,0) width 264: "If you see circular bullets, the test has failed."
       RenderBlock {UL} at (0,36) size 784x60
         RenderListItem {LI} at (40,0) size 744x20
-          RenderListMarker at (-19,6) size 12x9
+          RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 26x19
             text run at (0,0) width 26: "One"
         RenderListItem {LI} at (40,20) size 744x20
-          RenderListMarker at (-19,6) size 12x9
+          RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 28x19
             text run at (0,0) width 28: "Two"
         RenderListItem {LI} at (40,40) size 744x20
-          RenderListMarker at (-19,6) size 12x9
+          RenderListMarker at (-18,0) size 7x19: bullet
           RenderText {#text} at (0,0) size 35x19
             text run at (0,0) width 35: "Three"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.checksum
index cb7a3e7..26d4d12 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.checksum
@@ -1 +1 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
+0196dac35de8e0dbb51d5f19f18b931f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.png
index 179a8be..516168e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.txt
index be60cf6..6f7f665 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/import-test-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36 [color=#FF0000]
-    RenderBody {BODY} at (8,8) size 784x20 [color=#008000] [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (8,8) size 784x20
       RenderText {#text} at (0,0) size 485x19
         text run at (0,0) width 300: "This text should be green on a white background. "
         text run at (300,0) width 185: "There should be no red visible."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.checksum
index cb7a3e7..54b7155 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.checksum
@@ -1 +1 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
+c579a6187df2a657d2084895b272d13a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.png
index 179a8be..721738a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.txt
index d30d0e0..0ed89c8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/inline-style-test-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36
-    RenderBody {BODY} at (8,8) size 784x20 [color=#008000] [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (8,8) size 784x20 [bgcolor=#FF0000]
       RenderText {#text} at (0,0) size 485x19
         text run at (0,0) width 300: "This text should be green on a white background. "
         text run at (300,0) width 185: "There should be no red visible."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-identifier-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-identifier-expected.txt
new file mode 100755
index 0000000..19c1944
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-identifier-expected.txt
@@ -0,0 +1 @@
+This test passes if it does not crash.

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.checksum
index cb7a3e7..3f9b131 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.checksum
@@ -1 +1 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
+98a627fa5477aa2247e3b5a26b88ab42
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.png
index 179a8be..d89f49e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.txt
index 341a083..ae9de54 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/invalid-variable-test-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36
-    RenderBody {BODY} at (8,8) size 784x20 [color=#008000] [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (8,8) size 784x20 [color=#008000] [bgcolor=#FF0000]
       RenderText {#text} at (0,0) size 485x19
         text run at (0,0) width 300: "This text should be green on a white background. "
         text run at (300,0) width 185: "There should be no red visible."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.checksum
index 52b0b83..11feeee 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.checksum
@@ -1 +1 @@
-69c1956795285390af425c9518e9d240
\ No newline at end of file
+901387318dc33250b10e809691d5308b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.png
index d19643d..d974c77 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.txt
index 6546cc3..8104534 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/margin-test-expected.txt
@@ -7,9 +7,9 @@ layer at (0,0) size 800x36
         text run at (0,0) width 297: "You should see a 5em wide green square below. "
         text run at (297,0) width 222: "There should be no red on the page. "
       RenderText {#text} at (0,0) size 0x0
-layer at (8,28) size 160x240
+layer at (8,28) size 160x160
   RenderBlock (positioned) {DIV} at (8,28) size 160x160
 layer at (40,108) size 80x80
   RenderBlock (positioned) {DIV} at (32,80) size 80x80 [bgcolor=#FF0000]
-layer at (40,108) size 80x80
-  RenderBlock (relative positioned) {DIV} at (32,80) size 80x80 [bgcolor=#008000]
+layer at (8,28) size 80x80
+  RenderBlock (relative positioned) {DIV} at (0,0) size 80x80 [bgcolor=#008000]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.checksum
index cb7a3e7..0f95169 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.checksum
@@ -1 +1 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
+42e3c38cd7454dab52c249dcd1ee938e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.png
index 179a8be..d2e1fd0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.txt
index 341a083..cd5663c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/misplaced-import-test-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36
-    RenderBody {BODY} at (8,8) size 784x20 [color=#008000] [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (8,8) size 784x20
       RenderText {#text} at (0,0) size 485x19
         text run at (0,0) width 300: "This text should be green on a white background. "
         text run at (300,0) width 185: "There should be no red visible."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.checksum
index 945a308..68be5eb 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.checksum
@@ -1 +1 @@
-d4f7c9205a90ae06529f39fd7ebdfcb0
\ No newline at end of file
+d2e78636f86601e5a72d4398ede93c8e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.png
index 19692ce..02cb230 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.txt
index a076804..b41ca63 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/multiple-term-test-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x56
-  RenderBlock {HTML} at (0,0) size 800x56
-    RenderBody {BODY} at (8,8) size 784x40
-      RenderBlock {DIV} at (0,0) size 784x40 [border: (10px solid #008000)]
-        RenderText {#text} at (10,10) size 593x19
-          text run at (10,10) width 290: "This div should have a 10px solid green border. "
-          text run at (300,10) width 303: "If this div has a red border, then the test has failed."
+layer at (0,0) size 800x76
+  RenderBlock {HTML} at (0,0) size 800x76
+    RenderBody {BODY} at (8,8) size 784x60
+      RenderBlock {DIV} at (0,0) size 784x60 [border: (20px solid #FF0000)]
+        RenderText {#text} at (20,20) size 593x19
+          text run at (20,20) width 290: "This div should have a 10px solid green border. "
+          text run at (310,20) width 303: "If this div has a red border, then the test has failed."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.checksum
index cb7a3e7..0f95169 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.checksum
@@ -1 +1 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
+42e3c38cd7454dab52c249dcd1ee938e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.png
index 179a8be..d2e1fd0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.txt
index 341a083..cd5663c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/override-test-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36
-    RenderBody {BODY} at (8,8) size 784x20 [color=#008000] [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (8,8) size 784x20
       RenderText {#text} at (0,0) size 485x19
         text run at (0,0) width 300: "This text should be green on a white background. "
         text run at (300,0) width 185: "There should be no red visible."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.checksum
index cb7a3e7..0f95169 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.checksum
@@ -1 +1 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
+42e3c38cd7454dab52c249dcd1ee938e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.png
index 179a8be..d2e1fd0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.txt
index 341a083..cd5663c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/print-test-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36
-    RenderBody {BODY} at (8,8) size 784x20 [color=#008000] [bgcolor=#FFFFFF]
+    RenderBody {BODY} at (8,8) size 784x20
       RenderText {#text} at (0,0) size 485x19
         text run at (0,0) width 300: "This text should be green on a white background. "
         text run at (300,0) width 185: "There should be no red visible."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/remove-variable-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/remove-variable-test-expected.txt
index 2a5ae5c..fd569e3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/remove-variable-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/remove-variable-test-expected.txt
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: line 20: Uncaught TypeError: Cannot call method 'removeVariable' of undefined
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.checksum
index 56dec8d..5f11c5c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.checksum
@@ -1 +1 @@
-d304eb78a06d3eedeba6171a2d09619b
\ No newline at end of file
+f90432be72f857f8ced1d20e88d81fdf
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.png
index f970f98..92fc8e1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.txt
index 2a5ae5c..6ba17425 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/set-variable-test-expected.txt
@@ -1,8 +1,9 @@
+CONSOLE MESSAGE: line 19: Uncaught TypeError: Cannot call method 'setVariable' of undefined
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36
     RenderBody {BODY} at (8,8) size 784x20
-      RenderBlock {DIV} at (0,0) size 784x20 [color=#008000]
+      RenderBlock {DIV} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 154x19
           text run at (0,0) width 154: "This text should be green."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.checksum
index d9bca73..4e96866 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.checksum
@@ -1 +1 @@
-1659bc2dc6e6e5a355b86b8622672ac2
\ No newline at end of file
+f59fbbac8ca69c78d1978da8fb6653f1
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.png
index 2a31cce..2200e8b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.txt
index a36f19f..b109432 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/shorthand-test-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x56
-  RenderBlock {HTML} at (0,0) size 800x56
-    RenderBody {BODY} at (8,8) size 784x40
-      RenderBlock {DIV} at (0,0) size 784x40 [border: (10px solid #008000)]
-        RenderText {#text} at (10,10) size 296x19
-          text run at (10,10) width 296: "This block hould have a 10px solid green border."
+layer at (0,0) size 800x76
+  RenderBlock {HTML} at (0,0) size 800x76
+    RenderBody {BODY} at (8,8) size 784x60
+      RenderBlock {DIV} at (0,0) size 784x60 [border: (20px dotted #FF0000)]
+        RenderText {#text} at (20,20) size 296x19
+          text run at (20,20) width 296: "This block hould have a 10px solid green border."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.checksum
index f7d4b25..579e08a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.checksum
@@ -1 +1 @@
-36203e562397716f44230cea05b760c9
\ No newline at end of file
+806716f1463243f345d6e900684439fd
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.png
index 408fdcc..57de44e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.txt
index af06fcf..1b59395 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/variables/variable-iteration-test-expected.txt
@@ -1,9 +1,10 @@
+CONSOLE MESSAGE: line 23: Uncaught TypeError: Cannot read property 'length' of undefined
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x36
   RenderBlock {HTML} at (0,0) size 800x36
     RenderBody {BODY} at (8,8) size 784x20
-      RenderBlock {DIV} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF]
+      RenderBlock {DIV} at (0,0) size 784x20 [color=#FF0000] [bgcolor=#FF0000]
         RenderText {#text} at (0,0) size 343x19
           text run at (0,0) width 158: "This text should be green. "
           text run at (158,0) width 185: "There should be no red visible."
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index f69e807..9930068 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1066,24 +1066,6 @@ SKIP LayoutTests/fast/table/table-display-types-strict.html = FAIL
 SKIP LayoutTests/fast/table/table-display-types.html = FAIL
 
 // CHANGED OR REBASELINED IN WEBKIT 36102:37604
-LINUX WIN : LayoutTests/fast/css/variables/block-cycle-test.html = FAIL
-LayoutTests/fast/css/variables/color-hex-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/colors-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/declaration-block-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/font-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/image-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/import-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/inline-style-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/invalid-variable-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/margin-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/misplaced-import-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/multiple-term-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/override-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/print-test.html = FAIL
-LayoutTests/fast/css/variables/remove-variable-test.html = FAIL
-LayoutTests/fast/css/variables/set-variable-test.html = FAIL
-LINUX WIN : LayoutTests/fast/css/variables/shorthand-test.html = FAIL
-LayoutTests/fast/css/variables/variable-iteration-test.html = FAIL
 LINUX WIN : LayoutTests/fast/forms/8250.html = FAIL
 LayoutTests/fast/forms/input-disabled-color.html = FAIL
 LayoutTests/fast/forms/selection-functions.html = FAIL