projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 360d362)
Chromium: Should enable -webkit-image-set
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Apr 2012 17:20:24 +0000 (17:20 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Apr 2012 17:20:24 +0000 (17:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=81859

Patch by Rob Flack <flackr@chromium.org> on 2012-04-13
Reviewed by Adam Barth.

Source/WebCore:

Test: fast/css/image-set-parsing.html

* WebCore.gypi:

Source/WebKit/chromium:

* features.gypi:

LayoutTests:

* platform/chromium/test_expectations.txt:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/platform/chromium/fast/css/image-set-parsing-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/platform/chromium/test_expectations.txt patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/WebCore.gypi patch | blob | history
Source/WebKit/chromium/ChangeLog patch | blob | history
Source/WebKit/chromium/features.gypi patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d8a2aea..2d83c2b 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-13  Rob Flack  <flackr@chromium.org>
+
+        Chromium: Should enable -webkit-image-set
+        https://bugs.webkit.org/show_bug.cgi?id=81859
+
+        Reviewed by Adam Barth.
+
+        * platform/chromium/test_expectations.txt:
+
 2012-04-13  Anton Muhin  <antonm@chromium.org>
 
         Mark test as even flakier: it can timeout.
diff --git a/LayoutTests/platform/chromium/fast/css/image-set-parsing-expected.txt b/LayoutTests/platform/chromium/fast/css/image-set-parsing-expected.txt
new file mode 100644 (file)
index 0000000..5b77549
--- /dev/null
+++ b/LayoutTests/platform/chromium/fast/css/image-set-parsing-expected.txt
@@ -0,0 +1,93 @@
+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 ae8dadc..dc98333 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3054,10 +3054,6 @@ 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 f355517..d21c96c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-13  Rob Flack  <flackr@chromium.org>
+
+        Chromium: Should enable -webkit-image-set
+        https://bugs.webkit.org/show_bug.cgi?id=81859
+
+        Reviewed by Adam Barth.
+
+        Test: fast/css/image-set-parsing.html
+
+        * WebCore.gypi:
+
 2012-04-13  Pavel Feldman  <pfeldman@chromium.org>
 
         Web Inspector: do not attempt to load content from resource until request finished loading.
diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index 45a0e61..f57f9cd 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -76,6 +76,7 @@
             'css/CSSCursorImageValue.h',
             'css/CSSHelper.h',
             'css/CSSImageGeneratorValue.h',
+            'css/CSSImageSetValue.h',
             'css/CSSImageValue.h',
             'css/CSSLineBoxContainValue.h',
             'css/CSSParserValues.h',
@@ -573,6 +574,7 @@
             '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',
@@ -2416,6 +2418,7 @@
             'css/CSSGradientValue.cpp',
             'css/CSSGradientValue.h',
             'css/CSSImageGeneratorValue.cpp',
+            'css/CSSImageSetValue.cpp',
             'css/CSSImageValue.cpp',
             'css/CSSImportRule.cpp',
             'css/CSSImportRule.h',
@@ -4893,6 +4896,7 @@
             '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 cdd3b62..175267c 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-13  Rob Flack  <flackr@chromium.org>
+
+        Chromium: Should enable -webkit-image-set
+        https://bugs.webkit.org/show_bug.cgi?id=81859
+
+        Reviewed by Adam Barth.
+
+        * features.gypi:
+
 2012-04-13  Yury Semikhatsky  <yurys@chromium.org>
 
         Unreviewed. Build fix after r114126.
diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
index 7d7bead..046e28c 100644 (file)
--- a/Source/WebKit/chromium/features.gypi
+++ b/Source/WebKit/chromium/features.gypi
@@ -38,6 +38,7 @@
       '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',
Domain: Web Framework / Uncategorized;