[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ap at apple.com
ap at apple.com
Wed Dec 22 15:55:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit de217eb5f2a604cb9aadba79fec6e5a454e1116c
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 18:25:46 2010 +0000
Reviewed by Dave Hyatt.
https://bugs.webkit.org/show_bug.cgi?id=49483
Remove CSS Variable support
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72116 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8263355..a23df35 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,321 @@
+2010-11-16 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by Dave Hyatt.
+
+ https://bugs.webkit.org/show_bug.cgi?id=49483
+ Remove CSS Variable support
+
+ * fast/css/variables: Removed.
+ * fast/css/variables/block-cycle-test.html: Removed.
+ * fast/css/variables/color-hex-test-expected.txt: Removed.
+ * fast/css/variables/color-hex-test.html: Removed.
+ * fast/css/variables/colors-test.html: Removed.
+ * fast/css/variables/declaration-block-test.html: Removed.
+ * fast/css/variables/font-test.html: Removed.
+ * fast/css/variables/image-test.html: Removed.
+ * fast/css/variables/import-test.html: Removed.
+ * fast/css/variables/inline-style-test.html: Removed.
+ * fast/css/variables/invalid-identifier-expected.txt: Removed.
+ * fast/css/variables/invalid-identifier.html: Removed.
+ * fast/css/variables/invalid-variable-test.html: Removed.
+ * fast/css/variables/margin-test.html: Removed.
+ * fast/css/variables/misplaced-import-test.html: Removed.
+ * fast/css/variables/misplaced-variables-test.html: Removed.
+ * fast/css/variables/multiple-blocks-test.html: Removed.
+ * fast/css/variables/multiple-term-test.html: Removed.
+ * fast/css/variables/override-test.html: Removed.
+ * fast/css/variables/print-test.html: Removed.
+ * fast/css/variables/remove-variable-test.html: Removed.
+ * fast/css/variables/resources: Removed.
+ * fast/css/variables/resources/bad.css: Removed.
+ * fast/css/variables/resources/good.css: Removed.
+ * fast/css/variables/resources/listmark.gif: Removed.
+ * fast/css/variables/set-variable-test.html: Removed.
+ * fast/css/variables/shorthand-test.html: Removed.
+ * fast/css/variables/variable-iteration-test.html: Removed.
+ * fast/dom/Window/window-properties-expected.txt:
+ * fast/dom/Window/window-property-descriptors-expected.txt:
+ * fast/dom/prototype-inheritance-2-expected.txt:
+ * fast/dom/prototype-inheritance-expected.txt:
+ * fast/js/global-constructors-expected.txt:
+ * platform/chromium-mac/fast/css/variables: Removed.
+ * platform/chromium-mac/fast/css/variables/color-hex-test-expected.txt: Removed.
+ * platform/chromium-mac/fast/css/variables/remove-variable-test-expected.txt: Removed.
+ * platform/chromium-mac/fast/css/variables/set-variable-test-expected.txt: Removed.
+ * platform/chromium-mac/fast/css/variables/variable-iteration-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/block-cycle-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/block-cycle-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/block-cycle-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/color-hex-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/colors-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/colors-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/colors-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/declaration-block-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/declaration-block-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/declaration-block-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/font-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/font-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/font-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/image-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/image-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/image-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/import-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/import-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/import-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/inline-style-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/inline-style-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/inline-style-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/invalid-variable-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/invalid-variable-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/invalid-variable-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/margin-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/margin-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/margin-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/misplaced-import-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/misplaced-import-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/misplaced-import-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/multiple-term-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/multiple-term-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/multiple-term-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/override-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/override-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/override-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/print-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/print-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/print-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/remove-variable-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/remove-variable-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/remove-variable-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/set-variable-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/set-variable-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/set-variable-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/shorthand-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/shorthand-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/shorthand-test-expected.txt: Removed.
+ * platform/chromium-win/fast/css/variables/variable-iteration-test-expected.checksum: Removed.
+ * platform/chromium-win/fast/css/variables/variable-iteration-test-expected.png: Removed.
+ * platform/chromium-win/fast/css/variables/variable-iteration-test-expected.txt: Removed.
+ * platform/gtk/Skipped:
+ * platform/mac-leopard/fast/css/variables: Removed.
+ * platform/mac-leopard/fast/css/variables/block-cycle-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/block-cycle-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/colors-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/colors-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/declaration-block-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/declaration-block-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/font-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/font-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/image-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/image-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/import-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/import-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/inline-style-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/inline-style-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/margin-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/margin-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/multiple-term-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/multiple-term-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/override-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/override-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/print-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/print-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/remove-variable-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/remove-variable-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/set-variable-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/set-variable-test-expected.png: Removed.
+ * platform/mac-leopard/fast/css/variables/shorthand-test-expected.checksum: Removed.
+ * platform/mac-leopard/fast/css/variables/shorthand-test-expected.png: Removed.
+ * platform/mac/fast/css/variables: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/font-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/font-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/font-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/image-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/image-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/image-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/import-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/import-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/import-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/override-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/override-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/override-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/print-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/print-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/print-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/block-cycle-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/block-cycle-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/block-cycle-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/colors-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/colors-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/colors-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/declaration-block-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/declaration-block-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/declaration-block-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/font-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/font-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/font-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/image-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/image-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/image-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/import-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/import-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/import-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/inline-style-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/inline-style-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/inline-style-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/invalid-variable-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/invalid-variable-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/invalid-variable-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/margin-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/margin-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/margin-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/misplaced-import-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/misplaced-import-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/misplaced-import-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/misplaced-variables-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/misplaced-variables-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/misplaced-variables-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/multiple-blocks-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/multiple-blocks-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/multiple-blocks-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/multiple-term-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/multiple-term-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/multiple-term-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/override-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/override-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/override-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/print-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/print-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/print-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/remove-variable-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/remove-variable-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/remove-variable-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/set-variable-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/set-variable-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/set-variable-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/shorthand-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/shorthand-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/shorthand-test-expected.txt: Removed.
+ * platform/mac/fast/css/variables/variable-iteration-test-expected.checksum: Removed.
+ * platform/mac/fast/css/variables/variable-iteration-test-expected.png: Removed.
+ * platform/mac/fast/css/variables/variable-iteration-test-expected.txt: Removed.
+ * platform/qt/Skipped:
+
2010-11-16 Mihai Parparita <mihaip at chromium.org>
Unreviewed Chromium expectations update.
diff --git a/LayoutTests/fast/css/variables/block-cycle-test.html b/LayoutTests/fast/css/variables/block-cycle-test.html
deleted file mode 100644
index 317fef7..0000000
--- a/LayoutTests/fast/css/variables/block-cycle-test.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- one {
- background-color: red;
- -webkit-var(two);
- };
- two {
- -webkit-var(one);
- background-color:green
- }
-}
-
-div {
- background-color: red;
- width:100px;
- height:100px;
- -webkit-var(one);
-}
-</style>
-</head>
-<body>
-You should see a green square below. There should be no red on the page.
-
-<div></div>
diff --git a/LayoutTests/fast/css/variables/color-hex-test-expected.txt b/LayoutTests/fast/css/variables/color-hex-test-expected.txt
deleted file mode 100644
index d58e962..0000000
--- a/LayoutTests/fast/css/variables/color-hex-test-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: line 27: TypeError: 'undefined' is not an object (evaluating 'declaration.getVariableValue')
-FAILED
diff --git a/LayoutTests/fast/css/variables/color-hex-test.html b/LayoutTests/fast/css/variables/color-hex-test.html
deleted file mode 100644
index 9eb9419..0000000
--- a/LayoutTests/fast/css/variables/color-hex-test.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foreground: #008000;
- background: #FFF;
-}
-
-body {
- color: -webkit-var(foreground);
- background-color: red;
- background-color: -webkit-var(background);
-}
-</style>
-</head>
-<body id="body">
-<div id="div">FAILED</div>
-<script type="text/javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
- var elem = document.getElementById("body");
- var style = document.defaultView.getComputedStyle(elem, null);
- var color = style.getPropertyValue("color");
- var bgcolor = style.getPropertyValue("background-color");
- var declaration = document.styleSheets[0].rules[0].variables;
- var foregroundValue = declaration.getVariableValue("foreground");
- var backgroundValue = declaration.getVariableValue("background");
-
- if (color == "rgb(0, 128, 0)" && bgcolor == "rgb(255, 255, 255)"
- && foregroundValue == color && backgroundValue == bgcolor) {
- var elem = document.getElementById("div");
- elem.innerHTML = "PASSED";
- }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/variables/colors-test.html b/LayoutTests/fast/css/variables/colors-test.html
deleted file mode 100644
index d6839de..0000000
--- a/LayoutTests/fast/css/variables/colors-test.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foreground: green;
- background: rgb(255, 255, 255);
-}
-
-body {
- color: -webkit-var(foreground);
- background-color: red;
- background-color: -webkit-var(background);
-}
-</style>
-</head>
-<body>
-This text should be green on a white background. There should be no red visible.
diff --git a/LayoutTests/fast/css/variables/declaration-block-test.html b/LayoutTests/fast/css/variables/declaration-block-test.html
deleted file mode 100644
index ac00e88..0000000
--- a/LayoutTests/fast/css/variables/declaration-block-test.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- verticalMargin: 5em;
- fiveEmSquare {
- height: 5em;
- width: 5em
- };
- tenEmSquare {
- height: 10em;
- width: 10em
- };
-}
-
-div.outer {
- position:absolute;
- -webkit-var(tenEmSquare);
-}
-
-div.bad {
- position:absolute;
- top:5em;
- left:2em;
- -webkit-var(fiveEmSquare);
- background-color:red;
-}
-
-div.inner {
- position:relative;
- margin: -webkit-var(verticalMargin) 2em;
- -webkit-var(fiveEmSquare);
- background-color:green;
-}
-</style>
-</head>
-<body>
-You should see a 5em wide green square below. There should be no red on the page.
-
-<div class="outer">
-<div class="bad"></div>
-<div class="inner"></div>
-</div>
diff --git a/LayoutTests/fast/css/variables/font-test.html b/LayoutTests/fast/css/variables/font-test.html
deleted file mode 100644
index 434fcdc..0000000
--- a/LayoutTests/fast/css/variables/font-test.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- familyName: "Ahem";
-}
-
-div {
- color: green;
- font: 24px -webkit-var(familyName);
-}
-</style>
-</head>
-<body>
-<p>You should see a green rectangle below. If you see individual "X" glyphs, the test has failed. (The Ahem font is required for this test.)</p>
-<div>XXXXXXXXXX</div>
-
-
diff --git a/LayoutTests/fast/css/variables/image-test.html b/LayoutTests/fast/css/variables/image-test.html
deleted file mode 100644
index b1f26e7..0000000
--- a/LayoutTests/fast/css/variables/image-test.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- marker: url(resources/listmark.gif);
-}
-
-li {
- list-style-type: disc;
- list-style-image: -webkit-var(marker)
-}
-</style>
-</head>
-<body>
-The list below should use red diamond images for bullets. If you see circular bullets, the test has failed.
-
-<ul>
-<li>One
-<li>Two
-<li>Three
-</ul>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/variables/import-test.html b/LayoutTests/fast/css/variables/import-test.html
deleted file mode 100644
index 4bd4384..0000000
--- a/LayoutTests/fast/css/variables/import-test.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html style="color:red">
-<head>
-<style>
- at import url(resources/good.css);
-
-body {
- color: -webkit-var(foreground);
- background-color: -webkit-var(background);
-}
-</style>
-</head>
-<body>
-This text should be green on a white background. There should be no red visible.
diff --git a/LayoutTests/fast/css/variables/inline-style-test.html b/LayoutTests/fast/css/variables/inline-style-test.html
deleted file mode 100644
index 3fcf64e..0000000
--- a/LayoutTests/fast/css/variables/inline-style-test.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foreground: green;
- background: rgb(255, 255, 255);
-}
-
-body {
- background-color: red;
-}
-</style>
-</head>
-<body style="color: -webkit-var(foreground); background-color: -webkit-var(background);">
-This text should be green on a white background. There should be no red visible.
-</body>
-</html>
-
diff --git a/LayoutTests/fast/css/variables/invalid-identifier-expected.txt b/LayoutTests/fast/css/variables/invalid-identifier-expected.txt
deleted file mode 100644
index 654ddf7..0000000
--- a/LayoutTests/fast/css/variables/invalid-identifier-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This test passes if it does not crash.
diff --git a/LayoutTests/fast/css/variables/invalid-identifier.html b/LayoutTests/fast/css/variables/invalid-identifier.html
deleted file mode 100644
index 353ba6f..0000000
--- a/LayoutTests/fast/css/variables/invalid-identifier.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
-</script>
-<style>
-body {
- unicode-range: searchfield-cancel-buttonpt=-webkit-dashboard-region=
-}
-</style>
-<body>
- <span>This test passes if it does not crash.</span>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/variables/invalid-variable-test.html b/LayoutTests/fast/css/variables/invalid-variable-test.html
deleted file mode 100644
index 8696953..0000000
--- a/LayoutTests/fast/css/variables/invalid-variable-test.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foreground; red;
- background: rgb(255, 255, 255);
-}
-
-body {
- color: green;
- color: -webkit-var(foreground);
- background-color: red;
- background-color: -webkit-var(background);
-}
-</style>
-</head>
-<body>
-This text should be green on a white background. There should be no red visible.
diff --git a/LayoutTests/fast/css/variables/margin-test.html b/LayoutTests/fast/css/variables/margin-test.html
deleted file mode 100644
index e39a4d3..0000000
--- a/LayoutTests/fast/css/variables/margin-test.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- verticalMargin: 5em;
-}
-
-div.outer {
- height:10em;
- width:10em;
- position:absolute;
-}
-
-div.bad {
- position:absolute;
- top:5em;
- left:2em;
- height:5em;
- width:5em;
- background-color:red;
-}
-
-div.inner {
- position:relative;
- margin: -webkit-var(verticalMargin) 2em;
- height:5em;
- width:5em;
- background-color:green;
-}
-</style>
-</head>
-<body>
-You should see a 5em wide green square below. There should be no red on the page.
-
-<div class="outer">
-<div class="bad"></div>
-<div class="inner"></div>
-</div>
diff --git a/LayoutTests/fast/css/variables/misplaced-import-test.html b/LayoutTests/fast/css/variables/misplaced-import-test.html
deleted file mode 100644
index 83bd068..0000000
--- a/LayoutTests/fast/css/variables/misplaced-import-test.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foreground: green;
- background: rgb(255, 255, 255);
-}
-
- at import url(resources/bad.css);
-
-body {
- color: -webkit-var(foreground);
- background-color: -webkit-var(background);
-}
-</style>
-</head>
-<body>
-This text should be green on a white background. There should be no red visible.
diff --git a/LayoutTests/fast/css/variables/misplaced-variables-test.html b/LayoutTests/fast/css/variables/misplaced-variables-test.html
deleted file mode 100644
index 630dec7..0000000
--- a/LayoutTests/fast/css/variables/misplaced-variables-test.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
-body {
- color: -webkit-var(foreground);
- background-color: white;
- background-color: -webkit-var(background);
-}
-
- at -webkit-variables {
- foreground: red;
- background: red;
-}
-
-body {
- color: green;
-}
-</style>
-</head>
-<body>
-This text should be green on a white background.
diff --git a/LayoutTests/fast/css/variables/multiple-blocks-test.html b/LayoutTests/fast/css/variables/multiple-blocks-test.html
deleted file mode 100644
index c7ef2e0..0000000
--- a/LayoutTests/fast/css/variables/multiple-blocks-test.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- one {
- position:absolute;
- width:100px;
- height:100px
- };
- two {
- background-color: green
- }
-}
-
-.variables {
- -webkit-var(one);
- -webkit-var(two)
-}
-</style>
-</head>
-<body>
-You should see a green square below. There should be no red on the page.
-
-<div style="position:relative">
-<div style="position:absolute; width:100px;height:100px;background-color:red"></div>
-<div class="variables"></div>
-</div>
diff --git a/LayoutTests/fast/css/variables/multiple-term-test.html b/LayoutTests/fast/css/variables/multiple-term-test.html
deleted file mode 100644
index b966d8f..0000000
--- a/LayoutTests/fast/css/variables/multiple-term-test.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- completeBorder: 10px solid green;
-}
-
-div {
- border: 20px solid red;
- border: -webkit-var(completeBorder);
-}
-</style>
-</head>
-<body>
-<div>This div should have a 10px solid green border. If this div has a red border, then the test has failed.</div>
\ No newline at end of file
diff --git a/LayoutTests/fast/css/variables/override-test.html b/LayoutTests/fast/css/variables/override-test.html
deleted file mode 100644
index 855e198..0000000
--- a/LayoutTests/fast/css/variables/override-test.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foreground: green;
- background: red;
-}
-
- at -webkit-variables {
- background: white;
-}
-
-body {
- color: -webkit-var(foreground);
- background-color: -webkit-var(background);
-}
-</style>
-</head>
-<body>
-This text should be green on a white background. There should be no red visible.
diff --git a/LayoutTests/fast/css/variables/print-test.html b/LayoutTests/fast/css/variables/print-test.html
deleted file mode 100644
index 759a604..0000000
--- a/LayoutTests/fast/css/variables/print-test.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foreground: green;
- background: rgb(255, 255, 255);
-}
-
- at -webkit-variables print {
- foreground: black;
- background: red;
-}
-
-body {
- color: -webkit-var(foreground);
- background-color: -webkit-var(background);
-}
-</style>
-</head>
-<body>
-This text should be green on a white background. There should be no red visible.
diff --git a/LayoutTests/fast/css/variables/remove-variable-test.html b/LayoutTests/fast/css/variables/remove-variable-test.html
deleted file mode 100644
index e884e78..0000000
--- a/LayoutTests/fast/css/variables/remove-variable-test.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foregroundColor: red;
-}
-
-div {
- color: green;
- color: -webkit-var(foregroundColor);
-}
-</style>
-</head>
-<body>
-<div>
-This text should be green.
-</div>
-<script>
-document.styleSheets[0].cssRules[0].variables.removeVariable("foregroundColor");
-</script>
diff --git a/LayoutTests/fast/css/variables/resources/bad.css b/LayoutTests/fast/css/variables/resources/bad.css
deleted file mode 100644
index 8c5fdf6..0000000
--- a/LayoutTests/fast/css/variables/resources/bad.css
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
- background-color: red;
- foreground-color: white;
-}
diff --git a/LayoutTests/fast/css/variables/resources/good.css b/LayoutTests/fast/css/variables/resources/good.css
deleted file mode 100644
index cbb2b26..0000000
--- a/LayoutTests/fast/css/variables/resources/good.css
+++ /dev/null
@@ -1,4 +0,0 @@
- at -webkit-variables {
- foreground: green;
- background: rgb(255, 255, 255);
-}
diff --git a/LayoutTests/fast/css/variables/resources/listmark.gif b/LayoutTests/fast/css/variables/resources/listmark.gif
deleted file mode 100644
index c37cd26..0000000
Binary files a/LayoutTests/fast/css/variables/resources/listmark.gif and /dev/null differ
diff --git a/LayoutTests/fast/css/variables/set-variable-test.html b/LayoutTests/fast/css/variables/set-variable-test.html
deleted file mode 100644
index 33d0a14..0000000
--- a/LayoutTests/fast/css/variables/set-variable-test.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foregroundColor: red;
-}
-
-div {
- color: -webkit-var(foregroundColor);
-}
-</style>
-</head>
-<body>
-<div>
-This text should be green.
-</div>
-<script>
-document.styleSheets[0].cssRules[0].variables.setVariable("foregroundColor", "green");
-</script>
diff --git a/LayoutTests/fast/css/variables/shorthand-test.html b/LayoutTests/fast/css/variables/shorthand-test.html
deleted file mode 100644
index 1d88566..0000000
--- a/LayoutTests/fast/css/variables/shorthand-test.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- borderWidth: 10px;
- borderStyle: solid;
- borderColor: green;
-}
-
-div {
- border: 20px dotted red;
- border: -webkit-var(borderWidth) -webkit-var(borderStyle) -webkit-var(borderColor);
-}
-</style>
-</head>
-<body>
-<div>This block hould have a 10px solid green border.</div>
\ No newline at end of file
diff --git a/LayoutTests/fast/css/variables/variable-iteration-test.html b/LayoutTests/fast/css/variables/variable-iteration-test.html
deleted file mode 100644
index 6640969..0000000
--- a/LayoutTests/fast/css/variables/variable-iteration-test.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style>
- at -webkit-variables {
- foregroundColor: green;
- backgroundColor: white;
-}
-
-div {
- color: red;
- background-color: red;
-}
-</style>
-</head>
-<body>
-<div id="output">
-This text should be green. There should be no red visible.
-</div>
-<script>
-var variables = document.styleSheets[0].cssRules[0].variables;
-var output = document.getElementById('output');
-for (var i = 0; i < variables.length; i++) {
- var result = variables.getVariableValue(variables[i]);
- if (variables[i] == "foregroundColor")
- output.style.color = result;
- else if (variables[i] == "backgroundColor")
- output.style.backgroundColor = result;
-}
-</script>
-</body>
-</html>
diff --git a/LayoutTests/fast/dom/Window/window-properties-expected.txt b/LayoutTests/fast/dom/Window/window-properties-expected.txt
index afbf456..5cab84b 100644
--- a/LayoutTests/fast/dom/Window/window-properties-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-properties-expected.txt
@@ -208,7 +208,6 @@ window.CSSCharsetRule.prototype.MEDIA_RULE [number]
window.CSSCharsetRule.prototype.PAGE_RULE [number]
window.CSSCharsetRule.prototype.STYLE_RULE [number]
window.CSSCharsetRule.prototype.UNKNOWN_RULE [number]
-window.CSSCharsetRule.prototype.VARIABLES_RULE [number]
window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number]
window.CSSFontFaceRule [object CSSFontFaceRuleConstructor]
@@ -220,7 +219,6 @@ window.CSSFontFaceRule.prototype.MEDIA_RULE [number]
window.CSSFontFaceRule.prototype.PAGE_RULE [number]
window.CSSFontFaceRule.prototype.STYLE_RULE [number]
window.CSSFontFaceRule.prototype.UNKNOWN_RULE [number]
-window.CSSFontFaceRule.prototype.VARIABLES_RULE [number]
window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number]
window.CSSImportRule [object CSSImportRuleConstructor]
@@ -232,7 +230,6 @@ window.CSSImportRule.prototype.MEDIA_RULE [number]
window.CSSImportRule.prototype.PAGE_RULE [number]
window.CSSImportRule.prototype.STYLE_RULE [number]
window.CSSImportRule.prototype.UNKNOWN_RULE [number]
-window.CSSImportRule.prototype.VARIABLES_RULE [number]
window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number]
window.CSSMediaRule [object CSSMediaRuleConstructor]
@@ -244,7 +241,6 @@ window.CSSMediaRule.prototype.MEDIA_RULE [number]
window.CSSMediaRule.prototype.PAGE_RULE [number]
window.CSSMediaRule.prototype.STYLE_RULE [number]
window.CSSMediaRule.prototype.UNKNOWN_RULE [number]
-window.CSSMediaRule.prototype.VARIABLES_RULE [number]
window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number]
window.CSSMediaRule.prototype.deleteRule [function]
@@ -258,7 +254,6 @@ window.CSSPageRule.prototype.MEDIA_RULE [number]
window.CSSPageRule.prototype.PAGE_RULE [number]
window.CSSPageRule.prototype.STYLE_RULE [number]
window.CSSPageRule.prototype.UNKNOWN_RULE [number]
-window.CSSPageRule.prototype.VARIABLES_RULE [number]
window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number]
window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor]
@@ -334,7 +329,6 @@ window.CSSRule.MEDIA_RULE [number]
window.CSSRule.PAGE_RULE [number]
window.CSSRule.STYLE_RULE [number]
window.CSSRule.UNKNOWN_RULE [number]
-window.CSSRule.VARIABLES_RULE [number]
window.CSSRule.WEBKIT_KEYFRAMES_RULE [number]
window.CSSRule.WEBKIT_KEYFRAME_RULE [number]
window.CSSRule.prototype [object CSSRulePrototype]
@@ -345,7 +339,6 @@ window.CSSRule.prototype.MEDIA_RULE [number]
window.CSSRule.prototype.PAGE_RULE [number]
window.CSSRule.prototype.STYLE_RULE [number]
window.CSSRule.prototype.UNKNOWN_RULE [number]
-window.CSSRule.prototype.VARIABLES_RULE [number]
window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number]
window.CSSRuleList [object CSSRuleListConstructor]
@@ -381,14 +374,6 @@ window.CSSValue.prototype.CSS_PRIMITIVE_VALUE [number]
window.CSSValue.prototype.CSS_VALUE_LIST [number]
window.CSSValueList [object CSSValueListConstructor]
window.CSSValueList.prototype [printed above as window.CSSValue.prototype]
-window.CSSVariablesDeclaration [object CSSVariablesDeclarationConstructor]
-window.CSSVariablesDeclaration.prototype [object CSSVariablesDeclarationPrototype]
-window.CSSVariablesDeclaration.prototype.getVariableValue [function]
-window.CSSVariablesDeclaration.prototype.item [function]
-window.CSSVariablesDeclaration.prototype.removeVariable [function]
-window.CSSVariablesDeclaration.prototype.setVariable [function]
-window.CSSVariablesRule [object CSSVariablesRuleConstructor]
-window.CSSVariablesRule.prototype [printed above as window.CSSRule.prototype]
window.CanvasGradient [object CanvasGradientConstructor]
window.CanvasGradient.prototype [object CanvasGradientPrototype]
window.CanvasGradient.prototype.addColorStop [function]
diff --git a/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt
index dc0c698..1d9c4df 100644
--- a/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt
@@ -24,8 +24,6 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSStyleRule') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSStyleSheet') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValue') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSValueList') is 'object'
-PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesDeclaration') is 'object'
-PASS typeof Object.getOwnPropertyDescriptor(window, 'CSSVariablesRule') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasGradient') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasPattern') is 'object'
PASS typeof Object.getOwnPropertyDescriptor(window, 'CanvasRenderingContext2D') is 'object'
diff --git a/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
index 17bdcf0..e68e0a7 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-2-expected.txt
@@ -220,8 +220,6 @@ Never found BlobBuilder
Never found Blob
Never found CDATASection
Never found CSSRule
-Never found CSSVariablesDeclaration
-Never found CSSVariablesRule
Never found CanvasGradient
Never found CharacterData
Never found Clipboard
diff --git a/LayoutTests/fast/dom/prototype-inheritance-expected.txt b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
index 9bc7039..6b410ad 100644
--- a/LayoutTests/fast/dom/prototype-inheritance-expected.txt
+++ b/LayoutTests/fast/dom/prototype-inheritance-expected.txt
@@ -45,10 +45,6 @@ PASS inner.CSSValue.isInner is true
PASS inner.CSSValue.constructor.isInner is true
PASS inner.CSSValueList.isInner is true
PASS inner.CSSValueList.constructor.isInner is true
-PASS inner.CSSVariablesDeclaration.isInner is true
-PASS inner.CSSVariablesDeclaration.constructor.isInner is true
-PASS inner.CSSVariablesRule.isInner is true
-PASS inner.CSSVariablesRule.constructor.isInner is true
PASS inner.CanvasGradient.isInner is true
PASS inner.CanvasGradient.constructor.isInner is true
PASS inner.CanvasPattern.isInner is true
diff --git a/LayoutTests/fast/js/global-constructors-expected.txt b/LayoutTests/fast/js/global-constructors-expected.txt
index c25f918..be61348 100644
--- a/LayoutTests/fast/js/global-constructors-expected.txt
+++ b/LayoutTests/fast/js/global-constructors-expected.txt
@@ -22,8 +22,6 @@ PASS CSSStyleRule.toString() is '[object CSSStyleRuleConstructor]'
PASS CSSStyleSheet.toString() is '[object CSSStyleSheetConstructor]'
PASS CSSValue.toString() is '[object CSSValueConstructor]'
PASS CSSValueList.toString() is '[object CSSValueListConstructor]'
-PASS CSSVariablesDeclaration.toString() is '[object CSSVariablesDeclarationConstructor]'
-PASS CSSVariablesRule.toString() is '[object CSSVariablesRuleConstructor]'
PASS CanvasGradient.toString() is '[object CanvasGradientConstructor]'
PASS CanvasPattern.toString() is '[object CanvasPatternConstructor]'
PASS CanvasRenderingContext2D.toString() is '[object CanvasRenderingContext2DConstructor]'
diff --git a/LayoutTests/platform/chromium-mac/fast/css/variables/color-hex-test-expected.txt b/LayoutTests/platform/chromium-mac/fast/css/variables/color-hex-test-expected.txt
deleted file mode 100644
index c3dedb5..0000000
--- a/LayoutTests/platform/chromium-mac/fast/css/variables/color-hex-test-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: line 27: Uncaught TypeError: Cannot call method 'getVariableValue' of undefined
-FAILED
diff --git a/LayoutTests/platform/chromium-mac/fast/css/variables/remove-variable-test-expected.txt b/LayoutTests/platform/chromium-mac/fast/css/variables/remove-variable-test-expected.txt
deleted file mode 100644
index 77780be..0000000
--- a/LayoutTests/platform/chromium-mac/fast/css/variables/remove-variable-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18 [color=#008000]
- RenderText {#text} at (0,0) size 163x18
- text run at (0,0) width 163: "This text should be green."
diff --git a/LayoutTests/platform/chromium-mac/fast/css/variables/set-variable-test-expected.txt b/LayoutTests/platform/chromium-mac/fast/css/variables/set-variable-test-expected.txt
deleted file mode 100644
index d6e0b81..0000000
--- a/LayoutTests/platform/chromium-mac/fast/css/variables/set-variable-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 163x18
- text run at (0,0) width 163: "This text should be green."
diff --git a/LayoutTests/platform/chromium-mac/fast/css/variables/variable-iteration-test-expected.txt b/LayoutTests/platform/chromium-mac/fast/css/variables/variable-iteration-test-expected.txt
deleted file mode 100644
index ef704d6..0000000
--- a/LayoutTests/platform/chromium-mac/fast/css/variables/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 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18 [color=#FF0000] [bgcolor=#FF0000]
- RenderText {#text} at (0,0) size 362x18
- text run at (0,0) width 167: "This text should be green. "
- text run at (167,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum
deleted file mode 100644
index d3efba8..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-49e99bb8e03d7b731fed66c2b3f1fc66
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.png
deleted file mode 100644
index 6980bd2..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt
deleted file mode 100644
index e9206d0..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x136
- RenderBlock {HTML} at (0,0) size 800x136
- RenderBody {BODY} at (8,8) size 784x120
- RenderBlock (anonymous) at (0,0) size 784x20
- 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]
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.checksum
deleted file mode 100644
index cb7a3e7..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.png
deleted file mode 100644
index 179a8be..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.txt
deleted file mode 100644
index 341a083..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/colors-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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]
- 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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum
deleted file mode 100644
index 52b0b83..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-69c1956795285390af425c9518e9d240
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.png
deleted file mode 100644
index d19643d..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt
deleted file mode 100644
index 6546cc3..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- RenderText {#text} at (0,0) size 519x19
- 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
- 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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.checksum
deleted file mode 100644
index a8e3a9e..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-5373ee50083a104a2c725b862d08b4b0
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.png
deleted file mode 100644
index f8e838e..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.txt
deleted file mode 100644
index 8d119a4..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/font-test-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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
- 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"
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.checksum
deleted file mode 100644
index 9e9dbea..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-22cc407b6d4c4822c38cf865227bdc8a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.png
deleted file mode 100644
index 5835e25..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.txt
deleted file mode 100644
index 0053d93..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/image-test-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x120
- RenderBlock {HTML} at (0,0) size 800x120
- RenderBody {BODY} at (8,8) size 784x96
- RenderBlock (anonymous) at (0,0) size 784x20
- RenderText {#text} at (0,0) size 611x19
- text run at (0,0) width 347: "The list below should use red diamond images for bullets. "
- 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
- 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
- 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
- RenderText {#text} at (0,0) size 35x19
- text run at (0,0) width 35: "Three"
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.checksum
deleted file mode 100644
index cb7a3e7..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.png
deleted file mode 100644
index 179a8be..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.txt
deleted file mode 100644
index be60cf6..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/import-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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]
- 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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum
deleted file mode 100644
index cb7a3e7..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.png
deleted file mode 100644
index 179a8be..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.txt
deleted file mode 100644
index d30d0e0..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/inline-style-test-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-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]
- 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."
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum
deleted file mode 100644
index cb7a3e7..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png
deleted file mode 100644
index 179a8be..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt
deleted file mode 100644
index 341a083..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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]
- 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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.checksum
deleted file mode 100644
index 52b0b83..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-69c1956795285390af425c9518e9d240
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.png
deleted file mode 100644
index d19643d..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.txt
deleted file mode 100644
index 6546cc3..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/margin-test-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- RenderText {#text} at (0,0) size 519x19
- 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
- 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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum
deleted file mode 100644
index cb7a3e7..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png
deleted file mode 100644
index 179a8be..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt
deleted file mode 100644
index 341a083..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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]
- 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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum
deleted file mode 100644
index b1b2f81..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-4aa05d96fec26927e220324154cb5ea7
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png
deleted file mode 100644
index b9df061..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt
deleted file mode 100644
index f773d4b..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-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]
- RenderText {#text} at (0,0) size 296x19
- text run at (0,0) width 296: "This text should be green on a white background."
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum
deleted file mode 100644
index d3efba8..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-49e99bb8e03d7b731fed66c2b3f1fc66
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png
deleted file mode 100644
index 6980bd2..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt
deleted file mode 100644
index a15cdc1..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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 (anonymous) at (0,0) size 784x20
- 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."
-layer at (8,28) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
-layer at (8,28) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum
deleted file mode 100644
index 945a308..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d4f7c9205a90ae06529f39fd7ebdfcb0
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.png
deleted file mode 100644
index 19692ce..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt
deleted file mode 100644
index a076804..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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."
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.checksum
deleted file mode 100644
index cb7a3e7..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.png
deleted file mode 100644
index 179a8be..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.txt
deleted file mode 100644
index 341a083..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/override-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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]
- 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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.checksum
deleted file mode 100644
index cb7a3e7..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1405824c327c6f10db3502321f6c226d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.png
deleted file mode 100644
index 179a8be..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.txt
deleted file mode 100644
index 341a083..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/print-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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]
- 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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum
deleted file mode 100644
index 56dec8d..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d304eb78a06d3eedeba6171a2d09619b
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.png
deleted file mode 100644
index f970f98..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt
deleted file mode 100644
index 2a5ae5c..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum
deleted file mode 100644
index 56dec8d..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d304eb78a06d3eedeba6171a2d09619b
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.png
deleted file mode 100644
index f970f98..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.txt
deleted file mode 100644
index 2a5ae5c..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/set-variable-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum
deleted file mode 100644
index d9bca73..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1659bc2dc6e6e5a355b86b8622672ac2
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.png
deleted file mode 100644
index 2a31cce..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.txt
deleted file mode 100644
index a36f19f..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/shorthand-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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."
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum
deleted file mode 100644
index f7d4b25..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-36203e562397716f44230cea05b760c9
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png
deleted file mode 100644
index 408fdcc..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt
deleted file mode 100644
index af06fcf..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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]
- 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/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.checksum
deleted file mode 100644
index 63edfbf..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d6daeed42cdb0b85a5d8dc786e37c50f
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.png
deleted file mode 100644
index a82ccfa..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.txt
deleted file mode 100644
index 99a7f10..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/block-cycle-test-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x136
- RenderBlock {HTML} at (0,0) size 800x136
- RenderBody {BODY} at (8,8) size 784x120
- RenderBlock (anonymous) at (0,0) size 784x20
- 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=#FF0000]
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/color-hex-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/color-hex-test-expected.txt
deleted file mode 100644
index c3dedb5..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/color-hex-test-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: line 27: Uncaught TypeError: Cannot call method 'getVariableValue' of undefined
-FAILED
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.checksum
deleted file mode 100644
index 54b7155..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-c579a6187df2a657d2084895b272d13a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.png
deleted file mode 100644
index 721738a..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.txt
deleted file mode 100644
index 9e44a2a..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/colors-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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 [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/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.checksum
deleted file mode 100644
index cc81cb9..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-b00bf663877af49e22d29b4afca97ab5
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.png
deleted file mode 100644
index a3603c7..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.txt
deleted file mode 100644
index 4bcae8a..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/declaration-block-test-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
- RenderText {#text} at (0,0) size 519x19
- 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 160x160
- RenderBlock (positioned) {DIV} at (8,28) size 160x160
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.checksum
deleted file mode 100644
index 3e6a5a6..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-c377eccda22646efcda8b5ebf3e6f11f
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.png
deleted file mode 100644
index 1f458ec..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.txt
deleted file mode 100644
index 52db8d9..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/font-test-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-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 784x20 [color=#008000]
- RenderText {#text} at (0,0) size 110x19
- text run at (0,0) width 110: "XXXXXXXXXX"
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.checksum
deleted file mode 100644
index 2b5e845..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d66912575ec21f168944dd43af5cb36f
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.png
deleted file mode 100644
index 576b11b..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.txt
deleted file mode 100644
index 953257d..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/image-test-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x120
- RenderBlock {HTML} at (0,0) size 800x120
- RenderBody {BODY} at (8,8) size 784x96
- RenderBlock (anonymous) at (0,0) size 784x20
- RenderText {#text} at (0,0) size 611x19
- text run at (0,0) width 347: "The list below should use red diamond images for bullets. "
- 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 (-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 (-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 (-18,0) size 7x19: bullet
- RenderText {#text} at (0,0) size 35x19
- text run at (0,0) width 35: "Three"
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.checksum
deleted file mode 100644
index 26d4d12..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-0196dac35de8e0dbb51d5f19f18b931f
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.png
deleted file mode 100644
index 516168e..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.txt
deleted file mode 100644
index 6f7f665..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/import-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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
- 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/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.checksum
deleted file mode 100644
index 54b7155..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-c579a6187df2a657d2084895b272d13a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.png
deleted file mode 100644
index 721738a..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.txt
deleted file mode 100644
index 9e44a2a..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/inline-style-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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 [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/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.checksum
deleted file mode 100644
index 3f9b131..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-98a627fa5477aa2247e3b5a26b88ab42
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.png
deleted file mode 100644
index d89f49e..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.txt
deleted file mode 100644
index ae9de54..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/invalid-variable-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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=#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/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.checksum
deleted file mode 100644
index 11feeee..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-901387318dc33250b10e809691d5308b
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.png
deleted file mode 100644
index d974c77..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.txt
deleted file mode 100644
index 8104534..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/margin-test-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- RenderText {#text} at (0,0) size 519x19
- 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 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 (8,28) size 80x80
- RenderBlock (relative positioned) {DIV} at (0,0) size 80x80 [bgcolor=#008000]
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.checksum
deleted file mode 100644
index 0f95169..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-42e3c38cd7454dab52c249dcd1ee938e
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.png
deleted file mode 100644
index d2e1fd0..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.txt
deleted file mode 100644
index cd5663c..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-import-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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
- 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/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.checksum
deleted file mode 100644
index b1b2f81..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-4aa05d96fec26927e220324154cb5ea7
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.png
deleted file mode 100644
index b9df061..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.txt
deleted file mode 100644
index f773d4b..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/misplaced-variables-test-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-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]
- RenderText {#text} at (0,0) size 296x19
- text run at (0,0) width 296: "This text should be green on a white background."
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.checksum
deleted file mode 100644
index d3efba8..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-49e99bb8e03d7b731fed66c2b3f1fc66
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.png
deleted file mode 100644
index 6980bd2..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.txt
deleted file mode 100644
index a15cdc1..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-blocks-test-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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 (anonymous) at (0,0) size 784x20
- 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."
-layer at (8,28) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
-layer at (8,28) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.checksum
deleted file mode 100644
index 68be5eb..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d2e78636f86601e5a72d4398ede93c8e
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.png
deleted file mode 100644
index 02cb230..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.txt
deleted file mode 100644
index b41ca63..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/multiple-term-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-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/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.checksum
deleted file mode 100644
index 0f95169..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-42e3c38cd7454dab52c249dcd1ee938e
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.png
deleted file mode 100644
index d2e1fd0..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.txt
deleted file mode 100644
index cd5663c..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/override-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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
- 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/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.checksum
deleted file mode 100644
index 0f95169..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-42e3c38cd7454dab52c249dcd1ee938e
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.png
deleted file mode 100644
index d2e1fd0..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.txt
deleted file mode 100644
index cd5663c..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/print-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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
- 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/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.checksum
deleted file mode 100644
index 56dec8d..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d304eb78a06d3eedeba6171a2d09619b
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.png
deleted file mode 100644
index f970f98..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.txt
deleted file mode 100644
index fd569e3..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/remove-variable-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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
- 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/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.checksum
deleted file mode 100644
index 5f11c5c..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-f90432be72f857f8ced1d20e88d81fdf
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.png
deleted file mode 100644
index 92fc8e1..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.txt
deleted file mode 100644
index 6ba1742..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/set-variable-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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
- RenderText {#text} at (0,0) size 154x19
- text run at (0,0) width 154: "This text should be green."
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.checksum
deleted file mode 100644
index 9b9e7b9..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d1c5843fee61a8c4e2ad50a3048bc4d9
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.png
deleted file mode 100644
index 8ce0a18..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.txt
deleted file mode 100644
index b109432..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/shorthand-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-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/LayoutTests/platform/chromium-win/fast/css/variables/variable-iteration-test-expected.checksum b/LayoutTests/platform/chromium-win/fast/css/variables/variable-iteration-test-expected.checksum
deleted file mode 100644
index 579e08a..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/variable-iteration-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-806716f1463243f345d6e900684439fd
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/variable-iteration-test-expected.png b/LayoutTests/platform/chromium-win/fast/css/variables/variable-iteration-test-expected.png
deleted file mode 100644
index 57de44e..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/css/variables/variable-iteration-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/css/variables/variable-iteration-test-expected.txt b/LayoutTests/platform/chromium-win/fast/css/variables/variable-iteration-test-expected.txt
deleted file mode 100644
index 1b59395..0000000
--- a/LayoutTests/platform/chromium-win/fast/css/variables/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/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 58744c2..22de093 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1694,25 +1694,6 @@ fast/css/namespaces/namespaces-comments.xml
fast/css/namespaces/namespaces-empty.xml
fast/css/namespaces/namespaces-escapes.xml
fast/css/namespaces/namespaces-invalid-at.xml
-fast/css/variables/block-cycle-test.html
-fast/css/variables/colors-test.html
-fast/css/variables/declaration-block-test.html
-fast/css/variables/font-test.html
-fast/css/variables/image-test.html
-fast/css/variables/import-test.html
-fast/css/variables/inline-style-test.html
-fast/css/variables/invalid-variable-test.html
-fast/css/variables/margin-test.html
-fast/css/variables/misplaced-import-test.html
-fast/css/variables/misplaced-variables-test.html
-fast/css/variables/multiple-blocks-test.html
-fast/css/variables/multiple-term-test.html
-fast/css/variables/override-test.html
-fast/css/variables/print-test.html
-fast/css/variables/remove-variable-test.html
-fast/css/variables/set-variable-test.html
-fast/css/variables/shorthand-test.html
-fast/css/variables/variable-iteration-test.html
fast/doctypes/001.html
fast/doctypes/002.html
fast/doctypes/003.html
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/block-cycle-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/block-cycle-test-expected.checksum
deleted file mode 100644
index 633e3ee..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/block-cycle-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-9ab2136624a42dd0af2cb9bcf04af880
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/block-cycle-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/block-cycle-test-expected.png
deleted file mode 100644
index d478a29..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/block-cycle-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/colors-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/colors-test-expected.checksum
deleted file mode 100644
index 6fd36a5..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/colors-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d5faaffde772715b7ac438992cc5d027
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/colors-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/colors-test-expected.png
deleted file mode 100644
index 92e96ee..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/colors-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/declaration-block-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/declaration-block-test-expected.checksum
deleted file mode 100644
index 71ee0b1..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/declaration-block-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-db79441364f181edadc96481163d5701
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/declaration-block-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/declaration-block-test-expected.png
deleted file mode 100644
index 5e4b540..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/declaration-block-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/font-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/font-test-expected.checksum
deleted file mode 100644
index aee91cd..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/font-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-33de419860a27504f97b83d95b201b5f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/font-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/font-test-expected.png
deleted file mode 100644
index 5c16795..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/font-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/image-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/image-test-expected.checksum
deleted file mode 100644
index 7e103e4..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/image-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-5d5d9af67a71f48127ee1d496739b1b7
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/image-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/image-test-expected.png
deleted file mode 100644
index 3f9ed84..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/image-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/import-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/import-test-expected.checksum
deleted file mode 100644
index 4a18d82..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-07734589c1b6b3f035a706509008ab12
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/import-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/import-test-expected.png
deleted file mode 100644
index 160e02f..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/inline-style-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/inline-style-test-expected.checksum
deleted file mode 100644
index 6fd36a5..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/inline-style-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d5faaffde772715b7ac438992cc5d027
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/inline-style-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/inline-style-test-expected.png
deleted file mode 100644
index 92e96ee..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/inline-style-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.checksum
deleted file mode 100644
index 4132f5f..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-56a2318f29a3b7e1dc3eb4dd2e3c5634
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.png
deleted file mode 100644
index b8cd30d..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/invalid-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/margin-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/margin-test-expected.checksum
deleted file mode 100644
index febf457..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/margin-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-0f0861ca61fbfc973a3e99cec9b83a0c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/margin-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/margin-test-expected.png
deleted file mode 100644
index fa13484..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/margin-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.checksum
deleted file mode 100644
index 6fd36a5..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d5faaffde772715b7ac438992cc5d027
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.png
deleted file mode 100644
index 8babfdc..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.checksum
deleted file mode 100644
index 3577be9..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-43c5e5f1273967c93c808ae0b08cce7d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.png
deleted file mode 100644
index b8c3d65..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/misplaced-variables-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.checksum
deleted file mode 100644
index 74aa2aa..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-b9abfa94321ddf55335fb4fefc6a3a3b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.png
deleted file mode 100644
index ead8aa4..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-blocks-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-term-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-term-test-expected.checksum
deleted file mode 100644
index 57a4af7..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-term-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-a64d3932e4560da74f50ad120b5cee8c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-term-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-term-test-expected.png
deleted file mode 100644
index 982b563..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/multiple-term-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/override-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/override-test-expected.checksum
deleted file mode 100644
index b623d03..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/override-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-298a5c439d36bd284adea72df4b2cbd5
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/override-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/override-test-expected.png
deleted file mode 100644
index 757a1b2..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/override-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/print-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/print-test-expected.checksum
deleted file mode 100644
index b623d03..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/print-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-298a5c439d36bd284adea72df4b2cbd5
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/print-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/print-test-expected.png
deleted file mode 100644
index 757a1b2..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/print-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/remove-variable-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/remove-variable-test-expected.checksum
deleted file mode 100644
index d21ae63..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/remove-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-086ef73625c1bfd95a09997fd698dc9d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/remove-variable-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/remove-variable-test-expected.png
deleted file mode 100644
index 6fcaec9..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/remove-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/set-variable-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/set-variable-test-expected.checksum
deleted file mode 100644
index 1014f7d..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/set-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-3dd18d4895193d0056e3ca002c0266e8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/set-variable-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/set-variable-test-expected.png
deleted file mode 100644
index e330ac6..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/set-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/shorthand-test-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/variables/shorthand-test-expected.checksum
deleted file mode 100644
index 57e0f36..0000000
--- a/LayoutTests/platform/mac-leopard/fast/css/variables/shorthand-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-188099de8be64e8512a43f2927c020f1
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/variables/shorthand-test-expected.png b/LayoutTests/platform/mac-leopard/fast/css/variables/shorthand-test-expected.png
deleted file mode 100644
index 72a4591..0000000
Binary files a/LayoutTests/platform/mac-leopard/fast/css/variables/shorthand-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum
deleted file mode 100644
index dacd6d0..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-231cadf25b63e65921ef660cae7e202c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.png
deleted file mode 100644
index 1f9d9bc..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt
deleted file mode 100644
index ca1bd66..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/block-cycle-test-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x134
- RenderBlock {HTML} at (0,0) size 800x134
- RenderBody {BODY} at (8,8) size 784x118
- RenderBlock (anonymous) at (0,0) size 784x18
- RenderText {#text} at (0,0) size 471x18
- text run at (0,0) width 244: "You should see a green square below. "
- text run at (244,0) width 227: "There should be no red on the page."
- RenderBlock {DIV} at (0,18) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.checksum
deleted file mode 100644
index 034a2cf..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-020fc0c8512570b74bb6c6b0912af27d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.png
deleted file mode 100644
index 32cbdba..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.txt
deleted file mode 100644
index afa793f..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/colors-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum
deleted file mode 100644
index 29ccb31..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-ee639167cf7e4e7970eb75f8ba70edc8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.png
deleted file mode 100644
index 78bc322..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt
deleted file mode 100644
index 2e25ee9..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/declaration-block-test-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderText {#text} at (0,0) size 541x18
- text run at (0,0) width 310: "You should see a 5em wide green square below. "
- text run at (310,0) width 231: "There should be no red on the page. "
- RenderText {#text} at (0,0) size 0x0
-layer at (8,26) size 160x240
- RenderBlock (positioned) {DIV} at (8,26) size 160x160
-layer at (40,106) size 80x80
- RenderBlock (positioned) {DIV} at (32,80) size 80x80 [bgcolor=#FF0000]
-layer at (40,106) size 80x80
- RenderBlock (relative positioned) {DIV} at (32,80) size 80x80 [bgcolor=#008000]
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.checksum
deleted file mode 100644
index b890cbf..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-206c8f40e532160fdb1468c6f4c80878
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.png
deleted file mode 100644
index 71cae4b..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.txt
deleted file mode 100644
index dbaacd4..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/font-test-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-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 784x36
- RenderText {#text} at (0,0) size 783x36
- text run at (0,0) width 783: "You should see a green rectangle below. If you see individual \"X\" glyphs, the test has failed. (The Ahem font is required for"
- text run at (0,18) width 56: "this test.)"
- RenderBlock {DIV} at (0,52) size 784x24 [color=#008000]
- RenderText {#text} at (0,0) size 240x24
- text run at (0,0) width 240: "XXXXXXXXXX"
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.checksum
deleted file mode 100644
index 30a4214..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-08901a0c945889cd996610875d738019
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.png
deleted file mode 100644
index 5770e3b..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.txt
deleted file mode 100644
index 2928087..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/image-test-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x112
- RenderBlock {HTML} at (0,0) size 800x112
- RenderBody {BODY} at (8,8) size 784x88
- RenderBlock (anonymous) at (0,0) size 784x18
- RenderText {#text} at (0,0) size 645x18
- text run at (0,0) width 367: "The list below should use red diamond images for bullets. "
- text run at (367,0) width 278: "If you see circular bullets, the test has failed."
- RenderBlock {UL} at (0,34) size 784x54
- RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (-19,5) size 12x9
- RenderText {#text} at (0,0) size 27x18
- text run at (0,0) width 27: "One"
- RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (-19,5) size 12x9
- RenderText {#text} at (0,0) size 30x18
- text run at (0,0) width 30: "Two"
- RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (-19,5) size 12x9
- RenderText {#text} at (0,0) size 37x18
- text run at (0,0) width 37: "Three"
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.checksum
deleted file mode 100644
index 034a2cf..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-020fc0c8512570b74bb6c6b0912af27d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.png
deleted file mode 100644
index 32cbdba..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.txt
deleted file mode 100644
index 63407c2..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/import-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34 [color=#FF0000]
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum
deleted file mode 100644
index 034a2cf..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-020fc0c8512570b74bb6c6b0912af27d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.png
deleted file mode 100644
index 32cbdba..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.txt
deleted file mode 100644
index 277ab9b..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/inline-style-test-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum
deleted file mode 100644
index 034a2cf..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-020fc0c8512570b74bb6c6b0912af27d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png
deleted file mode 100644
index 32cbdba..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt
deleted file mode 100644
index afa793f..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/invalid-variable-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.checksum
deleted file mode 100644
index 29ccb31..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-ee639167cf7e4e7970eb75f8ba70edc8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.png
deleted file mode 100644
index 78bc322..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.txt
deleted file mode 100644
index 2e25ee9..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/margin-test-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderText {#text} at (0,0) size 541x18
- text run at (0,0) width 310: "You should see a 5em wide green square below. "
- text run at (310,0) width 231: "There should be no red on the page. "
- RenderText {#text} at (0,0) size 0x0
-layer at (8,26) size 160x240
- RenderBlock (positioned) {DIV} at (8,26) size 160x160
-layer at (40,106) size 80x80
- RenderBlock (positioned) {DIV} at (32,80) size 80x80 [bgcolor=#FF0000]
-layer at (40,106) size 80x80
- RenderBlock (relative positioned) {DIV} at (32,80) size 80x80 [bgcolor=#008000]
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum
deleted file mode 100644
index 034a2cf..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-020fc0c8512570b74bb6c6b0912af27d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png
deleted file mode 100644
index 32cbdba..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt
deleted file mode 100644
index afa793f..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-import-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum
deleted file mode 100644
index 7b32ace..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-74ddb91bc073e7d22318e8551a843408
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png
deleted file mode 100644
index ead9854..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt
deleted file mode 100644
index 31aa8ef..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/misplaced-variables-test-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 312x18
- text run at (0,0) width 312: "This text should be green on a white background."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum
deleted file mode 100644
index dacd6d0..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-231cadf25b63e65921ef660cae7e202c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png
deleted file mode 100644
index 1f9d9bc..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt
deleted file mode 100644
index 2c174f4..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-blocks-test-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock (anonymous) at (0,0) size 784x18
- RenderText {#text} at (0,0) size 471x18
- text run at (0,0) width 244: "You should see a green square below. "
- text run at (244,0) width 227: "There should be no red on the page."
-layer at (8,26) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
-layer at (8,26) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum
deleted file mode 100644
index d6352f7..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-bf7ad61e54146e4eadfb789e4ed4ebf6
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.png
deleted file mode 100644
index 28bf188..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt
deleted file mode 100644
index 85d5c6b..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/multiple-term-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x54
- RenderBlock {HTML} at (0,0) size 800x54
- RenderBody {BODY} at (8,8) size 784x38
- RenderBlock {DIV} at (0,0) size 784x38 [border: (10px solid #008000)]
- RenderText {#text} at (10,10) size 621x18
- text run at (10,10) width 305: "This div should have a 10px solid green border. "
- text run at (315,10) width 316: "If this div has a red border, then the test has failed."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.checksum
deleted file mode 100644
index 034a2cf..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-020fc0c8512570b74bb6c6b0912af27d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.png
deleted file mode 100644
index 32cbdba..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.txt
deleted file mode 100644
index afa793f..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/override-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.checksum
deleted file mode 100644
index 034a2cf..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-020fc0c8512570b74bb6c6b0912af27d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.png
deleted file mode 100644
index 32cbdba..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.txt
deleted file mode 100644
index afa793f..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/print-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum
deleted file mode 100644
index 40c49d5..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-c6225ccef161b498c7c6090c52c26da2
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.png
deleted file mode 100644
index 5454ee5..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt
deleted file mode 100644
index 772b281..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/remove-variable-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18 [color=#008000]
- RenderText {#text} at (0,0) size 163x18
- text run at (0,0) width 163: "This text should be green."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum
deleted file mode 100644
index 40c49d5..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-c6225ccef161b498c7c6090c52c26da2
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.png
deleted file mode 100644
index 5454ee5..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.txt
deleted file mode 100644
index 772b281..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/set-variable-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18 [color=#008000]
- RenderText {#text} at (0,0) size 163x18
- text run at (0,0) width 163: "This text should be green."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum
deleted file mode 100644
index 0f5fdee..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-a0b85536a9329c643adad7cd70b1c8dc
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.png
deleted file mode 100644
index 7166e2f..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.txt
deleted file mode 100644
index 0350c16..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/shorthand-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x54
- RenderBlock {HTML} at (0,0) size 800x54
- RenderBody {BODY} at (8,8) size 784x38
- RenderBlock {DIV} at (0,0) size 784x38 [border: (10px solid #008000)]
- RenderText {#text} at (10,10) size 310x18
- text run at (10,10) width 310: "This block hould have a 10px solid green border."
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum
deleted file mode 100644
index 88759e2..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-9c18938767fddc55ded0decb64e5246b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png
deleted file mode 100644
index 6227232..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt
deleted file mode 100644
index 4d39893..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/alternate-syntax/variable-iteration-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 362x18
- text run at (0,0) width 167: "This text should be green. "
- text run at (167,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.checksum
deleted file mode 100644
index 9a2b089..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-8c375877331521eb2a4da7a075f5cc4c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.png
deleted file mode 100644
index 6f9ffde..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.txt
deleted file mode 100644
index 1eeec35..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/block-cycle-test-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x134
- RenderBlock {HTML} at (0,0) size 800x134
- RenderBody {BODY} at (8,8) size 784x118
- RenderBlock (anonymous) at (0,0) size 784x18
- RenderText {#text} at (0,0) size 471x18
- text run at (0,0) width 244: "You should see a green square below. "
- text run at (244,0) width 227: "There should be no red on the page."
- RenderBlock {DIV} at (0,18) size 100x100 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.checksum
deleted file mode 100644
index 706402c..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-3b521f0661cb5be8ef5513b2de77f62e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.png
deleted file mode 100644
index 8babfdc..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.txt
deleted file mode 100644
index 4c10579..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/colors-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [bgcolor=#FF0000]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.checksum
deleted file mode 100644
index 9c97fb0..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-81aba8ff09b69baafa3bf6529d1c00f9
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.png
deleted file mode 100644
index 025d06d..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.txt
deleted file mode 100644
index 8d29753..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/declaration-block-test-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderText {#text} at (0,0) size 541x18
- text run at (0,0) width 310: "You should see a 5em wide green square below. "
- text run at (310,0) width 231: "There should be no red on the page. "
- RenderText {#text} at (0,0) size 0x0
-layer at (8,26) size 160x160
- RenderBlock (positioned) {DIV} at (8,26) size 160x160
diff --git a/LayoutTests/platform/mac/fast/css/variables/font-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/font-test-expected.checksum
deleted file mode 100644
index 1191d17..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/font-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-da1656a9c6c32f16d78deff05954c6a8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/font-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/font-test-expected.png
deleted file mode 100644
index 3295360..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/font-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/font-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/font-test-expected.txt
deleted file mode 100644
index 908c83b..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/font-test-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
- RenderBlock {HTML} at (0,0) size 800x94
- RenderBody {BODY} at (8,16) size 784x70
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 783x36
- text run at (0,0) width 783: "You should see a green rectangle below. If you see individual \"X\" glyphs, the test has failed. (The Ahem font is required for"
- text run at (0,18) width 56: "this test.)"
- RenderBlock {DIV} at (0,52) size 784x18 [color=#008000]
- RenderText {#text} at (0,0) size 120x18
- text run at (0,0) width 120: "XXXXXXXXXX"
diff --git a/LayoutTests/platform/mac/fast/css/variables/image-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/image-test-expected.checksum
deleted file mode 100644
index 53775be..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/image-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-7dfacb4c0c034791e9f4099a0b58644b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/image-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/image-test-expected.png
deleted file mode 100644
index e5b3b41..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/image-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/image-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/image-test-expected.txt
deleted file mode 100644
index 7a38097..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/image-test-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x112
- RenderBlock {HTML} at (0,0) size 800x112
- RenderBody {BODY} at (8,8) size 784x88
- RenderBlock (anonymous) at (0,0) size 784x18
- RenderText {#text} at (0,0) size 645x18
- text run at (0,0) width 367: "The list below should use red diamond images for bullets. "
- text run at (367,0) width 278: "If you see circular bullets, the test has failed."
- RenderBlock {UL} at (0,34) size 784x54
- RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (-17,0) size 7x18: bullet
- RenderText {#text} at (0,0) size 27x18
- text run at (0,0) width 27: "One"
- RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (-17,0) size 7x18: bullet
- RenderText {#text} at (0,0) size 30x18
- text run at (0,0) width 30: "Two"
- RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (-17,0) size 7x18: bullet
- RenderText {#text} at (0,0) size 37x18
- text run at (0,0) width 37: "Three"
diff --git a/LayoutTests/platform/mac/fast/css/variables/import-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/import-test-expected.checksum
deleted file mode 100644
index 8b991ee..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-b6fe47b5afb589678d51a0bde2f28753
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/import-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/import-test-expected.png
deleted file mode 100644
index 2a70c53..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/import-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/import-test-expected.txt
deleted file mode 100644
index 58acb08..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/import-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34 [color=#FF0000]
- RenderBody {BODY} at (8,8) size 784x18
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.checksum
deleted file mode 100644
index 706402c..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-3b521f0661cb5be8ef5513b2de77f62e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.png
deleted file mode 100644
index 8babfdc..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.txt
deleted file mode 100644
index 4c10579..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/inline-style-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [bgcolor=#FF0000]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.checksum
deleted file mode 100644
index 17af6e7..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-5bdae3a85acaaad701c02589fb944149
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.png
deleted file mode 100644
index b4ac64a..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.txt
deleted file mode 100644
index 2e0cf14..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/invalid-variable-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FF0000]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.checksum
deleted file mode 100644
index d68d0bb..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-a74da29c9b6b13a7f8e7dd570258752e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.png
deleted file mode 100644
index d2e055c..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.txt
deleted file mode 100644
index 79c5c0b..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/margin-test-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderText {#text} at (0,0) size 541x18
- text run at (0,0) width 310: "You should see a 5em wide green square below. "
- text run at (310,0) width 231: "There should be no red on the page. "
- RenderText {#text} at (0,0) size 0x0
-layer at (8,26) size 160x160
- RenderBlock (positioned) {DIV} at (8,26) size 160x160
-layer at (40,106) size 80x80
- RenderBlock (positioned) {DIV} at (32,80) size 80x80 [bgcolor=#FF0000]
-layer at (8,26) size 80x80
- RenderBlock (relative positioned) {DIV} at (0,0) size 80x80 [bgcolor=#008000]
diff --git a/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.checksum
deleted file mode 100644
index 706402c..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-3b521f0661cb5be8ef5513b2de77f62e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.png
deleted file mode 100644
index 8babfdc..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.txt
deleted file mode 100644
index 4c10579..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/misplaced-import-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [bgcolor=#FF0000]
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.checksum
deleted file mode 100644
index d255fc7..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-13b947e97834a65be4979dd5c3eb153a
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.png
deleted file mode 100644
index f61fdf2..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.txt
deleted file mode 100644
index 31aa8ef..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/misplaced-variables-test-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
- RenderText {#text} at (0,0) size 312x18
- text run at (0,0) width 312: "This text should be green on a white background."
diff --git a/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.checksum
deleted file mode 100644
index 0b76fa5..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-5cb8070ae88add22dcf08f09f63fdd80
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.png
deleted file mode 100644
index f43e884..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.txt
deleted file mode 100644
index 2c174f4..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/multiple-blocks-test-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock (anonymous) at (0,0) size 784x18
- RenderText {#text} at (0,0) size 471x18
- text run at (0,0) width 244: "You should see a green square below. "
- text run at (244,0) width 227: "There should be no red on the page."
-layer at (8,26) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
-layer at (8,26) size 100x100
- RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.checksum
deleted file mode 100644
index 8c2a2ca..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-8fc5e05b42ceb0168a90b5568d8ef108
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.png
deleted file mode 100644
index d86ddef..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.txt
deleted file mode 100644
index 5eee234..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/multiple-term-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x74
- RenderBlock {HTML} at (0,0) size 800x74
- RenderBody {BODY} at (8,8) size 784x58
- RenderBlock {DIV} at (0,0) size 784x58 [border: (20px solid #FF0000)]
- RenderText {#text} at (20,20) size 621x18
- text run at (20,20) width 305: "This div should have a 10px solid green border. "
- text run at (325,20) width 316: "If this div has a red border, then the test has failed."
diff --git a/LayoutTests/platform/mac/fast/css/variables/override-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/override-test-expected.checksum
deleted file mode 100644
index 63191f8..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/override-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-56206aec794442407dcd73d57e3f75a7
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/override-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/override-test-expected.png
deleted file mode 100644
index 8e444ec..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/override-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/override-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/override-test-expected.txt
deleted file mode 100644
index bbff765..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/override-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/print-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/print-test-expected.checksum
deleted file mode 100644
index 63191f8..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/print-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-56206aec794442407dcd73d57e3f75a7
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/print-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/print-test-expected.png
deleted file mode 100644
index 8e444ec..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/print-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/print-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/print-test-expected.txt
deleted file mode 100644
index bbff765..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/print-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderText {#text} at (0,0) size 511x18
- text run at (0,0) width 316: "This text should be green on a white background. "
- text run at (316,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.checksum
deleted file mode 100644
index 0a6a90f..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-af248adfd9dd84133c878b8b7b66a30e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.png
deleted file mode 100644
index 3178cc2..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.txt
deleted file mode 100644
index fcf9f36..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/remove-variable-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CONSOLE MESSAGE: line 20: TypeError: 'undefined' is not an object (evaluating 'document.styleSheets[0].cssRules[0].variables.removeVariable')
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18 [color=#008000]
- RenderText {#text} at (0,0) size 163x18
- text run at (0,0) width 163: "This text should be green."
diff --git a/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.checksum
deleted file mode 100644
index 5dd2b33..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-3bd7c3ab7b95475bb0ed67f4be5dc6cc
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.png
deleted file mode 100644
index a88f1e7..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.txt
deleted file mode 100644
index f6486ae..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/set-variable-test-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CONSOLE MESSAGE: line 19: TypeError: 'undefined' is not an object (evaluating 'document.styleSheets[0].cssRules[0].variables.setVariable')
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 163x18
- text run at (0,0) width 163: "This text should be green."
diff --git a/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.checksum
deleted file mode 100644
index 961a96d..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-25c4488492c648d196e6283c9d94ea94
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.png
deleted file mode 100644
index e016bc3..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.txt
deleted file mode 100644
index a5e74c1..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/shorthand-test-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x74
- RenderBlock {HTML} at (0,0) size 800x74
- RenderBody {BODY} at (8,8) size 784x58
- RenderBlock {DIV} at (0,0) size 784x58 [border: (20px dotted #FF0000)]
- RenderText {#text} at (20,20) size 310x18
- text run at (20,20) width 310: "This block hould have a 10px solid green border."
diff --git a/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.checksum b/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.checksum
deleted file mode 100644
index 0db96c0..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-a05d39824c8fc829712396fa9d269752
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.png b/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.png
deleted file mode 100644
index 46c34bc..0000000
Binary files a/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.txt b/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.txt
deleted file mode 100644
index 7287bac..0000000
--- a/LayoutTests/platform/mac/fast/css/variables/variable-iteration-test-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CONSOLE MESSAGE: line 23: TypeError: 'undefined' is not an object (evaluating 'variables.length')
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
- RenderBlock {HTML} at (0,0) size 800x34
- RenderBody {BODY} at (8,8) size 784x18
- RenderBlock {DIV} at (0,0) size 784x18 [color=#FF0000] [bgcolor=#FF0000]
- RenderText {#text} at (0,0) size 362x18
- text run at (0,0) width 167: "This text should be green. "
- text run at (167,0) width 195: "There should be no red visible."
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 26922d1..6f2a568 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -3010,25 +3010,6 @@ fast/css/transform-default-parameter.html
fast/css/transition-color-unspecified.html
fast/css/universal-hover-quirk.html
fast/css/value-list-out-of-bounds-crash.html
-fast/css/variables/block-cycle-test.html
-fast/css/variables/colors-test.html
-fast/css/variables/declaration-block-test.html
-fast/css/variables/font-test.html
-fast/css/variables/image-test.html
-fast/css/variables/import-test.html
-fast/css/variables/inline-style-test.html
-fast/css/variables/invalid-variable-test.html
-fast/css/variables/margin-test.html
-fast/css/variables/misplaced-import-test.html
-fast/css/variables/misplaced-variables-test.html
-fast/css/variables/multiple-blocks-test.html
-fast/css/variables/multiple-term-test.html
-fast/css/variables/override-test.html
-fast/css/variables/print-test.html
-fast/css/variables/remove-variable-test.html
-fast/css/variables/set-variable-test.html
-fast/css/variables/shorthand-test.html
-fast/css/variables/variable-iteration-test.html
fast/css/vertical-align-lengths.html
fast/css/visibility-hit-test.html
fast/css/word-space-extra.html
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index d0cbd49..ce4e5a0 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -68,8 +68,6 @@ GEN := \
$(intermediates)/css/JSCSSUnknownRule.h \
$(intermediates)/css/JSCSSValue.h \
$(intermediates)/css/JSCSSValueList.h \
- $(intermediates)/css/JSCSSVariablesDeclaration.h \
- $(intermediates)/css/JSCSSVariablesRule.h \
$(intermediates)/css/JSCounter.h \
$(intermediates)/css/JSMediaList.h \
$(intermediates)/css/JSRGBColor.h \
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 3edea16..4c45a0e 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -49,8 +49,6 @@ GEN := \
$(intermediates)/bindings/V8CSSUnknownRule.h \
$(intermediates)/bindings/V8CSSValue.h \
$(intermediates)/bindings/V8CSSValueList.h \
- $(intermediates)/bindings/V8CSSVariablesDeclaration.h \
- $(intermediates)/bindings/V8CSSVariablesRule.h \
$(intermediates)/bindings/V8Counter.h \
$(intermediates)/bindings/V8MediaList.h \
$(intermediates)/bindings/V8Rect.h \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index b64e32b..cc490ee 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -65,9 +65,6 @@ LOCAL_SRC_FILES := \
css/CSSTimingFunctionValue.cpp \
css/CSSUnicodeRangeValue.cpp \
css/CSSValueList.cpp \
- css/CSSVariableDependentValue.cpp \
- css/CSSVariablesDeclaration.cpp \
- css/CSSVariablesRule.cpp \
css/FontFamilyValue.cpp \
css/FontValue.cpp \
css/Media.cpp \
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 9317687..08f8809 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -128,8 +128,6 @@ SET(WebCore_IDL_FILES
css/CSSStyleSheet.idl
css/CSSValue.idl
css/CSSValueList.idl
- css/CSSVariablesDeclaration.idl
- css/CSSVariablesRule.idl
css/MediaList.idl
css/Rect.idl
css/RGBColor.idl
@@ -758,9 +756,6 @@ SET(WebCore_SOURCES
css/CSSTimingFunctionValue.cpp
css/CSSUnicodeRangeValue.cpp
css/CSSValueList.cpp
- css/CSSVariableDependentValue.cpp
- css/CSSVariablesDeclaration.cpp
- css/CSSVariablesRule.cpp
css/FontFamilyValue.cpp
css/FontValue.cpp
css/MediaFeatureNames.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8599ae2..75f3d4c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,89 @@
+2010-11-16 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by Dave Hyatt.
+
+ https://bugs.webkit.org/show_bug.cgi?id=49483
+ Remove CSS Variable support
+
+ * Android.derived.jscbindings.mk:
+ * Android.derived.v8bindings.mk:
+ * Android.mk:
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pri:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSCSSRuleCustom.cpp:
+ (WebCore::toJS):
+ * bindings/v8/custom/V8DOMWindowCustom.cpp
+ * bindings/objc/DOMCSS.mm:
+ (kitClass):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * css/CSSGrammar.y:
+ * css/CSSMutableStyleDeclaration.cpp:
+ (WebCore::CSSMutableStyleDeclaration::CSSMutableStyleDeclaration):
+ (WebCore::CSSMutableStyleDeclaration::removeProperty):
+ (WebCore::CSSMutableStyleDeclaration::addParsedProperties):
+ (WebCore::CSSMutableStyleDeclaration::copy):
+ * css/CSSMutableStyleDeclaration.h:
+ (WebCore::CSSMutableStyleDeclaration::create):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::CSSParser):
+ (WebCore::CSSParser::~CSSParser):
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::lex):
+ (WebCore::CSSParser::recheckAtKeyword):
+ (WebCore::CSSParser::text):
+ (WebCore::CSSParser::createMediaRule):
+ (WebCore::CSSParser::createKeyframesRule):
+ (WebCore::CSSParser::createStyleRule):
+ (WebCore::CSSParser::createFontFaceRule):
+ (WebCore::CSSParser::addNamespace):
+ (WebCore::CSSParser::createPageRule):
+ * css/CSSParser.h:
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserValueList::addValue):
+ (WebCore::CSSParserValueList::deleteValueAt):
+ (WebCore::CSSParserValue::createCSSValue):
+ * css/CSSParserValues.h:
+ (WebCore::CSSParserValueList::CSSParserValueList):
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::cleanup):
+ (WebCore::CSSPrimitiveValue::getStringValue):
+ (WebCore::CSSPrimitiveValue::cssText):
+ (WebCore::CSSPrimitiveValue::parserValue):
+ * css/CSSPrimitiveValue.h:
+ * css/CSSProperty.cpp:
+ (WebCore::CSSProperty::cssText):
+ * css/CSSPropertyNames.in:
+ * css/CSSRule.h:
+ * css/CSSRule.idl:
+ * css/CSSStyleDeclaration.cpp:
+ (WebCore::CSSStyleDeclaration::copyPropertiesInSet):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::addMatchedDeclaration):
+ (WebCore::CSSRuleSet::addRulesFromSheet):
+ (WebCore::CSSStyleSelector::applyProperty):
+ * css/CSSStyleSelector.h:
+ * css/CSSValue.h:
+ * css/CSSVariableDependentValue.cpp: Removed.
+ * css/CSSVariableDependentValue.h: Removed.
+ * css/CSSVariablesDeclaration.cpp: Removed.
+ * css/CSSVariablesDeclaration.h: Removed.
+ * css/CSSVariablesDeclaration.idl: Removed.
+ * css/CSSVariablesRule.cpp: Removed.
+ * css/CSSVariablesRule.h: Removed.
+ * css/CSSVariablesRule.idl: Removed.
+ * css/StyleBase.h:
+ (WebCore::StyleBase::isMediaRule):
+ * css/tokenizer.flex:
+ * page/DOMWindow.idl:
+
2010-11-16 Darin Adler <darin at apple.com>
Reviewed by Sam Weinig.
@@ -1532,6 +1618,7 @@
Reviewed by Simon Fraser.
https://bugs.webkit.org/show_bug.cgi?id=49473
+ WebKitCSSMatrix shouldn't inherit from StyleBase
No change in behavior, so no tests.
diff --git a/WebCore/DerivedSources.make b/WebCore/DerivedSources.make
index b62f830..1b6a266 100644
--- a/WebCore/DerivedSources.make
+++ b/WebCore/DerivedSources.make
@@ -73,8 +73,6 @@ DOM_CLASSES = \
CSSUnknownRule \
CSSValue \
CSSValueList \
- CSSVariablesRule \
- CSSVariablesDeclaration \
WebGLActiveInfo \
ArrayBufferView \
ArrayBuffer \
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 09875d5..5dcc468 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -182,10 +182,6 @@ webcore_built_sources += \
DerivedSources/WebCore/JSCSSValue.h \
DerivedSources/WebCore/JSCSSValueList.cpp \
DerivedSources/WebCore/JSCSSValueList.h \
- DerivedSources/WebCore/JSCSSVariablesDeclaration.cpp \
- DerivedSources/WebCore/JSCSSVariablesDeclaration.h \
- DerivedSources/WebCore/JSCSSVariablesRule.cpp \
- DerivedSources/WebCore/JSCSSVariablesRule.h \
DerivedSources/WebCore/JSCustomEvent.cpp \
DerivedSources/WebCore/JSCustomEvent.h \
DerivedSources/WebCore/JSDataGridColumn.cpp \
@@ -987,12 +983,6 @@ webcore_sources += \
WebCore/css/CSSValue.h \
WebCore/css/CSSValueList.cpp \
WebCore/css/CSSValueList.h \
- WebCore/css/CSSVariableDependentValue.cpp \
- WebCore/css/CSSVariableDependentValue.h \
- WebCore/css/CSSVariablesDeclaration.cpp \
- WebCore/css/CSSVariablesDeclaration.h \
- WebCore/css/CSSVariablesRule.cpp \
- WebCore/css/CSSVariablesRule.h \
WebCore/css/DashboardRegion.h \
WebCore/css/FontFamilyValue.cpp \
WebCore/css/FontFamilyValue.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 216b557..4dfefc0 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -15,8 +15,6 @@
'css/CSSUnknownRule.idl',
'css/CSSValue.idl',
'css/CSSValueList.idl',
- 'css/CSSVariablesDeclaration.idl',
- 'css/CSSVariablesRule.idl',
'css/Counter.idl',
'css/MediaList.idl',
'css/Rect.idl',
@@ -1052,12 +1050,6 @@
'css/CSSValue.h',
'css/CSSValueList.cpp',
'css/CSSValueList.h',
- 'css/CSSVariableDependentValue.cpp',
- 'css/CSSVariableDependentValue.h',
- 'css/CSSVariablesDeclaration.cpp',
- 'css/CSSVariablesDeclaration.h',
- 'css/CSSVariablesRule.cpp',
- 'css/CSSVariablesRule.h',
'css/Counter.h',
'css/DashboardRegion.h',
'css/FontFamilyValue.cpp',
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index cc0393c..ec213d6 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -83,8 +83,6 @@ IDL_BINDINGS += \
css/CSSStyleSheet.idl \
css/CSSValue.idl \
css/CSSValueList.idl \
- css/CSSVariablesDeclaration.idl \
- css/CSSVariablesRule.idl \
css/MediaList.idl \
css/Rect.idl \
css/RGBColor.idl \
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 737304b..3b0b395 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -644,9 +644,6 @@ SOURCES += \
css/CSSTimingFunctionValue.cpp \
css/CSSUnicodeRangeValue.cpp \
css/CSSValueList.cpp \
- css/CSSVariableDependentValue.cpp \
- css/CSSVariablesDeclaration.cpp \
- css/CSSVariablesRule.cpp \
css/FontFamilyValue.cpp \
css/FontValue.cpp \
css/MediaFeatureNames.cpp \
@@ -1563,9 +1560,6 @@ HEADERS += \
css/CSSTimingFunctionValue.h \
css/CSSUnicodeRangeValue.h \
css/CSSValueList.h \
- css/CSSVariableDependentValue.h \
- css/CSSVariablesDeclaration.h \
- css/CSSVariablesRule.h \
css/FontFamilyValue.h \
css/FontValue.h \
css/MediaFeatureNames.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 9f90d8e..b0a1b1b 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -2480,118 +2480,6 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesDeclaration.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesDeclaration.h"
- >
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesRule.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCSSVariablesRule.h"
- >
- </File>
- <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCustomEvent.cpp"
>
<FileConfiguration
@@ -30596,30 +30484,6 @@
>
</File>
<File
- RelativePath="..\css\CSSVariableDependentValue.cpp"
- >
- </File>
- <File
- RelativePath="..\css\CSSVariableDependentValue.h"
- >
- </File>
- <File
- RelativePath="..\css\CSSVariablesDeclaration.cpp"
- >
- </File>
- <File
- RelativePath="..\css\CSSVariablesDeclaration.h"
- >
- </File>
- <File
- RelativePath="..\css\CSSVariablesRule.cpp"
- >
- </File>
- <File
- RelativePath="..\css\CSSVariablesRule.h"
- >
- </File>
- <File
RelativePath="..\css\DashboardRegion.h"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 78a9a90..792d5e5 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -4915,16 +4915,6 @@
BC64B4DA0CB4298A005F2B62 /* CSSFontFaceSrcValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64B4D20CB4298A005F2B62 /* CSSFontFaceSrcValue.h */; };
BC64B4DB0CB4298A005F2B62 /* CSSFontSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */; };
BC64B4DC0CB4298A005F2B62 /* CSSFontSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64B4D40CB4298A005F2B62 /* CSSFontSelector.h */; };
- BC686C7C0E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC686C780E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp */; };
- BC686C7D0E0C330100DE8A08 /* JSCSSVariablesDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686C790E0C330100DE8A08 /* JSCSSVariablesDeclaration.h */; };
- BC686C7E0E0C330100DE8A08 /* JSCSSVariablesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC686C7A0E0C330100DE8A08 /* JSCSSVariablesRule.cpp */; };
- BC686C7F0E0C330100DE8A08 /* JSCSSVariablesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686C7B0E0C330100DE8A08 /* JSCSSVariablesRule.h */; };
- BC686CB20E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686CAC0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h */; };
- BC686CB30E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC686CAD0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm */; };
- BC686CB50E0C343900DE8A08 /* DOMCSSVariablesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686CAF0E0C343900DE8A08 /* DOMCSSVariablesRule.h */; };
- BC686CB60E0C343900DE8A08 /* DOMCSSVariablesRule.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC686CB00E0C343900DE8A08 /* DOMCSSVariablesRule.mm */; };
- BC686CBB0E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686CB90E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h */; };
- BC686CBC0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC686CBA0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h */; };
BC6932730D7E293900AE44D1 /* JSDOMWindowBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */; };
BC6932740D7E293900AE44D1 /* JSDOMWindowBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC6C49F30D7DBA0500FFA558 /* JSImageConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6C49F10D7DBA0500FFA558 /* JSImageConstructor.cpp */; };
@@ -5092,12 +5082,6 @@
BCCBAD3B0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */; };
BCCBAD400C18C14200CE890F /* JSHTMLCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */; };
BCCBAD410C18C14200CE890F /* JSHTMLCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBAD3F0C18C14200CE890F /* JSHTMLCollection.h */; };
- BCCBE68A0E06E60D00EAFA8E /* CSSVariablesDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBE6870E06E60D00EAFA8E /* CSSVariablesDeclaration.h */; };
- BCCBE68B0E06E60D00EAFA8E /* CSSVariablesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBE6880E06E60D00EAFA8E /* CSSVariablesRule.cpp */; };
- BCCBE68C0E06E60D00EAFA8E /* CSSVariablesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBE6890E06E60D00EAFA8E /* CSSVariablesRule.h */; };
- BCCBE69B0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBE69A0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp */; };
- BCCBE7B20E07159A00EAFA8E /* CSSVariableDependentValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBE7B10E07159A00EAFA8E /* CSSVariableDependentValue.h */; };
- BCCBE7B50E07166900EAFA8E /* CSSVariableDependentValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBE7B40E07166900EAFA8E /* CSSVariableDependentValue.cpp */; };
BCCD74DC0A4C8D35005FDA6D /* HTMLViewSourceDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */; };
BCCD74E50A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */; };
BCCFBAE80B5152ED0001F1D7 /* DocumentParser.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -10953,16 +10937,6 @@
BC64B4D20CB4298A005F2B62 /* CSSFontFaceSrcValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontFaceSrcValue.h; sourceTree = "<group>"; };
BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontSelector.cpp; sourceTree = "<group>"; };
BC64B4D40CB4298A005F2B62 /* CSSFontSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontSelector.h; sourceTree = "<group>"; };
- BC686C780E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSVariablesDeclaration.cpp; sourceTree = "<group>"; };
- BC686C790E0C330100DE8A08 /* JSCSSVariablesDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSVariablesDeclaration.h; sourceTree = "<group>"; };
- BC686C7A0E0C330100DE8A08 /* JSCSSVariablesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSVariablesRule.cpp; sourceTree = "<group>"; };
- BC686C7B0E0C330100DE8A08 /* JSCSSVariablesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSVariablesRule.h; sourceTree = "<group>"; };
- BC686CAC0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSVariablesDeclaration.h; sourceTree = "<group>"; };
- BC686CAD0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSSVariablesDeclaration.mm; sourceTree = "<group>"; };
- BC686CAF0E0C343900DE8A08 /* DOMCSSVariablesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSVariablesRule.h; sourceTree = "<group>"; };
- BC686CB00E0C343900DE8A08 /* DOMCSSVariablesRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSSVariablesRule.mm; sourceTree = "<group>"; };
- BC686CB90E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSVariablesDeclarationInternal.h; sourceTree = "<group>"; };
- BC686CBA0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSVariablesRuleInternal.h; sourceTree = "<group>"; };
BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWindowBase.cpp; sourceTree = "<group>"; };
BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowBase.h; sourceTree = "<group>"; };
BC6C49F10D7DBA0500FFA558 /* JSImageConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSImageConstructor.cpp; sourceTree = "<group>"; };
@@ -11144,12 +11118,6 @@
BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCollectionCustom.cpp; sourceTree = "<group>"; };
BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCollection.cpp; sourceTree = "<group>"; };
BCCBAD3F0C18C14200CE890F /* JSHTMLCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLCollection.h; sourceTree = "<group>"; };
- BCCBE6870E06E60D00EAFA8E /* CSSVariablesDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariablesDeclaration.h; sourceTree = "<group>"; };
- BCCBE6880E06E60D00EAFA8E /* CSSVariablesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariablesRule.cpp; sourceTree = "<group>"; };
- BCCBE6890E06E60D00EAFA8E /* CSSVariablesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariablesRule.h; sourceTree = "<group>"; };
- BCCBE69A0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariablesDeclaration.cpp; sourceTree = "<group>"; };
- BCCBE7B10E07159A00EAFA8E /* CSSVariableDependentValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariableDependentValue.h; sourceTree = "<group>"; };
- BCCBE7B40E07166900EAFA8E /* CSSVariableDependentValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariableDependentValue.cpp; sourceTree = "<group>"; };
BCCD74DB0A4C8D35005FDA6D /* HTMLViewSourceDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLViewSourceDocument.h; sourceTree = "<group>"; };
BCCD74E40A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLViewSourceDocument.cpp; sourceTree = "<group>"; };
BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DocumentParser.h; sourceTree = "<group>"; };
@@ -13528,10 +13496,6 @@
858C381B0AA8E29600B187A4 /* DOMCSSValue.mm */,
858C383A0AA8ED8200B187A4 /* DOMCSSValueList.h */,
858C383B0AA8ED8200B187A4 /* DOMCSSValueList.mm */,
- BC686CAC0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h */,
- BC686CAD0E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm */,
- BC686CAF0E0C343900DE8A08 /* DOMCSSVariablesRule.h */,
- BC686CB00E0C343900DE8A08 /* DOMCSSVariablesRule.mm */,
858C38A30AA8F20400B187A4 /* DOMRect.h */,
858C38A40AA8F20400B187A4 /* DOMRect.mm */,
855D35890AD707310019AAC7 /* DOMRGBColor.h */,
@@ -14238,8 +14202,6 @@
85909CDB0ACC7A7E00DF01F1 /* DOMCSSUnknownRuleInternal.h */,
85B498F20ADB336A00925CBB /* DOMCSSValueInternal.h */,
85909D280ACC7D5500DF01F1 /* DOMCSSValueListInternal.h */,
- BC686CB90E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h */,
- BC686CBA0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h */,
85E711450AC5D5340053270F /* DOMDocumentFragmentInternal.h */,
85E711460AC5D5340053270F /* DOMDocumentInternal.h */,
85E711470AC5D5340053270F /* DOMDocumentTypeInternal.h */,
@@ -15831,10 +15793,6 @@
14CF78A509F58CD800EB3665 /* JSCSSValue.h */,
A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */,
A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */,
- BC686C780E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp */,
- BC686C790E0C330100DE8A08 /* JSCSSVariablesDeclaration.h */,
- BC686C7A0E0C330100DE8A08 /* JSCSSVariablesRule.cpp */,
- BC686C7B0E0C330100DE8A08 /* JSCSSVariablesRule.h */,
BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */,
BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */,
BCFE2F0F0C1B58370020235F /* JSRect.cpp */,
@@ -17815,12 +17773,6 @@
A80E6CBA0A1989CA007FB8C5 /* CSSValueList.cpp */,
A80E6CBF0A1989CA007FB8C5 /* CSSValueList.h */,
A8D0651C0A23C1FE005E7203 /* CSSValueList.idl */,
- BCCBE7B40E07166900EAFA8E /* CSSVariableDependentValue.cpp */,
- BCCBE7B10E07159A00EAFA8E /* CSSVariableDependentValue.h */,
- BCCBE69A0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp */,
- BCCBE6870E06E60D00EAFA8E /* CSSVariablesDeclaration.h */,
- BCCBE6880E06E60D00EAFA8E /* CSSVariablesRule.cpp */,
- BCCBE6890E06E60D00EAFA8E /* CSSVariablesRule.h */,
A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */,
FE49EF970DC51462004266E1 /* DashboardSupportCSSPropertyNames.in */,
A80E6CC20A1989CA007FB8C5 /* FontFamilyValue.cpp */,
@@ -18746,9 +18698,6 @@
A80E6CEE0A1989CA007FB8C5 /* CSSValue.h in Headers */,
6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */,
A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
- BCCBE7B20E07159A00EAFA8E /* CSSVariableDependentValue.h in Headers */,
- BCCBE68A0E06E60D00EAFA8E /* CSSVariablesDeclaration.h in Headers */,
- BCCBE68C0E06E60D00EAFA8E /* CSSVariablesRule.h in Headers */,
93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
BC2272AD0E82E8F300E7F975 /* CursorList.h in Headers */,
@@ -18862,10 +18811,6 @@
85B498F30ADB336A00925CBB /* DOMCSSValueInternal.h in Headers */,
858C383C0AA8ED8200B187A4 /* DOMCSSValueList.h in Headers */,
85909D2B0ACC7D5500DF01F1 /* DOMCSSValueListInternal.h in Headers */,
- BC686CB20E0C343900DE8A08 /* DOMCSSVariablesDeclaration.h in Headers */,
- BC686CBB0E0C349D00DE8A08 /* DOMCSSVariablesDeclarationInternal.h in Headers */,
- BC686CB50E0C343900DE8A08 /* DOMCSSVariablesRule.h in Headers */,
- BC686CBC0E0C349D00DE8A08 /* DOMCSSVariablesRuleInternal.h in Headers */,
E10B9CCC0B747A44003ED890 /* DOMCustomXPathNSResolver.h in Headers */,
BC7DAAEF0FF9615D00CE0138 /* DOMDataGridDataSource.h in Headers */,
85ACABB00A9CAF8000671E90 /* DOMDocument.h in Headers */,
@@ -20006,8 +19951,6 @@
BCC5BE010C0E93110011C2DB /* JSCSSStyleSheet.h in Headers */,
14CF78A609F58CD800EB3665 /* JSCSSValue.h in Headers */,
A8D05FAC0A23B30F005E7203 /* JSCSSValueList.h in Headers */,
- BC686C7D0E0C330100DE8A08 /* JSCSSVariablesDeclaration.h in Headers */,
- BC686C7F0E0C330100DE8A08 /* JSCSSVariablesRule.h in Headers */,
E4778B80115A581A00B5D372 /* JSCustomEvent.h in Headers */,
FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */,
FE80D7AA0E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h in Headers */,
@@ -21885,9 +21828,6 @@
371F53EA0D2704F900ECE0D5 /* CSSUnicodeRangeValue.cpp in Sources */,
1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */,
A80E6CE40A1989CA007FB8C5 /* CSSValueList.cpp in Sources */,
- BCCBE7B50E07166900EAFA8E /* CSSVariableDependentValue.cpp in Sources */,
- BCCBE69B0E06F51000EAFA8E /* CSSVariablesDeclaration.cpp in Sources */,
- BCCBE68B0E06E60D00EAFA8E /* CSSVariablesRule.cpp in Sources */,
E11AF15111B9A1A300805103 /* Cursor.cpp in Sources */,
93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
62CD32591157E57C0063B0A7 /* CustomEvent.cpp in Sources */,
@@ -21960,8 +21900,6 @@
85032DEA0AA8C9BE007D3B7D /* DOMCSSUnknownRule.mm in Sources */,
858C381D0AA8E29600B187A4 /* DOMCSSValue.mm in Sources */,
858C383D0AA8ED8200B187A4 /* DOMCSSValueList.mm in Sources */,
- BC686CB30E0C343900DE8A08 /* DOMCSSVariablesDeclaration.mm in Sources */,
- BC686CB60E0C343900DE8A08 /* DOMCSSVariablesRule.mm in Sources */,
E10B9CCD0B747A44003ED890 /* DOMCustomXPathNSResolver.mm in Sources */,
BC7DAAEE0FF9615D00CE0138 /* DOMDataGridDataSource.cpp in Sources */,
85ACABB10A9CAF8000671E90 /* DOMDocument.mm in Sources */,
@@ -22636,8 +22574,6 @@
14CF78A409F58CBF00EB3665 /* JSCSSValue.cpp in Sources */,
BC20FB7F0C0E8E6C00D1447F /* JSCSSValueCustom.cpp in Sources */,
A8D05FAB0A23B30F005E7203 /* JSCSSValueList.cpp in Sources */,
- BC686C7C0E0C330100DE8A08 /* JSCSSVariablesDeclaration.cpp in Sources */,
- BC686C7E0E0C330100DE8A08 /* JSCSSVariablesRule.cpp in Sources */,
E4778B7F115A581A00B5D372 /* JSCustomEvent.cpp in Sources */,
FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */,
FE80D7A90E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp in Sources */,
diff --git a/WebCore/bindings/js/JSCSSRuleCustom.cpp b/WebCore/bindings/js/JSCSSRuleCustom.cpp
index b0adf15..20b3ab4 100644
--- a/WebCore/bindings/js/JSCSSRuleCustom.cpp
+++ b/WebCore/bindings/js/JSCSSRuleCustom.cpp
@@ -32,14 +32,12 @@
#include "CSSMediaRule.h"
#include "CSSPageRule.h"
#include "CSSStyleRule.h"
-#include "CSSVariablesRule.h"
#include "JSCSSCharsetRule.h"
#include "JSCSSFontFaceRule.h"
#include "JSCSSImportRule.h"
#include "JSCSSMediaRule.h"
#include "JSCSSPageRule.h"
#include "JSCSSStyleRule.h"
-#include "JSCSSVariablesRule.h"
#include "JSWebKitCSSKeyframeRule.h"
#include "JSWebKitCSSKeyframesRule.h"
#include "WebKitCSSKeyframeRule.h"
@@ -77,9 +75,6 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, CSSRule* rule)
case CSSRule::CHARSET_RULE:
wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSCharsetRule, rule);
break;
- case CSSRule::VARIABLES_RULE:
- wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSVariablesRule, rule);
- break;
case CSSRule::WEBKIT_KEYFRAME_RULE:
wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WebKitCSSKeyframeRule, rule);
break;
diff --git a/WebCore/bindings/objc/DOMCSS.mm b/WebCore/bindings/objc/DOMCSS.mm
index 22a9cb2..f12ee4f 100644
--- a/WebCore/bindings/objc/DOMCSS.mm
+++ b/WebCore/bindings/objc/DOMCSS.mm
@@ -42,7 +42,6 @@
#import "DOMCSSUnknownRule.h"
#import "DOMCSSValueInternal.h"
#import "DOMCSSValueList.h"
-#import "DOMCSSVariablesRule.h"
#import "DOMInternal.h"
#import "DOMStyleSheetInternal.h"
#import "DOMWebKitCSSKeyframeRule.h"
@@ -83,8 +82,6 @@ Class kitClass(WebCore::CSSRule* impl)
return [DOMCSSFontFaceRule class];
case DOM_PAGE_RULE:
return [DOMCSSPageRule class];
- case DOM_VARIABLES_RULE:
- return [DOMCSSVariablesRule class];
case DOM_WEBKIT_KEYFRAMES_RULE:
return [DOMWebKitCSSKeyframesRule class];
case DOM_WEBKIT_KEYFRAME_RULE:
diff --git a/WebCore/bindings/scripts/CodeGeneratorJS.pm b/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 07575f7..0e8b424 100644
--- a/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -231,7 +231,7 @@ sub IndexGetterReturnsStrings
{
my $type = shift;
- return 1 if $type eq "CSSStyleDeclaration" or $type eq "MediaList" or $type eq "CSSVariablesDeclaration" or $type eq "DOMStringList" or $type eq "DOMTokenList" or $type eq "DOMSettableTokenList";
+ return 1 if $type eq "CSSStyleDeclaration" or $type eq "MediaList" or $type eq "DOMStringList" or $type eq "DOMTokenList" or $type eq "DOMSettableTokenList";
return 0;
}
diff --git a/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp b/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp
index 90a111c..0dfd954 100644
--- a/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp
@@ -37,7 +37,6 @@
#include "V8CSSMediaRule.h"
#include "V8CSSPageRule.h"
#include "V8CSSStyleRule.h"
-#include "V8CSSVariablesRule.h"
#include "V8WebKitCSSKeyframeRule.h"
#include "V8WebKitCSSKeyframesRule.h"
@@ -60,8 +59,6 @@ v8::Handle<v8::Value> toV8(CSSRule* impl)
return toV8(static_cast<CSSFontFaceRule*>(impl));
case CSSRule::PAGE_RULE:
return toV8(static_cast<CSSPageRule*>(impl));
- case CSSRule::VARIABLES_RULE:
- return toV8(static_cast<CSSVariablesRule*>(impl));
case CSSRule::WEBKIT_KEYFRAME_RULE:
return toV8(static_cast<WebKitCSSKeyframeRule*>(impl));
case CSSRule::WEBKIT_KEYFRAMES_RULE:
diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index 16e2530..cdcd3d6 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -1643,7 +1643,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
case CSSPropertyWebkitTransformOriginY:
case CSSPropertyWebkitTransformOriginZ:
case CSSPropertyWebkitTransition:
- case CSSPropertyWebkitVariableDeclarationBlock:
break;
#if ENABLE(SVG)
case CSSPropertyClipPath:
diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y
index c0139a2..5c77340 100644
--- a/WebCore/css/CSSGrammar.y
+++ b/WebCore/css/CSSGrammar.y
@@ -99,7 +99,7 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
%}
-%expect 56
+%expect 51
%nonassoc LOWEST_PREC
@@ -140,10 +140,6 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
%token WEBKIT_VALUE_SYM
%token WEBKIT_MEDIAQUERY_SYM
%token WEBKIT_SELECTOR_SYM
-%token WEBKIT_VARIABLES_SYM
-%token WEBKIT_DEFINE_SYM
-%token VARIABLES_FOR
-%token WEBKIT_VARIABLES_DECLS_SYM
%token <marginBox> TOPLEFTCORNER_SYM
%token <marginBox> TOPLEFT_SYM
%token <marginBox> TOPCENTER_SYM
@@ -197,8 +193,6 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
%token <string> UNICODERANGE
-%token <string> VARCALL
-
%type <relation> combinator
%type <rule> charset
@@ -219,8 +213,6 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
%type <ruleList> block_rule_list
%type <rule> block_rule
%type <rule> block_valid_rule
-%type <rule> variables_rule
-%type <mediaList> variables_media_list
%type <string> maybe_ns_prefix
@@ -282,12 +274,6 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
%type <string> element_name
%type <string> attr_name
-%type <string> variable_name
-%type <boolean> variables_declaration_list
-%type <boolean> variables_decl_list
-%type <boolean> variables_declaration
-%type <value> variable_reference
-
%%
stylesheet:
@@ -297,7 +283,6 @@ stylesheet:
| webkit_value maybe_space
| webkit_mediaquery maybe_space
| webkit_selector maybe_space
- | webkit_variables_decls maybe_space
| webkit_keyframe_rule maybe_space
;
@@ -319,12 +304,6 @@ webkit_decls:
}
;
-webkit_variables_decls:
- WEBKIT_VARIABLES_DECLS_SYM '{' maybe_space variables_declaration_list '}' {
- /* can be empty */
- }
-;
-
webkit_value:
WEBKIT_VALUE_SYM '{' maybe_space expr '}' {
CSSParser* p = static_cast<CSSParser*>(parser);
@@ -417,7 +396,6 @@ valid_rule:
| keyframes
| namespace
| import
- | variables_rule
;
rule:
@@ -454,7 +432,6 @@ block_rule:
| invalid_at
| namespace
| import
- | variables_rule
| media
;
@@ -474,109 +451,6 @@ import:
}
;
-variables_rule:
- WEBKIT_VARIABLES_SYM maybe_space maybe_media_list '{' maybe_space variables_declaration_list '}' {
- $$ = static_cast<CSSParser*>(parser)->createVariablesRule($3, true);
- }
- |
- WEBKIT_DEFINE_SYM maybe_space variables_media_list '{' maybe_space variables_declaration_list '}' {
- $$ = static_cast<CSSParser*>(parser)->createVariablesRule($3, false);
- }
- ;
-
-variables_media_list:
- /* empty */ {
- $$ = static_cast<CSSParser*>(parser)->createMediaList();
- }
- |
- VARIABLES_FOR WHITESPACE media_list {
- $$ = $3;
- }
- ;
-
-variables_declaration_list:
- variables_declaration {
- $$ = $1;
- }
- | variables_decl_list variables_declaration {
- $$ = $1;
- if ($2)
- $$ = $2;
- }
- | variables_decl_list {
- $$ = $1;
- }
- | error invalid_block_list error {
- $$ = false;
- }
- | error {
- $$ = false;
- }
- | variables_decl_list error {
- $$ = $1;
- }
- ;
-
-variables_decl_list:
- variables_declaration ';' maybe_space {
- $$ = $1;
- }
- | variables_declaration invalid_block_list ';' maybe_space {
- $$ = false;
- }
- | error ';' maybe_space {
- $$ = false;
- }
- | error invalid_block_list error ';' maybe_space {
- $$ = false;
- }
- | variables_decl_list variables_declaration ';' maybe_space {
- $$ = $1;
- if ($2)
- $$ = $2;
- }
- | variables_decl_list error ';' maybe_space {
- $$ = $1;
- }
- | variables_decl_list error invalid_block_list error ';' maybe_space {
- $$ = $1;
- }
- ;
-
-variables_declaration:
- variable_name ':' maybe_space expr {
- $$ = static_cast<CSSParser*>(parser)->addVariable($1, $4);
- }
- |
- variable_name maybe_space '{' maybe_space declaration_list '}' maybe_space {
- $$ = static_cast<CSSParser*>(parser)->addVariableDeclarationBlock($1);
- }
- |
- variable_name error {
- $$ = false;
- }
- |
- variable_name ':' maybe_space error expr {
- $$ = false;
- }
- |
- variable_name ':' maybe_space {
- /* @variables { varname: } Just reduce away this variable with no value. */
- $$ = false;
- }
- |
- variable_name ':' maybe_space error {
- /* if we come across rules with invalid values like this case: @variables { varname: *; }, just discard the property/value pair */
- $$ = false;
- }
- ;
-
-variable_name:
- IDENT maybe_space {
- $$ = $1;
- }
- ;
-
namespace:
NAMESPACE_SYM maybe_space maybe_ns_prefix string_or_uri maybe_space ';' {
static_cast<CSSParser*>(parser)->addNamespace($3, $4);
@@ -1432,18 +1306,6 @@ declaration:
p->markPropertyEnd($5, isPropertyParsed);
}
|
- variable_reference maybe_space {
- CSSParser* p = static_cast<CSSParser*>(parser);
- p->m_valueList = new CSSParserValueList;
- p->m_valueList->addValue(p->sinkFloatingValue($1));
- int oldParsedProperties = p->m_numParsedProperties;
- $$ = p->parseValue(CSSPropertyWebkitVariableDeclarationBlock, false);
- if (!$$)
- p->rollbackLastProperties(p->m_numParsedProperties - oldParsedProperties);
- delete p->m_valueList;
- p->m_valueList = 0;
- }
- |
property error {
$$ = false;
}
@@ -1563,9 +1425,6 @@ term:
| function {
$$ = $1;
}
- | variable_reference maybe_space {
- $$ = $1;
- }
| '%' maybe_space { /* Handle width: %; */
$$.id = 0; $$.unit = 0;
}
@@ -1602,14 +1461,6 @@ unary_term:
}
;
-variable_reference:
- VARCALL {
- $$.id = 0;
- $$.string = $1;
- $$.unit = CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX;
- }
- ;
-
function:
FUNCTION maybe_space expr ')' maybe_space {
CSSParser* p = static_cast<CSSParser*>(parser);
diff --git a/WebCore/css/CSSMutableStyleDeclaration.cpp b/WebCore/css/CSSMutableStyleDeclaration.cpp
index 02319f5..47809c2 100644
--- a/WebCore/css/CSSMutableStyleDeclaration.cpp
+++ b/WebCore/css/CSSMutableStyleDeclaration.cpp
@@ -39,7 +39,6 @@ namespace WebCore {
CSSMutableStyleDeclaration::CSSMutableStyleDeclaration()
: m_node(0)
- , m_variableDependentValueCount(0)
, m_strictParsing(false)
#ifndef NDEBUG
, m_iteratorCount(0)
@@ -50,7 +49,6 @@ CSSMutableStyleDeclaration::CSSMutableStyleDeclaration()
CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent)
: CSSStyleDeclaration(parent)
, m_node(0)
- , m_variableDependentValueCount(0)
, m_strictParsing(!parent || parent->useStrictParsing())
#ifndef NDEBUG
, m_iteratorCount(0)
@@ -58,11 +56,10 @@ CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent)
{
}
-CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const Vector<CSSProperty>& properties, unsigned variableDependentValueCount)
+CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const Vector<CSSProperty>& properties)
: CSSStyleDeclaration(parent)
, m_properties(properties)
, m_node(0)
- , m_variableDependentValueCount(variableDependentValueCount)
, m_strictParsing(!parent || parent->useStrictParsing())
#ifndef NDEBUG
, m_iteratorCount(0)
@@ -75,7 +72,6 @@ CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const Ve
CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const CSSProperty* const * properties, int numProperties)
: CSSStyleDeclaration(parent)
, m_node(0)
- , m_variableDependentValueCount(0)
, m_strictParsing(!parent || parent->useStrictParsing())
#ifndef NDEBUG
, m_iteratorCount(0)
@@ -86,9 +82,7 @@ CSSMutableStyleDeclaration::CSSMutableStyleDeclaration(CSSRule* parent, const CS
for (int i = 0; i < numProperties; ++i) {
const CSSProperty *property = properties[i];
ASSERT(property);
- if (property->value()->isVariableDependentValue())
- m_variableDependentValueCount++;
- else if (candidates.contains(property->id()))
+ if (candidates.contains(property->id()))
removeProperty(properties[i]->id(), false);
m_properties.append(*property);
if (!getPropertyPriority(property->id()) && !property->isImportant())
@@ -457,9 +451,6 @@ String CSSMutableStyleDeclaration::removeProperty(int propertyID, bool notifyCha
String value = returnText ? foundProperty->value()->cssText() : String();
- if (foundProperty->value()->isVariableDependentValue())
- m_variableDependentValueCount--;
-
// A more efficient removal strategy would involve marking entries as empty
// and sweeping them when the vector grows too big.
m_properties.remove(foundProperty - m_properties.data());
@@ -609,8 +600,6 @@ void CSSMutableStyleDeclaration::addParsedProperties(const CSSProperty* const* p
removeProperty(properties[i]->id(), false);
ASSERT(properties[i]);
m_properties.append(*properties[i]);
- if (properties[i]->value()->isVariableDependentValue())
- m_variableDependentValueCount++;
}
}
// FIXME: This probably should have a call to setNeedsStyleRecalc() if something changed. We may also wish to add
@@ -821,7 +810,7 @@ PassRefPtr<CSSMutableStyleDeclaration> CSSMutableStyleDeclaration::makeMutable()
PassRefPtr<CSSMutableStyleDeclaration> CSSMutableStyleDeclaration::copy() const
{
- return adoptRef(new CSSMutableStyleDeclaration(0, m_properties, m_variableDependentValueCount));
+ return adoptRef(new CSSMutableStyleDeclaration(0, m_properties));
}
const CSSProperty* CSSMutableStyleDeclaration::findPropertyWithId(int propertyID) const
diff --git a/WebCore/css/CSSMutableStyleDeclaration.h b/WebCore/css/CSSMutableStyleDeclaration.h
index d629bcf..72536b6 100644
--- a/WebCore/css/CSSMutableStyleDeclaration.h
+++ b/WebCore/css/CSSMutableStyleDeclaration.h
@@ -69,9 +69,9 @@ public:
{
return adoptRef(new CSSMutableStyleDeclaration(parentRule, properties, numProperties));
}
- static PassRefPtr<CSSMutableStyleDeclaration> create(const Vector<CSSProperty>& properties, unsigned variableDependentValueCount)
+ static PassRefPtr<CSSMutableStyleDeclaration> create(const Vector<CSSProperty>& properties)
{
- return adoptRef(new CSSMutableStyleDeclaration(0, properties, variableDependentValueCount));
+ return adoptRef(new CSSMutableStyleDeclaration(0, properties));
}
CSSMutableStyleDeclaration& operator=(const CSSMutableStyleDeclaration&);
@@ -131,8 +131,6 @@ public:
void merge(CSSMutableStyleDeclaration*, bool argOverridesOnConflict = true);
- bool hasVariableDependentValue() const { return m_variableDependentValueCount > 0; }
-
void setStrictParsing(bool b) { m_strictParsing = b; }
bool useStrictParsing() const { return m_strictParsing; }
@@ -143,7 +141,7 @@ protected:
private:
CSSMutableStyleDeclaration();
- CSSMutableStyleDeclaration(CSSRule* parentRule, const Vector<CSSProperty>&, unsigned variableDependentValueCount);
+ CSSMutableStyleDeclaration(CSSRule* parentRule, const Vector<CSSProperty>&);
CSSMutableStyleDeclaration(CSSRule* parentRule, const CSSProperty* const *, int numProperties);
virtual PassRefPtr<CSSMutableStyleDeclaration> makeMutable();
@@ -164,7 +162,6 @@ private:
Vector<CSSProperty, 4> m_properties;
Node* m_node;
- unsigned m_variableDependentValueCount : 24;
bool m_strictParsing : 1;
#ifndef NDEBUG
unsigned m_iteratorCount : 4;
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index c2f80d4..836113e 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -53,9 +53,6 @@
#include "CSSUnicodeRangeValue.h"
#include "CSSValueKeywords.h"
#include "CSSValueList.h"
-#include "CSSVariableDependentValue.h"
-#include "CSSVariablesDeclaration.h"
-#include "CSSVariablesRule.h"
#include "Counter.h"
#include "Document.h"
#include "FloatConversion.h"
@@ -154,7 +151,6 @@ CSSParser::CSSParser(bool strictParsing)
, m_lineNumber(0)
, m_lastSelectorLineNumber(0)
, m_allowImportRules(true)
- , m_allowVariablesRules(true)
, m_allowNamespaceDeclarations(true)
{
#if YYDEBUG > 0
@@ -168,8 +164,6 @@ CSSParser::~CSSParser()
clearProperties();
fastFree(m_parsedProperties);
- clearVariables();
-
delete m_valueList;
fastFree(m_data);
@@ -598,14 +592,6 @@ bool CSSParser::parseValue(int propId, bool important)
return true;
}
- // If we have any variables, then we don't parse the list of values yet. We add them to the declaration
- // as unresolved, and allow them to be parsed later. The parse is considered "successful" for now, even though
- // it might ultimately fail once the variable has been resolved.
- if (!inShorthand() && checkForVariables(m_valueList)) {
- addUnresolvedProperty(propId, important);
- return true;
- }
-
bool validPrimitive = false;
RefPtr<CSSValue> parsedValue;
@@ -1772,7 +1758,6 @@ bool CSSParser::parseValue(int propId, bool important)
case CSSPropertyTextLineThrough:
case CSSPropertyTextOverline:
case CSSPropertyTextUnderline:
- case CSSPropertyWebkitVariableDeclarationBlock:
return false;
#if ENABLE(WCSS)
case CSSPropertyWapInputFormat:
@@ -5118,7 +5103,6 @@ int CSSParser::lex(void* yylvalWithoutType)
case UNICODERANGE:
case FUNCTION:
case NOTFUNCTION:
- case VARCALL:
yylval->string.characters = t;
yylval->string.length = length;
break;
@@ -5189,7 +5173,6 @@ void CSSParser::recheckAtKeyword(const UChar* str, int len)
yyTok = WEBKIT_KEYFRAMES_SYM;
else if (equalIgnoringCase(ruleName, "@-webkit-mediaquery"))
yyTok = WEBKIT_MEDIAQUERY_SYM;
- // FIXME: Add CSS Variables if we ever decide to turn it back on.
}
UChar* CSSParser::text(int *length)
@@ -5224,19 +5207,6 @@ UChar* CSSParser::text(int *length)
l -= 2;
}
break;
- case VARCALL:
- // "-webkit-var("{w}{ident}{w}")"
- // strip "-webkit-var(" and ")"
- start += 12;
- l -= 13;
- // strip {w}
- while (l && isHTMLSpace(*start)) {
- ++start;
- --l;
- }
- while (l && isHTMLSpace(start[l - 1]))
- --l;
- break;
default:
break;
}
@@ -5459,7 +5429,7 @@ CSSRule* CSSParser::createMediaRule(MediaList* media, CSSRuleList* rules)
{
if (!media || !rules || !m_styleSheet)
return 0;
- m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
+ m_allowImportRules = m_allowNamespaceDeclarations = false;
RefPtr<CSSMediaRule> rule = CSSMediaRule::create(m_styleSheet, media, rules);
CSSMediaRule* result = rule.get();
m_parsedStyleObjects.append(rule.release());
@@ -5477,7 +5447,7 @@ CSSRuleList* CSSParser::createRuleList()
WebKitCSSKeyframesRule* CSSParser::createKeyframesRule()
{
- m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
+ m_allowImportRules = m_allowNamespaceDeclarations = false;
RefPtr<WebKitCSSKeyframesRule> rule = WebKitCSSKeyframesRule::create(m_styleSheet);
WebKitCSSKeyframesRule* rulePtr = rule.get();
m_parsedStyleObjects.append(rule.release());
@@ -5486,7 +5456,7 @@ WebKitCSSKeyframesRule* CSSParser::createKeyframesRule()
CSSRule* CSSParser::createStyleRule(Vector<CSSSelector*>* selectors)
{
- m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
+ m_allowImportRules = m_allowNamespaceDeclarations = false;
CSSStyleRule* result = 0;
markRuleBodyEnd();
if (selectors) {
@@ -5514,7 +5484,7 @@ CSSRule* CSSParser::createStyleRule(Vector<CSSSelector*>* selectors)
CSSRule* CSSParser::createFontFaceRule()
{
- m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
+ m_allowImportRules = m_allowNamespaceDeclarations = false;
RefPtr<CSSFontFaceRule> rule = CSSFontFaceRule::create(m_styleSheet);
for (unsigned i = 0; i < m_numParsedProperties; ++i) {
CSSProperty* property = m_parsedProperties[i];
@@ -5537,70 +5507,13 @@ void CSSParser::addNamespace(const AtomicString& prefix, const AtomicString& uri
if (!m_styleSheet || !m_allowNamespaceDeclarations)
return;
m_allowImportRules = false;
- m_allowVariablesRules = false;
m_styleSheet->addNamespace(this, prefix, uri);
}
-#if !ENABLE(CSS_VARIABLES)
-
-CSSRule* CSSParser::createVariablesRule(MediaList*, bool)
-{
- return 0;
-}
-
-bool CSSParser::addVariable(const CSSParserString&, CSSParserValueList*)
-{
- return false;
-}
-
-bool CSSParser::addVariableDeclarationBlock(const CSSParserString&)
-{
- return false;
-}
-
-#else
-
-CSSRule* CSSParser::createVariablesRule(MediaList* mediaList, bool variablesKeyword)
-{
- if (!m_allowVariablesRules)
- return 0;
- m_allowImportRules = false;
- RefPtr<CSSVariablesRule> rule = CSSVariablesRule::create(m_styleSheet, mediaList, variablesKeyword);
- rule->setDeclaration(CSSVariablesDeclaration::create(rule.get(), m_variableNames, m_variableValues));
- clearVariables();
- CSSRule* result = rule.get();
- m_parsedStyleObjects.append(rule.release());
- return result;
-}
-
-bool CSSParser::addVariable(const CSSParserString& name, CSSParserValueList* valueList)
-{
- if (checkForVariables(valueList)) {
- delete valueList;
- return false;
- }
- m_variableNames.append(String(name));
- m_variableValues.append(CSSValueList::createFromParserValueList(valueList));
- return true;
-}
-
-bool CSSParser::addVariableDeclarationBlock(const CSSParserString&)
-{
-// FIXME: Disabling declarations as variable values for now since they no longer have a common base class with CSSValues.
-#if 0
- m_variableNames.append(String(name));
- m_variableValues.append(CSSMutableStyleDeclaration::create(0, m_parsedProperties, m_numParsedProperties));
- clearProperties();
-#endif
- return true;
-}
-
-#endif
-
CSSRule* CSSParser::createPageRule(CSSSelector* pageSelector)
{
// FIXME: Margin at-rules are ignored.
- m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false;
+ m_allowImportRules = m_allowNamespaceDeclarations = false;
CSSPageRule* pageRule = 0;
if (pageSelector) {
RefPtr<CSSPageRule> rule = CSSPageRule::create(m_styleSheet, pageSelector, m_lastSelectorLineNumber);
@@ -5635,73 +5548,6 @@ void CSSParser::endDeclarationsForMarginBox()
m_numParsedPropertiesBeforeMarginBox = INVALID_NUM_PARSED_PROPERTIES;
}
-void CSSParser::clearVariables()
-{
- m_variableNames.clear();
- m_variableValues.clear();
-}
-
-bool CSSParser::parseVariable(CSSVariablesDeclaration* declaration, const String& variableName, const String& variableValue)
-{
- m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
-
- String nameValuePair = variableName + ": ";
- nameValuePair += variableValue;
-
- setupParser("@-webkit-variables-decls{", nameValuePair, "} ");
- cssyyparse(this);
- m_rule = 0;
-
- bool ok = false;
- if (m_variableNames.size()) {
- ok = true;
- declaration->addParsedVariable(variableName, m_variableValues[0]);
- }
-
- clearVariables();
-
- return ok;
-}
-
-void CSSParser::parsePropertyWithResolvedVariables(int propId, bool isImportant, CSSMutableStyleDeclaration* declaration, CSSParserValueList* list)
-{
- m_valueList = list;
- m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
-
- if (parseValue(propId, isImportant))
- declaration->addParsedProperties(m_parsedProperties, m_numParsedProperties);
-
- clearProperties();
- m_valueList = 0;
-}
-
-bool CSSParser::checkForVariables(CSSParserValueList* valueList)
-{
- if (!valueList || !valueList->containsVariables())
- return false;
-
- bool hasVariables = false;
- for (unsigned i = 0; i < valueList->size(); ++i) {
- if (valueList->valueAt(i)->isVariable()) {
- hasVariables = true;
- break;
- }
-
- if (valueList->valueAt(i)->unit == CSSParserValue::Function && checkForVariables(valueList->valueAt(i)->function->args.get())) {
- hasVariables = true;
- break;
- }
- }
-
- return hasVariables;
-}
-
-void CSSParser::addUnresolvedProperty(int propId, bool important)
-{
- RefPtr<CSSVariableDependentValue> val = CSSVariableDependentValue::create(CSSValueList::createFromParserValueList(m_valueList));
- addProperty(propId, val.release(), important);
-}
-
void CSSParser::deleteFontFaceOnlyValues()
{
ASSERT(m_hasFontFaceOnlyValues);
diff --git a/WebCore/css/CSSParser.h b/WebCore/css/CSSParser.h
index 8f3c6dd..1da20b7 100644
--- a/WebCore/css/CSSParser.h
+++ b/WebCore/css/CSSParser.h
@@ -45,7 +45,6 @@ namespace WebCore {
class CSSStyleSheet;
class CSSValue;
class CSSValueList;
- class CSSVariablesDeclaration;
class Document;
class MediaList;
class MediaQueryExp;
@@ -161,8 +160,6 @@ namespace WebCore {
PassRefPtr<CSSValueList> parseTransform();
bool parseTransformOrigin(int propId, int& propId1, int& propId2, int& propId3, RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
bool parsePerspectiveOrigin(int propId, int& propId1, int& propId2, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
- bool parseVariable(CSSVariablesDeclaration*, const String& variableName, const String& variableValue);
- void parsePropertyWithResolvedVariables(int propId, bool important, CSSMutableStyleDeclaration*, CSSParserValueList*);
int yyparse();
@@ -186,7 +183,6 @@ namespace WebCore {
CSSRuleList* createRuleList();
CSSRule* createStyleRule(Vector<CSSSelector*>* selectors);
CSSRule* createFontFaceRule();
- CSSRule* createVariablesRule(MediaList*, bool variablesKeyword);
CSSRule* createPageRule(CSSSelector* pageSelector);
CSSRule* createMarginAtRule(CSSSelector::MarginBoxType marginBox);
void startDeclarationsForMarginBox();
@@ -202,10 +198,6 @@ namespace WebCore {
void addNamespace(const AtomicString& prefix, const AtomicString& uri);
- bool addVariable(const CSSParserString&, CSSParserValueList*);
- bool addVariableDeclarationBlock(const CSSParserString&);
- bool checkForVariables(CSSParserValueList*);
- void addUnresolvedProperty(int propId, bool important);
void invalidBlockHit();
Vector<CSSSelector*>* reusableSelectorVector() { return &m_reusableSelectorVector; }
@@ -235,9 +227,6 @@ namespace WebCore {
bool m_hasFontFaceOnlyValues;
bool m_hadSyntacticallyValidCSSRule;
- Vector<String> m_variableNames;
- Vector<RefPtr<CSSValue> > m_variableValues;
-
AtomicString m_defaultNamespace;
// tokenizer methods and data
@@ -270,8 +259,6 @@ namespace WebCore {
void checkForOrphanedUnits();
- void clearVariables();
-
void deleteFontFaceOnlyValues();
enum SizeParameterType {
@@ -299,7 +286,6 @@ namespace WebCore {
int m_lastSelectorLineNumber;
bool m_allowImportRules;
- bool m_allowVariablesRules;
bool m_allowNamespaceDeclarations;
Vector<RefPtr<StyleBase> > m_parsedStyleObjects;
diff --git a/WebCore/css/CSSParserValues.cpp b/WebCore/css/CSSParserValues.cpp
index 55ecb7f..06651f1 100644
--- a/WebCore/css/CSSParserValues.cpp
+++ b/WebCore/css/CSSParserValues.cpp
@@ -26,11 +26,6 @@
namespace WebCore {
-bool CSSParserValue::isVariable() const
-{
- return unit == CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX;
-}
-
CSSParserValueList::~CSSParserValueList()
{
size_t numValues = m_values.size();
@@ -42,15 +37,11 @@ CSSParserValueList::~CSSParserValueList()
void CSSParserValueList::addValue(const CSSParserValue& v)
{
- if (v.unit == CSSPrimitiveValue::CSS_PARSER_VARIABLE_FUNCTION_SYNTAX) // isVariable() is not inlined. This is hot.
- m_variablesCount++;
m_values.append(v);
}
void CSSParserValueList::deleteValueAt(unsigned i)
{
- if (m_values[i].isVariable())
- m_variablesCount--;
m_values.remove(i);
}
@@ -69,7 +60,7 @@ PassRefPtr<CSSValue> CSSParserValue::createCSSValue()
parsedValue = primitiveValue;
} else if (unit == CSSParserValue::Function)
parsedValue = CSSFunctionValue::create(function);
- else if (unit == CSSPrimitiveValue::CSS_STRING || unit == CSSPrimitiveValue::CSS_URI || unit == CSSPrimitiveValue::CSS_PARSER_HEXCOLOR || isVariable())
+ else if (unit == CSSPrimitiveValue::CSS_STRING || unit == CSSPrimitiveValue::CSS_URI || unit == CSSPrimitiveValue::CSS_PARSER_HEXCOLOR)
parsedValue = CSSPrimitiveValue::create(string, (CSSPrimitiveValue::UnitTypes)unit);
else if (unit >= CSSPrimitiveValue::CSS_NUMBER && unit <= CSSPrimitiveValue::CSS_KHZ)
parsedValue = CSSPrimitiveValue::create(fValue, (CSSPrimitiveValue::UnitTypes)unit);
diff --git a/WebCore/css/CSSParserValues.h b/WebCore/css/CSSParserValues.h
index 8644d9b..993ae28 100644
--- a/WebCore/css/CSSParserValues.h
+++ b/WebCore/css/CSSParserValues.h
@@ -55,7 +55,6 @@ struct CSSParserValue {
};
int unit;
- bool isVariable() const;
PassRefPtr<CSSValue> createCSSValue();
};
@@ -64,7 +63,6 @@ class CSSParserValueList : public FastAllocBase {
public:
CSSParserValueList()
: m_current(0)
- , m_variablesCount(0)
{
}
~CSSParserValueList();
@@ -80,11 +78,8 @@ public:
void clear() { m_values.clear(); }
- bool containsVariables() const { return m_variablesCount; }
-
private:
unsigned m_current;
- unsigned m_variablesCount;
Vector<CSSParserValue, 4> m_values;
};
diff --git a/WebCore/css/CSSPrimitiveValue.cpp b/WebCore/css/CSSPrimitiveValue.cpp
index 065c244..e03219a 100644
--- a/WebCore/css/CSSPrimitiveValue.cpp
+++ b/WebCore/css/CSSPrimitiveValue.cpp
@@ -274,7 +274,6 @@ void CSSPrimitiveValue::cleanup()
case CSS_STRING:
case CSS_URI:
case CSS_ATTR:
- case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
case CSS_PARSER_HEXCOLOR:
if (m_value.string)
m_value.string->deref();
@@ -523,7 +522,6 @@ String CSSPrimitiveValue::getStringValue(ExceptionCode& ec) const
case CSS_STRING:
case CSS_ATTR:
case CSS_URI:
- case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
return m_value.string;
case CSS_IDENT:
return valueOrPropertyName(m_value.ident);
@@ -541,7 +539,6 @@ String CSSPrimitiveValue::getStringValue() const
case CSS_STRING:
case CSS_ATTR:
case CSS_URI:
- case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
return m_value.string;
case CSS_IDENT:
return valueOrPropertyName(m_value.ident);
@@ -823,11 +820,6 @@ String CSSPrimitiveValue::cssText() const
}
break;
#endif
- case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
- text = "-webkit-var(";
- text += m_value.string;
- text += ")";
- break;
case CSS_PARSER_OPERATOR: {
char c = static_cast<char>(m_value.ident);
text = String(&c, 1U);
@@ -877,7 +869,6 @@ CSSParserValue CSSPrimitiveValue::parserValue() const
break;
case CSS_STRING:
case CSS_URI:
- case CSS_PARSER_VARIABLE_FUNCTION_SYNTAX:
case CSS_PARSER_HEXCOLOR:
value.string.characters = const_cast<UChar*>(m_value.string->characters());
value.string.length = m_value.string->length();
diff --git a/WebCore/css/CSSPrimitiveValue.h b/WebCore/css/CSSPrimitiveValue.h
index bb3ea70..f3da873 100644
--- a/WebCore/css/CSSPrimitiveValue.h
+++ b/WebCore/css/CSSPrimitiveValue.h
@@ -83,15 +83,14 @@ public:
// These next types are just used internally to allow us to translate back and forth from CSSPrimitiveValues to CSSParserValues.
CSS_PARSER_OPERATOR = 103,
CSS_PARSER_INTEGER = 104,
- CSS_PARSER_VARIABLE_FUNCTION_SYNTAX = 105,
- CSS_PARSER_HEXCOLOR = 106,
+ CSS_PARSER_HEXCOLOR = 105,
// This is used internally for unknown identifiers
- CSS_PARSER_IDENTIFIER = 107,
+ CSS_PARSER_IDENTIFIER = 106,
// These are from CSS3 Values and Units, but that isn't a finished standard yet
- CSS_TURN = 108,
- CSS_REMS = 109
+ CSS_TURN = 107,
+ CSS_REMS = 108
};
static bool isUnitTypeLength(int type) { return (type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG) ||
@@ -113,8 +112,6 @@ public:
unsigned short primitiveType() const { return m_type; }
- bool isVariable() const { return m_type == CSS_PARSER_VARIABLE_FUNCTION_SYNTAX; }
-
/*
* computes a length in pixels out of the given CSSValue. Need the RenderStyle to get
* the fontinfo in case val is defined in em or ex.
diff --git a/WebCore/css/CSSProperty.cpp b/WebCore/css/CSSProperty.cpp
index 61300a2..1e04da7 100644
--- a/WebCore/css/CSSProperty.cpp
+++ b/WebCore/css/CSSProperty.cpp
@@ -29,8 +29,6 @@ namespace WebCore {
String CSSProperty::cssText() const
{
- if (id() == CSSPropertyWebkitVariableDeclarationBlock)
- return m_value->cssText() + ";";
return String(getPropertyName(static_cast<CSSPropertyID>(id()))) + ": " + m_value->cssText() + (isImportant() ? " !important" : "") + "; ";
}
diff --git a/WebCore/css/CSSPropertyNames.in b/WebCore/css/CSSPropertyNames.in
index ab75404..28b393c 100644
--- a/WebCore/css/CSSPropertyNames.in
+++ b/WebCore/css/CSSPropertyNames.in
@@ -297,4 +297,3 @@ z-index
-webkit-user-drag
-webkit-user-modify
-webkit-user-select
--webkit-variable-declaration-block
diff --git a/WebCore/css/CSSRule.h b/WebCore/css/CSSRule.h
index 1ffca93..4d2de8a 100644
--- a/WebCore/css/CSSRule.h
+++ b/WebCore/css/CSSRule.h
@@ -46,8 +46,8 @@ public:
MEDIA_RULE,
FONT_FACE_RULE,
PAGE_RULE,
- VARIABLES_RULE,
- WEBKIT_KEYFRAMES_RULE,
+ // 7 used to be VARIABLES_RULE
+ WEBKIT_KEYFRAMES_RULE = 8,
WEBKIT_KEYFRAME_RULE
};
diff --git a/WebCore/css/CSSRule.idl b/WebCore/css/CSSRule.idl
index eaf1335..82a1dee 100644
--- a/WebCore/css/CSSRule.idl
+++ b/WebCore/css/CSSRule.idl
@@ -34,7 +34,6 @@ module css {
const unsigned short MEDIA_RULE = 4;
const unsigned short FONT_FACE_RULE = 5;
const unsigned short PAGE_RULE = 6;
- const unsigned short VARIABLES_RULE = 7;
const unsigned short WEBKIT_KEYFRAMES_RULE = 8;
const unsigned short WEBKIT_KEYFRAME_RULE = 9;
diff --git a/WebCore/css/CSSStyleDeclaration.cpp b/WebCore/css/CSSStyleDeclaration.cpp
index 996d573..422dd0d 100644
--- a/WebCore/css/CSSStyleDeclaration.cpp
+++ b/WebCore/css/CSSStyleDeclaration.cpp
@@ -148,16 +148,12 @@ PassRefPtr<CSSMutableStyleDeclaration> CSSStyleDeclaration::copyPropertiesInSet(
{
Vector<CSSProperty> list;
list.reserveInitialCapacity(length);
- unsigned variableDependentValueCount = 0;
for (unsigned i = 0; i < length; i++) {
RefPtr<CSSValue> value = getPropertyCSSValue(set[i]);
- if (value) {
- if (value->isVariableDependentValue())
- variableDependentValueCount++;
+ if (value)
list.append(CSSProperty(set[i], value.release(), false));
- }
}
- return CSSMutableStyleDeclaration::create(list, variableDependentValueCount);
+ return CSSMutableStyleDeclaration::create(list);
}
} // namespace WebCore
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 8f408e5..a3c94dc 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -44,9 +44,6 @@
#include "CSSStyleSheet.h"
#include "CSSTimingFunctionValue.h"
#include "CSSValueList.h"
-#include "CSSVariableDependentValue.h"
-#include "CSSVariablesDeclaration.h"
-#include "CSSVariablesRule.h"
#include "CachedImage.h"
#include "Counter.h"
#include "FocusController.h"
@@ -571,87 +568,7 @@ static void loadViewSourceStyle()
void CSSStyleSelector::addMatchedDeclaration(CSSMutableStyleDeclaration* decl)
{
- if (!decl->hasVariableDependentValue()) {
- m_matchedDecls.append(decl);
- return;
- }
-
- // See if we have already resolved the variables in this declaration.
- CSSMutableStyleDeclaration* resolvedDecl = m_resolvedVariablesDeclarations.get(decl).get();
- if (resolvedDecl) {
- m_matchedDecls.append(resolvedDecl);
- return;
- }
-
- // If this declaration has any variables in it, then we need to make a cloned
- // declaration with as many variables resolved as possible for this style selector's media.
- RefPtr<CSSMutableStyleDeclaration> newDecl = CSSMutableStyleDeclaration::create(decl->parentRule());
- m_matchedDecls.append(newDecl.get());
- m_resolvedVariablesDeclarations.set(decl, newDecl);
-
- HashSet<String> usedBlockVariables;
- resolveVariablesForDeclaration(decl, newDecl.get(), usedBlockVariables);
-}
-
-void CSSStyleSelector::resolveVariablesForDeclaration(CSSMutableStyleDeclaration* decl, CSSMutableStyleDeclaration* newDecl, HashSet<String>& usedBlockVariables)
-{
- // Now iterate over the properties in the original declaration. As we resolve variables we'll end up
- // mutating the new declaration (possibly expanding shorthands). The new declaration has no m_node
- // though, so it can't mistakenly call setChanged on anything.
- CSSMutableStyleDeclaration::const_iterator end = decl->end();
- for (CSSMutableStyleDeclaration::const_iterator it = decl->begin(); it != end; ++it) {
- const CSSProperty& current = *it;
- if (!current.value()->isVariableDependentValue()) {
- // We can just add the parsed property directly.
- newDecl->addParsedProperty(current);
- continue;
- }
- CSSValueList* valueList = static_cast<CSSVariableDependentValue*>(current.value())->valueList();
- if (!valueList)
- continue;
- CSSParserValueList resolvedValueList;
- unsigned s = valueList->length();
- bool fullyResolved = true;
- for (unsigned i = 0; i < s; ++i) {
- CSSValue* transformValue = valueList->item(i);
- CSSPrimitiveValue* primitiveValue = transformValue->isPrimitiveValue() ? static_cast<CSSPrimitiveValue*>(transformValue) : 0;
- if (primitiveValue && primitiveValue->isVariable()) {
- CSSVariablesRule* rule = m_variablesMap.get(primitiveValue->getStringValue());
- if (!rule || !rule->variables()) {
- fullyResolved = false;
- break;
- }
-
- if (current.id() == CSSPropertyWebkitVariableDeclarationBlock && s == 1) {
- fullyResolved = false;
- if (!usedBlockVariables.contains(primitiveValue->getStringValue())) {
- CSSMutableStyleDeclaration* declBlock = rule->variables()->getParsedVariableDeclarationBlock(primitiveValue->getStringValue());
- if (declBlock) {
- usedBlockVariables.add(primitiveValue->getStringValue());
- resolveVariablesForDeclaration(declBlock, newDecl, usedBlockVariables);
- }
- }
- }
-
- CSSValueList* resolvedVariable = rule->variables()->getParsedVariable(primitiveValue->getStringValue());
- if (!resolvedVariable) {
- fullyResolved = false;
- break;
- }
- unsigned valueSize = resolvedVariable->length();
- for (unsigned j = 0; j < valueSize; ++j)
- resolvedValueList.addValue(resolvedVariable->item(j)->parserValue());
- } else
- resolvedValueList.addValue(transformValue->parserValue());
- }
-
- if (!fullyResolved)
- continue;
-
- // We now have a fully resolved new value list. We want the parser to use this value list
- // and parse our new declaration.
- CSSParser(m_checker.m_strictParsing).parsePropertyWithResolvedVariables(current.id(), current.isImportant(), newDecl, &resolvedValueList);
- }
+ m_matchedDecls.append(decl);
}
void CSSStyleSelector::matchRules(CSSRuleSet* rules, int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules)
@@ -2785,23 +2702,6 @@ bool CSSStyleSelector::SelectorChecker::checkScrollbarPseudoClass(CSSSelector* s
}
}
-void CSSStyleSelector::addVariables(CSSVariablesRule* variables)
-{
- CSSVariablesDeclaration* decl = variables->variables();
- if (!decl)
- return;
- unsigned size = decl->length();
- for (unsigned i = 0; i < size; ++i) {
- String name = decl->item(i);
- m_variablesMap.set(name, variables);
- }
-}
-
-CSSValue* CSSStyleSelector::resolveVariableDependentValue(CSSVariableDependentValue*)
-{
- return 0;
-}
-
// -----------------------------------------------------------------
CSSRuleSet::CSSRuleSet()
@@ -2908,11 +2808,6 @@ void CSSRuleSet::addRulesFromSheet(CSSStyleSheet* sheet, const MediaQueryEvaluat
// Add this font face to our set.
const CSSFontFaceRule* fontFaceRule = static_cast<CSSFontFaceRule*>(item);
styleSelector->fontSelector()->addFontFaceRule(fontFaceRule);
- } else if (item->isVariablesRule()) {
- // Evaluate the media query and make sure it matches.
- CSSVariablesRule* variables = static_cast<CSSVariablesRule*>(item);
- if (!variables->media() || medium.eval(variables->media(), styleSelector))
- styleSelector->addVariables(variables);
} else if (item->isKeyframesRule())
styleSelector->addKeyframeStyle(static_cast<WebKitCSSKeyframesRule*>(item));
}
@@ -5611,7 +5506,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
case CSSPropertyWebkitFontSizeDelta:
case CSSPropertyWebkitTextDecorationsInEffect:
case CSSPropertyWebkitTextStroke:
- case CSSPropertyWebkitVariableDeclarationBlock:
return;
#if ENABLE(WCSS)
case CSSPropertyWapInputFormat:
diff --git a/WebCore/css/CSSStyleSelector.h b/WebCore/css/CSSStyleSelector.h
index 20cd866..b718751 100644
--- a/WebCore/css/CSSStyleSelector.h
+++ b/WebCore/css/CSSStyleSelector.h
@@ -50,8 +50,6 @@ class CSSSelector;
class CSSStyleRule;
class CSSStyleSheet;
class CSSValue;
-class CSSVariableDependentValue;
-class CSSVariablesRule;
class ContainerNode;
class DataGridColumn;
class Document;
@@ -165,10 +163,6 @@ public:
void allVisitedStateChanged() { m_checker.allVisitedStateChanged(); }
void visitedStateChanged(LinkHash visitedHash) { m_checker.visitedStateChanged(visitedHash); }
- void addVariables(CSSVariablesRule* variables);
- CSSValue* resolveVariableDependentValue(CSSVariableDependentValue*);
- void resolveVariablesForDeclaration(CSSMutableStyleDeclaration* decl, CSSMutableStyleDeclaration* newDecl, HashSet<String>& usedBlockVariables);
-
void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule> rule);
void addPageStyle(PassRefPtr<CSSPageRule>);
@@ -319,9 +313,6 @@ public:
HashSet<AtomicStringImpl*> m_selectorAttrs;
Vector<CSSMutableStyleDeclaration*> m_additionalAttributeStyleDecls;
Vector<MediaQueryResult*> m_viewportDependentMediaQueryResults;
-
- HashMap<String, CSSVariablesRule*> m_variablesMap;
- HashMap<CSSMutableStyleDeclaration*, RefPtr<CSSMutableStyleDeclaration> > m_resolvedVariablesDeclarations;
};
class CSSRuleData : public Noncopyable {
diff --git a/WebCore/css/CSSValue.h b/WebCore/css/CSSValue.h
index 3235cb0..ec1b15e 100644
--- a/WebCore/css/CSSValue.h
+++ b/WebCore/css/CSSValue.h
@@ -72,7 +72,6 @@ public:
virtual bool isSVGPaint() const { return false; }
#endif
- virtual bool isVariableDependentValue() const { return false; }
virtual CSSParserValue parserValue() const { ASSERT_NOT_REACHED(); return CSSParserValue(); }
virtual void addSubresourceStyleURLs(ListHashSet<KURL>&, const CSSStyleSheet*) { }
diff --git a/WebCore/css/CSSVariableDependentValue.cpp b/WebCore/css/CSSVariableDependentValue.cpp
deleted file mode 100644
index 2eadc1c..0000000
--- a/WebCore/css/CSSVariableDependentValue.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CSSVariableDependentValue.h"
-
-#include "CSSValueList.h"
-
-namespace WebCore {
-
-CSSVariableDependentValue::CSSVariableDependentValue(PassRefPtr<CSSValueList> list)
-: m_list(list)
-{
-}
-
-CSSVariableDependentValue::~CSSVariableDependentValue()
-{
-}
-
-String CSSVariableDependentValue::cssText() const
-{
- if (m_list)
- return m_list->cssText();
- return "";
-}
-
-}
diff --git a/WebCore/css/CSSVariableDependentValue.h b/WebCore/css/CSSVariableDependentValue.h
deleted file mode 100644
index e8dce2e..0000000
--- a/WebCore/css/CSSVariableDependentValue.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CSSVariableDependentValue_h
-#define CSSVariableDependentValue_h
-
-#include "CSSValue.h"
-
-namespace WebCore {
-
-class CSSValueList;
-
-class CSSVariableDependentValue : public CSSValue {
-public:
- static PassRefPtr<CSSVariableDependentValue> create(PassRefPtr<CSSValueList> valueList)
- {
- return adoptRef(new CSSVariableDependentValue(valueList));
- }
- virtual ~CSSVariableDependentValue();
-
- virtual String cssText() const;
-
- bool isVariableDependentValue() const { return true; }
-
- CSSValueList* valueList() const { return m_list.get(); }
-
-private:
- CSSVariableDependentValue(PassRefPtr<CSSValueList>);
-
- RefPtr<CSSValueList> m_list;
-};
-
-}
-#endif
-
diff --git a/WebCore/css/CSSVariablesDeclaration.cpp b/WebCore/css/CSSVariablesDeclaration.cpp
deleted file mode 100644
index e40750a..0000000
--- a/WebCore/css/CSSVariablesDeclaration.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CSSVariablesDeclaration.h"
-
-#include "CSSParser.h"
-#include "CSSRule.h"
-#include "CSSValueList.h"
-#include "Document.h"
-#include "ExceptionCode.h"
-
-namespace WebCore {
-
-CSSVariablesDeclaration::CSSVariablesDeclaration(StyleBase* parent, const Vector<String>& names, const Vector<RefPtr<CSSValue> >& values)
- : StyleBase(parent)
-{
- m_variableNames = names;
- ASSERT(names.size() == values.size());
- unsigned s = names.size();
- for (unsigned i = 0; i < s; ++i)
- addParsedVariable(names[i], values[i], false);
-}
-
-CSSVariablesDeclaration::~CSSVariablesDeclaration()
-{
-}
-
-String CSSVariablesDeclaration::getVariableValue(const String& variableName)
-{
- CSSValue* val = m_variablesMap.get(variableName).get();
- if (val)
- return val->cssText();
- return "";
-}
-
-String CSSVariablesDeclaration::removeVariable(const String& variableName, ExceptionCode&)
-{
- // FIXME: The spec has this method taking an exception code but no exceptions are
- // specified as being thrown.
- RefPtr<CSSValue> val = m_variablesMap.take(variableName);
- String result = val ? val->cssText() : "";
- if (val) {
- int s = m_variableNames.size();
- for (int i = 0; i < s; ++i) {
- if (m_variableNames[i] == variableName) {
- m_variableNames.remove(i);
- i--;
- s--;
- }
- }
-
- setNeedsStyleRecalc();
- }
-
- // FIXME: Communicate this change so that the document will update.
- return result;
-}
-
-void CSSVariablesDeclaration::setVariable(const String& variableName, const String& variableValue, ExceptionCode& excCode)
-{
- // Try to parse the variable value into a Value*. If it fails we throw an exception.
- CSSParser parser(useStrictParsing());
- if (!parser.parseVariable(this, variableName, variableValue)) // If the parse succeeds, it will call addParsedVariable (our internal method for doing the add) with the parsed Value*.
- excCode = SYNTAX_ERR;
- else
- setNeedsStyleRecalc();
-}
-
-void CSSVariablesDeclaration::addParsedVariable(const String& variableName, PassRefPtr<CSSValue> variableValue, bool updateNamesList)
-{
-// FIXME: Disabling declarations as variable values for now since they no longer have a common base class with CSSValues.
-#if 0
- variableValue->setParent(this); // Needed to connect variables that are CSSMutableStyleDeclarations, since the parent couldn't be set until now.
-#endif
-
- // Don't leak duplicates. For multiple variables with the same name, the last one
- // declared will win.
- CSSValue* current = m_variablesMap.take(variableName).get();
- if (!current && updateNamesList)
- m_variableNames.append(variableName);
- m_variablesMap.set(variableName, variableValue);
-
- // FIXME: Communicate this change so the document will update.
-}
-
-CSSValueList* CSSVariablesDeclaration::getParsedVariable(const String& variableName)
-{
- CSSValue* result = m_variablesMap.get(variableName).get();
- if (result->isValueList())
- return static_cast<CSSValueList*>(result);
- return 0;
-}
-
-CSSMutableStyleDeclaration* CSSVariablesDeclaration::getParsedVariableDeclarationBlock(const String&)
-{
-// FIXME: Disabling declarations as variable values for now since they no longer have a common base class with CSSValues.
-#if 0
- StyleBase* result = m_variablesMap.get(variableName).get();
-
- if (result->isMutableStyleDeclaration())
- return static_cast<CSSMutableStyleDeclaration*>(result);
-#endif
- return 0;
-}
-
-unsigned CSSVariablesDeclaration::length() const
-{
- return m_variableNames.size();
-}
-
-String CSSVariablesDeclaration::item(unsigned index)
-{
- if (index >= m_variableNames.size())
- return "";
- return m_variableNames[index];
-}
-
-CSSRule* CSSVariablesDeclaration::parentRule()
-{
- return (parent() && parent()->isRule()) ? static_cast<CSSRule*>(parent()) : 0;
-}
-
-String CSSVariablesDeclaration::cssText() const
-{
- String result = "{ ";
- unsigned s = m_variableNames.size();
- for (unsigned i = 0; i < s; ++i) {
- result += m_variableNames[i] + ": ";
- result += m_variablesMap.get(m_variableNames[i])->cssText();
- if (i < s - 1)
- result += "; ";
- }
- result += " }";
- return result;
-}
-
-void CSSVariablesDeclaration::setCssText(const String&)
-{
- // FIXME: It's not clear if this is actually settable.
-}
-
-void CSSVariablesDeclaration::setNeedsStyleRecalc()
-{
- // FIXME: Make this much better (it has the same problem CSSMutableStyleDeclaration does).
- StyleBase* root = this;
- while (StyleBase* parent = root->parent())
- root = parent;
- if (root->isCSSStyleSheet())
- static_cast<CSSStyleSheet*>(root)->document()->styleSelectorChanged(DeferRecalcStyle);
-}
-
-}
diff --git a/WebCore/css/CSSVariablesDeclaration.h b/WebCore/css/CSSVariablesDeclaration.h
deleted file mode 100644
index 6838743..0000000
--- a/WebCore/css/CSSVariablesDeclaration.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CSSVariablesDeclaration_h
-#define CSSVariablesDeclaration_h
-
-#include "PlatformString.h"
-#include "StyleBase.h"
-#include <wtf/HashMap.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-typedef int ExceptionCode;
-
-class CSSMutableStyleDeclaration;
-class CSSRule;
-class CSSValue;
-class CSSValueList;
-
-class CSSVariablesDeclaration : public StyleBase {
-public:
- static PassRefPtr<CSSVariablesDeclaration> create(StyleBase* owningRule, const Vector<String>& names, const Vector<RefPtr<CSSValue> >& values)
- {
- return adoptRef(new CSSVariablesDeclaration(owningRule, names, values));
- }
- virtual ~CSSVariablesDeclaration();
-
- String getVariableValue(const String&);
- String removeVariable(const String&, ExceptionCode&);
- void setVariable(const String&, const String&, ExceptionCode&);
-
- unsigned length() const;
- String item(unsigned index);
-
- CSSRule* parentRule();
-
- String cssText() const;
- void setCssText(const String&); // FIXME: The spec contradicts itself regarding whether or not cssText is settable.
-
- void addParsedVariable(const String& variableName, PassRefPtr<CSSValue> variableValue, bool updateNamesList = true);
-
- CSSValueList* getParsedVariable(const String& variableName);
- CSSMutableStyleDeclaration* getParsedVariableDeclarationBlock(const String& variableName);
-
-private:
- CSSVariablesDeclaration(StyleBase* owningRule, const Vector<String>& names, const Vector<RefPtr<CSSValue> >& values);
-
- void setNeedsStyleRecalc();
-
-protected:
- Vector<String> m_variableNames;
- HashMap<String, RefPtr<CSSValue> > m_variablesMap;
-};
-
-} // namespace WebCore
-
-#endif // CSSVariablesDeclaration_h
diff --git a/WebCore/css/CSSVariablesDeclaration.idl b/WebCore/css/CSSVariablesDeclaration.idl
deleted file mode 100644
index 672bfe2..0000000
--- a/WebCore/css/CSSVariablesDeclaration.idl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module css {
-
- interface [
- HasIndexGetter
- ] CSSVariablesDeclaration {
- attribute DOMString cssText;
-
- DOMString getVariableValue(in DOMString variableName);
- DOMString removeVariable(in DOMString variableName)
- raises(DOMException);
- void setVariable(in DOMString variableName,
- in DOMString value)
- raises(DOMException);
- readonly attribute unsigned long length;
- DOMString item(in unsigned long index);
- readonly attribute CSSRule parentRule;
- };
-
-}
diff --git a/WebCore/css/CSSVariablesRule.cpp b/WebCore/css/CSSVariablesRule.cpp
deleted file mode 100644
index 0771952..0000000
--- a/WebCore/css/CSSVariablesRule.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CSSVariablesRule.h"
-
-#include "MediaList.h"
-#include "PlatformString.h"
-#include <wtf/HashMap.h>
-
-namespace WebCore {
-
-CSSVariablesRule::CSSVariablesRule(CSSStyleSheet* parent, MediaList* mediaList, bool variablesKeyword)
- : CSSRule(parent)
- , m_lstMedia(mediaList)
- , m_variablesKeyword(variablesKeyword)
-{
-}
-
-CSSVariablesRule::~CSSVariablesRule()
-{
-}
-
-String CSSVariablesRule::cssText() const
-{
- String result = m_variablesKeyword ? "@-webkit-variables " : "@-webkit-define ";
- if (m_lstMedia) {
- if (!m_variablesKeyword)
- result += "for ";
- result += m_lstMedia->mediaText();
- result += " ";
- }
- if (m_variables)
- result += m_variables->cssText();
- result += ";";
- return result;
-}
-
-}
diff --git a/WebCore/css/CSSVariablesRule.h b/WebCore/css/CSSVariablesRule.h
deleted file mode 100644
index d2cea39..0000000
--- a/WebCore/css/CSSVariablesRule.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CSSVariablesRule_h
-#define CSSVariablesRule_h
-
-#include "CSSRule.h"
-#include "CSSVariablesDeclaration.h"
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class CSSStyleSheet;
-class MediaList;
-
-class CSSVariablesRule : public CSSRule {
-public:
- static PassRefPtr<CSSVariablesRule> create(CSSStyleSheet* parent, MediaList* mediaList, bool variablesKeyword)
- {
- return adoptRef(new CSSVariablesRule(parent, mediaList, variablesKeyword));
- }
-
- virtual ~CSSVariablesRule();
-
- // CSSVariablesRule interface
- MediaList* media() const { return m_lstMedia.get(); }
- CSSVariablesDeclaration* variables() { return m_variables.get(); }
-
- // Inherited from CSSRule
- virtual unsigned short type() const { return VARIABLES_RULE; }
- virtual String cssText() const;
- virtual bool isVariablesRule() { return true; }
-
- // Used internally. Does not notify the document of the change. Only intended
- // for use on initial parse.
- void setDeclaration(PassRefPtr<CSSVariablesDeclaration> decl) { m_variables = decl; }
-
-private:
- CSSVariablesRule(CSSStyleSheet* parent, MediaList*, bool variablesKeyword);
-
- RefPtr<MediaList> m_lstMedia;
- RefPtr<CSSVariablesDeclaration> m_variables;
- bool m_variablesKeyword;
-};
-
-} // namespace WebCore
-
-#endif // CSSVariablesRule_h
diff --git a/WebCore/css/CSSVariablesRule.idl b/WebCore/css/CSSVariablesRule.idl
deleted file mode 100644
index b7559f6..0000000
--- a/WebCore/css/CSSVariablesRule.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module css {
-
- interface CSSVariablesRule : CSSRule {
- readonly attribute MediaList media;
- readonly attribute CSSVariablesDeclaration variables;
- };
-
-}
diff --git a/WebCore/css/StyleBase.h b/WebCore/css/StyleBase.h
index 296c8fb..63c671e 100644
--- a/WebCore/css/StyleBase.h
+++ b/WebCore/css/StyleBase.h
@@ -53,7 +53,6 @@ namespace WebCore {
virtual bool isKeyframeRule() { return false; }
virtual bool isKeyframesRule() { return false; }
virtual bool isMediaRule() { return false; }
- virtual bool isVariablesRule() { return false; }
virtual bool isPageRule() { return false; }
virtual bool isRule() { return false; }
diff --git a/WebCore/css/tokenizer.flex b/WebCore/css/tokenizer.flex
index 4d226d9..bd4808d 100644
--- a/WebCore/css/tokenizer.flex
+++ b/WebCore/css/tokenizer.flex
@@ -41,7 +41,6 @@ nth [\+-]?{intnum}*n([\+-]{intnum})?
<mediaquery>"not" {yyTok = MEDIA_NOT; return yyTok;}
<mediaquery>"only" {yyTok = MEDIA_ONLY; return yyTok;}
<mediaquery>"and" {yyTok = MEDIA_AND; return yyTok;}
-<forkeyword>"for" {BEGIN(mediaquery); yyTok = VARIABLES_FOR; return yyTok; }
{string} {yyTok = STRING; return yyTok;}
{ident} {yyTok = IDENT; return yyTok;}
@@ -77,9 +76,6 @@ nth [\+-]?{intnum}*n([\+-]{intnum})?
"@-webkit-value" {yyTok = WEBKIT_VALUE_SYM; return yyTok; }
"@-webkit-mediaquery" {BEGIN(mediaquery); yyTok = WEBKIT_MEDIAQUERY_SYM; return yyTok; }
"@-webkit-selector" {yyTok = WEBKIT_SELECTOR_SYM; return yyTok; }
-"@-webkit-variables" {BEGIN(mediaquery); yyTok = WEBKIT_VARIABLES_SYM; return yyTok; }
-"@-webkit-define" {BEGIN(forkeyword); yyTok = WEBKIT_DEFINE_SYM; return yyTok; }
-"@-webkit-variables-decls" { yyTok = WEBKIT_VARIABLES_DECLS_SYM; return yyTok; }
"@-webkit-keyframes" {yyTok = WEBKIT_KEYFRAMES_SYM; return yyTok; }
"@-webkit-keyframe-rule" {yyTok = WEBKIT_KEYFRAME_RULE_SYM; return yyTok; }
@@ -113,7 +109,6 @@ nth [\+-]?{intnum}*n([\+-]{intnum})?
"not(" {yyTok = NOTFUNCTION; return yyTok;}
"url("{w}{string}{w}")" {yyTok = URI; return yyTok;}
"url("{w}{url}{w}")" {yyTok = URI; return yyTok;}
-"-webkit-var("{w}{ident}{w}")" { yyTok = VARCALL; return yyTok; }
{ident}"(" {yyTok = FUNCTION; return yyTok;}
U\+{range} {yyTok = UNICODERANGE; return yyTok;}
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 44526fc..b93ff55 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -362,9 +362,6 @@ module window {
attribute CSSPageRuleConstructor CSSPageRule;
attribute CSSStyleRuleConstructor CSSStyleRule;
- attribute CSSVariablesRuleConstructor CSSVariablesRule;
- attribute CSSVariablesDeclarationConstructor CSSVariablesDeclaration;
-
attribute CSSStyleDeclarationConstructor CSSStyleDeclaration;
attribute MediaListConstructor MediaList;
attribute CounterConstructor Counter;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list