Unreviewed, rolling out r114140.

http://trac.webkit.org/changeset/114140
https://bugs.webkit.org/show_bug.cgi?id=83921

Fails fast/css/image-set-parsing.html test it attempts to
introduce. (Requested by scheib on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-04-13

Source/WebCore:

* WebCore.gypi:

Source/WebKit/chromium:

* features.gypi:

LayoutTests:

* platform/chromium/fast/css/image-set-parsing-expected.txt: Removed.
* platform/chromium/test_expectations.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2a3b4f2..cb00ef2 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-13  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r114140.
+        http://trac.webkit.org/changeset/114140
+        https://bugs.webkit.org/show_bug.cgi?id=83921
+
+        Fails fast/css/image-set-parsing.html test it attempts to
+        introduce. (Requested by scheib on #webkit).
+
+        * platform/chromium/fast/css/image-set-parsing-expected.txt: Removed.
+        * platform/chromium/test_expectations.txt:
+
 2012-04-13  Dan Bernstein  <mitz@apple.com>
 
         <rdar://problem/10912680> Pixel access canvas APIs do not operate at backing store resolution

diff --git a/LayoutTests/platform/chromium/fast/css/image-set-parsing-expected.txt b/LayoutTests/platform/chromium/fast/css/image-set-parsing-expected.txt
deleted file mode 100644 (file)
index 5b77549..0000000
--- a/LayoutTests/platform/chromium/fast/css/image-set-parsing-expected.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Test the parsing of the -webkit-image-set function.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-Single value for background-image : url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 2
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-
-Multiple values for background-image : url('#a') 1x, url('#b') 2x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 4
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
-
-Multiple values for background-image, out of order : url('#c') 3x, url('#b') 2x, url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 6
-PASS subRule is 'c'
-PASS subRule.cssText is '3'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-
-Single value for content : url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 2
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-
-Multiple values for content : url('#a') 1x, url('#b') 2x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 4
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
-
-Single value for border-image : url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 2
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-
-Multiple values for border-image : url('#a') 1x, url('#b') 2x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 4
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
-
-Single value for -webkit-mask-box-image : url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 2
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-
-Multiple values for -webkit-mask-box-image : url('#a') 1x, url('#b') 2x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 4
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 9658649..cbbf5ea 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3054,6 +3054,10 @@ BUGWK70210 : fast/js/stack-overflow-arrity-catch.html = TEXT
 // These all will timeout, because we are lacking a hook that signals test completion.
 BUGWK70066 SKIP : fast/hidpi = TIMEOUT
 
+// CSS image-set support not yet enabled (needs ENABLE_CSS_IMAGE_SET).
+BUGWK81859 SKIP : fast/css/image-set-parsing.html = FAIL
+BUGWK81859 SKIP : fast/css/image-set-parsing-invalid.html = FAIL
+
 // Flaky tests from ~r97647
 BUGWK70298 : fast/images/pdf-as-background.html = FAIL TIMEOUT PASS
 BUGWK70298 : fast/table/border-collapsing/cached-69296.html = IMAGE PASS

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4b08b97..100d98f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-13  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r114140.
+        http://trac.webkit.org/changeset/114140
+        https://bugs.webkit.org/show_bug.cgi?id=83921
+
+        Fails fast/css/image-set-parsing.html test it attempts to
+        introduce. (Requested by scheib on #webkit).
+
+        * WebCore.gypi:
+
 2012-04-13  Dan Bernstein  <mitz@apple.com>
 
         <rdar://problem/10912680> Pixel access canvas APIs do not operate at backing store resolution

diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index e00eeef..a8f9d34 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -76,7 +76,6 @@
             'css/CSSCursorImageValue.h',
             'css/CSSHelper.h',
             'css/CSSImageGeneratorValue.h',
-            'css/CSSImageSetValue.h',
             'css/CSSImageValue.h',
             'css/CSSLineBoxContainValue.h',
             'css/CSSParserValues.h',
@@ -574,7 +573,6 @@
             'rendering/style/StyleBackgroundData.h',
             'rendering/style/StyleBoxData.h',
             'rendering/style/StyleCachedImage.h',
-            'rendering/style/StyleCachedImageSet.h',
             'rendering/style/StyleDashboardRegion.h',
             'rendering/style/StyleDeprecatedFlexibleBoxData.h',
             'rendering/style/StyleFilterData.h',
@@ -2418,7 +2416,6 @@
             'css/CSSGradientValue.cpp',
             'css/CSSGradientValue.h',
             'css/CSSImageGeneratorValue.cpp',
-            'css/CSSImageSetValue.cpp',
             'css/CSSImageValue.cpp',
             'css/CSSImportRule.cpp',
             'css/CSSImportRule.h',
@@ -4898,7 +4895,6 @@
             'rendering/style/StyleBackgroundData.cpp',
             'rendering/style/StyleBoxData.cpp',
             'rendering/style/StyleCachedImage.cpp',
-            'rendering/style/StyleCachedImageSet.cpp',
             'rendering/style/StyleCachedShader.h',
             'rendering/style/StyleCachedShader.cpp',
             'rendering/style/StyleCustomFilterProgram.h',

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 175267c..ad8f6d2 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-13  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r114140.
+        http://trac.webkit.org/changeset/114140
+        https://bugs.webkit.org/show_bug.cgi?id=83921
+
+        Fails fast/css/image-set-parsing.html test it attempts to
+        introduce. (Requested by scheib on #webkit).
+
+        * features.gypi:
+
 2012-04-13  Rob Flack  <flackr@chromium.org>
 
         Chromium: Should enable -webkit-image-set

diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
index 046e28c..7d7bead 100644 (file)
--- a/Source/WebKit/chromium/features.gypi
+++ b/Source/WebKit/chromium/features.gypi
@@ -38,7 +38,6 @@
       'ENABLE_BLOB_SLICE=1',
       'ENABLE_CHANNEL_MESSAGING=1',
       'ENABLE_CSS_FILTERS=1',
-      'ENABLE_CSS_IMAGE_SET=1',
       'ENABLE_CSS_SHADERS=1',
       'ENABLE_DASHBOARD_SUPPORT=0',
       'ENABLE_DATA_TRANSFER_ITEMS=1',