Fixes a handful of broken tests after the merge that resulted from us

not compiling some new binding classes. Note that I'm removing the
expected output for variable-iteration-test as it was wrong. We're not
passing this one for a different reason (no idea what that is now).

BUG=3010
TEST=covered by tests

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

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

15 files changed, 47 insertions, 18 deletions

diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 0dd9f977..f163ec8 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -368,6 +368,22 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8CSSVariablesDeclaration.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8CSSVariablesDeclaration.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8CSSVariablesRule.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8CSSVariablesRule.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8Document.cpp"
 				>
 			</File>
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum
new file mode 100644
index 0000000..56dec8d
--- /dev/null
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum
@@ -0,0 +1 @@
+d304eb78a06d3eedeba6171a2d09619b
\ No newline at end of file
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.png b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.png
new file mode 100644
index 0000000..f970f98
--- /dev/null
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.png
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt
new file mode 100644
index 0000000..2a5ae5c
--- /dev/null
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt
@@ -0,0 +1,8 @@
+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]
+        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_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum
new file mode 100644
index 0000000..56dec8d
--- /dev/null
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum
@@ -0,0 +1 @@
+d304eb78a06d3eedeba6171a2d09619b
\ No newline at end of file
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.png b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.png
new file mode 100644
index 0000000..f970f98
--- /dev/null
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.png
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.txt
new file mode 100644
index 0000000..2a5ae5c
--- /dev/null
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/set-variable-test-expected.txt
@@ -0,0 +1,8 @@
+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]
+        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_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum
deleted file mode 100644
index 579e08a..0000000
--- a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-806716f1463243f345d6e900684439fd
\ No newline at end of file
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png
deleted file mode 100644
index 57de44e..0000000
--- a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt
deleted file mode 100644
index 1b59395..0000000
--- a/webkit/data/layout_test_results/v8/LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-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=#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/port/DerivedSources.make b/webkit/port/DerivedSources.make
index fb0b99f..6d0f1ab 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -649,6 +649,8 @@ all : \
     V8Console.h \
     V8Counter.h \
     V8CSSStyleDeclaration.h \
+    V8CSSVariablesDeclaration.h \
+    V8CSSVariablesRule.h \
     V8DOMCoreException.h \
     V8DOMImplementation.h \
     V8DOMParser.h \
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index e731b05..71b764a 100644
--- a/webkit/port/bindings/v8/v8_index.cpp
+++ b/webkit/port/bindings/v8/v8_index.cpp
@@ -58,6 +58,8 @@
 #include "V8CSSValue.h"
 #include "V8CSSValueList.h"
 #include "V8CSSStyleSheet.h"
+#include "V8CSSVariablesDeclaration.h"
+#include "V8CSSVariablesRule.h"
 #include "V8Document.h"
 #include "V8DocumentFragment.h"
 #include "V8DocumentType.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index 0df22e9..3e7dd84 100644
--- a/webkit/port/bindings/v8/v8_index.h
+++ b/webkit/port/bindings/v8/v8_index.h
@@ -229,6 +229,8 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
   V(CSSSTYLESHEET, CSSStyleSheet)                                       \
   V(CSSVALUE, CSSValue)                                                 \
   V(CSSVALUELIST, CSSValueList)                                         \
+  V(CSSVARIABLESDECLARATION, CSSVariablesDeclaration)                   \
+  V(CSSVARIABLESRULE, CSSVariablesRule)                                 \
   V(DOMCOREEXCEPTION, DOMCoreException)                                 \
   V(DOMIMPLEMENTATION, DOMImplementation)                               \
   V(DOMPARSER, DOMParser)                                               \
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index ae96b63..a30231a 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -2588,6 +2588,9 @@ v8::Handle<v8::Value> V8Proxy::CSSRuleToV8Object(CSSRule* rule) {
     case CSSRule::PAGE_RULE:
         type = V8ClassIndex::CSSPAGERULE;
         break;
+    case CSSRule::VARIABLES_RULE:
+        type = V8ClassIndex::CSSVARIABLESRULE;
+        break;
     default:  // CSSRule::UNKNOWN_RULE
         type = V8ClassIndex::CSSRULE;
     }
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index e449413..be330f1 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -907,13 +907,10 @@ V8 | KJS # LayoutTests/fast/forms/submit-to-url-fragment.html = FAIL
 V8 | KJS # LayoutTests/fast/images/embed-image.html = FAIL
 V8 | KJS # LayoutTests/fast/images/object-image.html = FAIL
 
-# Displays messages of the form
-# "CONSOLE MESSAGE: line 27: Uncaught TypeError: Cannot ... of undefined".
-# http://code.google.com/p/chromium/issues/detail?id=3010
-V8 | KJS # LayoutTests/fast/css/variables/alternate-syntax/color-hex-test.html = FAIL
-V8 | KJS # LayoutTests/fast/css/variables/alternate-syntax/remove-variable-test.html = FAIL
-V8 | KJS # LayoutTests/fast/css/variables/alternate-syntax/set-variable-test.html = FAIL
-V8 | KJS # LayoutTests/fast/css/variables/color-hex-test.html = FAIL
+# This test is failing because we don't support the CSS selector
+# @-webkit-variables.
+# http://code.google.com/p/chromium/issues/detail?id=3085
+V8 | KJS # LayoutTests/fast/css/variables/alternate-syntax/variable-iteration-test.html = FAIL
 
 # Many of the failures here are because V8 stringifies objects differently than
 # JSC. However, the missing position and totalSize properties seems genuine.