Remove -webkit-color-correction CSS property
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Aug 2015 00:10:01 +0000 (00:10 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Aug 2015 00:10:01 +0000 (00:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=147812

Reviewed by Maciej Stachowiak.

Source/WebCore:

Covered by existing tests.

I am doing some general cleanup of handling of color spaces in WebKit.
This removes the obsolete web-visible property that allowed clients to
get color correction on older Apple platforms where we chose not to do
it all the time for performance reasons. Currently, it has no effect on
any supported platform.

Now that this property is removed, a website can detect that it's not
there if it uses getComputedStyle, but I don't expect this to have
significant compatibility fallout. It's harmless to continue using the
property in legacy content or websites that have not been updated, since
unknown property names are ignored and it had no effect before anyway.

* css/CSSComputedStyleDeclaration.cpp: Removed
CSSPropertyWebkitColorCorrection from the list of computed properties.
(WebCore::ComputedStyleExtractor::propertyValue): Removed the
CSSPropertyWebkitColorCorrection case.

* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue): Removed the
CSSPropertyWebkitColorCorrection case.
(WebCore::isKeywordPropertyID): Ditto.
(WebCore::CSSParser::parseValue): Ditto.

* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted the overload
of this that converts a ColorSpace to a CSSPrimitiveValue.
(WebCore::CSSPrimitiveValue::operator ColorSpace): Deleted.

* css/CSSPropertyNames.in: Removed -webkit-color-correction.

* css/CSSValueKeywords.in: Removed the -webkit-color-correction section,
which contained sRGB.

* css/SVGCSSValueKeywords.in: Uncommented sRGB now that it's not shared
with -webkit-color-correction.

* rendering/style/RenderStyle.h: Removed setColorSpace and initialColorSpace.
Kept colorSpace around for now, but it simply returns ColorSpaceSRGB.
This prevents us from needing to touch every single call site that passes
the color space in to functions in the platform graphics abstraction.
We'll touch most of those call sites when we change Color to include the
color space and eventually we can delete this.

* rendering/style/StyleRareInheritedData.cpp: Deleted colorSpace.
(WebCore::StyleRareInheritedData::StyleRareInheritedData): Deleted
code to initialize colorSpace and to copy colorSpace.
(WebCore::StyleRareInheritedData::operator==): Deleted code to compare
colorSpace.

LayoutTests:

Given that -webkit-color-correction had no effect on rendering on any platform in any
configuration we covered, it's amazing how many tests we had for it.

* fast/css/getComputedStyle/computed-style-expected.txt: Removed expected results for
-webkit-color-correction property.
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Ditto.
* svg/css/getComputedStyle-basic-expected.txt: Ditto.

* fast/css/getComputedStyle/resources/property-names.js: Removed -webkit-color-correction.

* fast/css/color-correction-backgrounds-and-text.html: Removed.
* fast/css/color-correction-on-background-image.html: Removed.
* fast/css/color-correction-on-backgrounds.html: Removed.
* fast/css/color-correction-on-box-shadow.html: Removed.
* fast/css/color-correction-on-text-shadow.html: Removed.
* fast/css/color-correction-on-text.html: Removed.
* fast/css/color-correction-untagged-images.html: Removed.
* fast/css/color-correction.html: Removed.
* fast/css/parsing-color-correction-expected.txt: Removed.
* fast/css/parsing-color-correction.html: Removed.
* fast/css/resources/parsing-color-correction.js: Removed.
* platform/efl/fast/css/color-correction-backgrounds-and-text-expected.png: Removed.
* platform/efl/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
* platform/efl/fast/css/color-correction-expected.png: Removed.
* platform/efl/fast/css/color-correction-expected.txt: Removed.
* platform/efl/fast/css/color-correction-on-background-image-expected.png: Removed.
* platform/efl/fast/css/color-correction-on-background-image-expected.txt: Removed.
* platform/efl/fast/css/color-correction-on-backgrounds-expected.png: Removed.
* platform/efl/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
* platform/efl/fast/css/color-correction-on-box-shadow-expected.png: Removed.
* platform/efl/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
* platform/efl/fast/css/color-correction-on-text-expected.png: Removed.
* platform/efl/fast/css/color-correction-on-text-expected.txt: Removed.
* platform/efl/fast/css/color-correction-on-text-shadow-expected.png: Removed.
* platform/efl/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
* platform/efl/fast/css/color-correction-untagged-images-expected.png: Removed.
* platform/efl/fast/css/color-correction-untagged-images-expected.txt: Removed.
* platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.png: Removed.
* platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
* platform/gtk/fast/css/color-correction-expected.png: Removed.
* platform/gtk/fast/css/color-correction-expected.txt: Removed.
* platform/gtk/fast/css/color-correction-on-background-image-expected.png: Removed.
* platform/gtk/fast/css/color-correction-on-background-image-expected.txt: Removed.
* platform/gtk/fast/css/color-correction-on-backgrounds-expected.png: Removed.
* platform/gtk/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
* platform/gtk/fast/css/color-correction-on-box-shadow-expected.png: Removed.
* platform/gtk/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
* platform/gtk/fast/css/color-correction-on-text-expected.png: Removed.
* platform/gtk/fast/css/color-correction-on-text-expected.txt: Removed.
* platform/gtk/fast/css/color-correction-on-text-shadow-expected.png: Removed.
* platform/gtk/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
* platform/gtk/fast/css/color-correction-untagged-images-expected.png: Removed.
* platform/gtk/fast/css/color-correction-untagged-images-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/css/color-correction-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/css/color-correction-on-background-image-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/css/color-correction-on-text-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
* platform/ios-simulator-wk2/fast/css/color-correction-untagged-images-expected.txt: Removed.
* platform/ios-simulator/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
* platform/ios-simulator/fast/css/color-correction-expected.txt: Removed.
* platform/ios-simulator/fast/css/color-correction-on-background-image-expected.txt: Removed.
* platform/ios-simulator/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
* platform/ios-simulator/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
* platform/ios-simulator/fast/css/color-correction-on-text-expected.txt: Removed.
* platform/ios-simulator/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
* platform/ios-simulator/fast/css/color-correction-untagged-images-expected.txt: Removed.
* platform/mac/fast/css/color-correction-backgrounds-and-text-expected.png: Removed.
* platform/mac/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
* platform/mac/fast/css/color-correction-expected.png: Removed.
* platform/mac/fast/css/color-correction-expected.txt: Removed.
* platform/mac/fast/css/color-correction-on-background-image-expected.png: Removed.
* platform/mac/fast/css/color-correction-on-background-image-expected.txt: Removed.
* platform/mac/fast/css/color-correction-on-backgrounds-expected.png: Removed.
* platform/mac/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
* platform/mac/fast/css/color-correction-on-box-shadow-expected.png: Removed.
* platform/mac/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
* platform/mac/fast/css/color-correction-on-text-expected.png: Removed.
* platform/mac/fast/css/color-correction-on-text-expected.txt: Removed.
* platform/mac/fast/css/color-correction-on-text-shadow-expected.png: Removed.
* platform/mac/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
* platform/mac/fast/css/color-correction-untagged-images-expected.png: Removed.
* platform/mac/fast/css/color-correction-untagged-images-expected.txt: Removed.
* platform/win/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
* platform/win/fast/css/color-correction-expected.txt: Removed.
* platform/win/fast/css/color-correction-on-background-image-expected.txt: Removed.
* platform/win/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
* platform/win/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
* platform/win/fast/css/color-correction-on-text-expected.txt: Removed.
* platform/win/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
* platform/win/fast/css/color-correction-untagged-images-expected.txt: Removed.

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

97 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/css/color-correction-backgrounds-and-text.html [deleted file]
LayoutTests/fast/css/color-correction-on-background-image.html [deleted file]
LayoutTests/fast/css/color-correction-on-backgrounds.html [deleted file]
LayoutTests/fast/css/color-correction-on-box-shadow.html [deleted file]
LayoutTests/fast/css/color-correction-on-text-shadow.html [deleted file]
LayoutTests/fast/css/color-correction-on-text.html [deleted file]
LayoutTests/fast/css/color-correction-untagged-images.html [deleted file]
LayoutTests/fast/css/color-correction.html [deleted file]
LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
LayoutTests/fast/css/getComputedStyle/resources/property-names.js
LayoutTests/fast/css/parsing-color-correction-expected.txt [deleted file]
LayoutTests/fast/css/parsing-color-correction.html [deleted file]
LayoutTests/fast/css/resources/parsing-color-correction.js [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-backgrounds-and-text-expected.png [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-backgrounds-and-text-expected.txt [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-expected.png [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-expected.txt [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-background-image-expected.png [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-background-image-expected.txt [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-backgrounds-expected.png [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-backgrounds-expected.txt [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-box-shadow-expected.png [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-box-shadow-expected.txt [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-text-expected.png [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-text-expected.txt [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-text-shadow-expected.png [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-on-text-shadow-expected.txt [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-untagged-images-expected.png [deleted file]
LayoutTests/platform/efl/fast/css/color-correction-untagged-images-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.png [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-expected.png [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-background-image-expected.png [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-background-image-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-backgrounds-expected.png [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-backgrounds-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-box-shadow-expected.png [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-box-shadow-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-text-expected.png [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-text-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-text-shadow-expected.png [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-on-text-shadow-expected.txt [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-untagged-images-expected.png [deleted file]
LayoutTests/platform/gtk/fast/css/color-correction-untagged-images-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-backgrounds-and-text-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-background-image-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-backgrounds-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-box-shadow-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-text-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-text-shadow-expected.txt [deleted file]
LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-untagged-images-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/css/color-correction-backgrounds-and-text-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/css/color-correction-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/css/color-correction-on-background-image-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/css/color-correction-on-backgrounds-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/css/color-correction-on-box-shadow-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/css/color-correction-on-text-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/css/color-correction-on-text-shadow-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/fast/css/color-correction-untagged-images-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-backgrounds-and-text-expected.png [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-backgrounds-and-text-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-expected.png [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.png [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-backgrounds-expected.png [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-backgrounds-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-box-shadow-expected.png [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-box-shadow-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-text-expected.png [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-text-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-text-shadow-expected.png [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-on-text-shadow-expected.txt [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-untagged-images-expected.png [deleted file]
LayoutTests/platform/mac/fast/css/color-correction-untagged-images-expected.txt [deleted file]
LayoutTests/platform/win/fast/css/color-correction-backgrounds-and-text-expected.txt [deleted file]
LayoutTests/platform/win/fast/css/color-correction-expected.txt [deleted file]
LayoutTests/platform/win/fast/css/color-correction-on-background-image-expected.txt [deleted file]
LayoutTests/platform/win/fast/css/color-correction-on-backgrounds-expected.txt [deleted file]
LayoutTests/platform/win/fast/css/color-correction-on-box-shadow-expected.txt [deleted file]
LayoutTests/platform/win/fast/css/color-correction-on-text-expected.txt [deleted file]
LayoutTests/platform/win/fast/css/color-correction-on-text-shadow-expected.txt [deleted file]
LayoutTests/platform/win/fast/css/color-correction-untagged-images-expected.txt [deleted file]
LayoutTests/svg/css/getComputedStyle-basic-expected.txt
Source/WebCore/ChangeLog
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSPrimitiveValueMappings.h
Source/WebCore/css/CSSPropertyNames.in
Source/WebCore/css/CSSValueKeywords.in
Source/WebCore/css/SVGCSSValueKeywords.in
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/rendering/style/StyleRareInheritedData.cpp

index 206d187..11763da 100644 (file)
@@ -1,3 +1,104 @@
+2015-08-08  Darin Adler  <darin@apple.com>
+
+        Remove -webkit-color-correction CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=147812
+
+        Reviewed by Maciej Stachowiak.
+
+        Given that -webkit-color-correction had no effect on rendering on any platform in any
+        configuration we covered, it's amazing how many tests we had for it.
+
+        * fast/css/getComputedStyle/computed-style-expected.txt: Removed expected results for
+        -webkit-color-correction property.
+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Ditto.
+        * svg/css/getComputedStyle-basic-expected.txt: Ditto.
+
+        * fast/css/getComputedStyle/resources/property-names.js: Removed -webkit-color-correction.
+
+        * fast/css/color-correction-backgrounds-and-text.html: Removed.
+        * fast/css/color-correction-on-background-image.html: Removed.
+        * fast/css/color-correction-on-backgrounds.html: Removed.
+        * fast/css/color-correction-on-box-shadow.html: Removed.
+        * fast/css/color-correction-on-text-shadow.html: Removed.
+        * fast/css/color-correction-on-text.html: Removed.
+        * fast/css/color-correction-untagged-images.html: Removed.
+        * fast/css/color-correction.html: Removed.
+        * fast/css/parsing-color-correction-expected.txt: Removed.
+        * fast/css/parsing-color-correction.html: Removed.
+        * fast/css/resources/parsing-color-correction.js: Removed.
+        * platform/efl/fast/css/color-correction-backgrounds-and-text-expected.png: Removed.
+        * platform/efl/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
+        * platform/efl/fast/css/color-correction-expected.png: Removed.
+        * platform/efl/fast/css/color-correction-expected.txt: Removed.
+        * platform/efl/fast/css/color-correction-on-background-image-expected.png: Removed.
+        * platform/efl/fast/css/color-correction-on-background-image-expected.txt: Removed.
+        * platform/efl/fast/css/color-correction-on-backgrounds-expected.png: Removed.
+        * platform/efl/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
+        * platform/efl/fast/css/color-correction-on-box-shadow-expected.png: Removed.
+        * platform/efl/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
+        * platform/efl/fast/css/color-correction-on-text-expected.png: Removed.
+        * platform/efl/fast/css/color-correction-on-text-expected.txt: Removed.
+        * platform/efl/fast/css/color-correction-on-text-shadow-expected.png: Removed.
+        * platform/efl/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
+        * platform/efl/fast/css/color-correction-untagged-images-expected.png: Removed.
+        * platform/efl/fast/css/color-correction-untagged-images-expected.txt: Removed.
+        * platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.png: Removed.
+        * platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
+        * platform/gtk/fast/css/color-correction-expected.png: Removed.
+        * platform/gtk/fast/css/color-correction-expected.txt: Removed.
+        * platform/gtk/fast/css/color-correction-on-background-image-expected.png: Removed.
+        * platform/gtk/fast/css/color-correction-on-background-image-expected.txt: Removed.
+        * platform/gtk/fast/css/color-correction-on-backgrounds-expected.png: Removed.
+        * platform/gtk/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
+        * platform/gtk/fast/css/color-correction-on-box-shadow-expected.png: Removed.
+        * platform/gtk/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
+        * platform/gtk/fast/css/color-correction-on-text-expected.png: Removed.
+        * platform/gtk/fast/css/color-correction-on-text-expected.txt: Removed.
+        * platform/gtk/fast/css/color-correction-on-text-shadow-expected.png: Removed.
+        * platform/gtk/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
+        * platform/gtk/fast/css/color-correction-untagged-images-expected.png: Removed.
+        * platform/gtk/fast/css/color-correction-untagged-images-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/css/color-correction-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/css/color-correction-on-background-image-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/css/color-correction-on-text-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
+        * platform/ios-simulator-wk2/fast/css/color-correction-untagged-images-expected.txt: Removed.
+        * platform/ios-simulator/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
+        * platform/ios-simulator/fast/css/color-correction-expected.txt: Removed.
+        * platform/ios-simulator/fast/css/color-correction-on-background-image-expected.txt: Removed.
+        * platform/ios-simulator/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
+        * platform/ios-simulator/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
+        * platform/ios-simulator/fast/css/color-correction-on-text-expected.txt: Removed.
+        * platform/ios-simulator/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
+        * platform/ios-simulator/fast/css/color-correction-untagged-images-expected.txt: Removed.
+        * platform/mac/fast/css/color-correction-backgrounds-and-text-expected.png: Removed.
+        * platform/mac/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
+        * platform/mac/fast/css/color-correction-expected.png: Removed.
+        * platform/mac/fast/css/color-correction-expected.txt: Removed.
+        * platform/mac/fast/css/color-correction-on-background-image-expected.png: Removed.
+        * platform/mac/fast/css/color-correction-on-background-image-expected.txt: Removed.
+        * platform/mac/fast/css/color-correction-on-backgrounds-expected.png: Removed.
+        * platform/mac/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
+        * platform/mac/fast/css/color-correction-on-box-shadow-expected.png: Removed.
+        * platform/mac/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
+        * platform/mac/fast/css/color-correction-on-text-expected.png: Removed.
+        * platform/mac/fast/css/color-correction-on-text-expected.txt: Removed.
+        * platform/mac/fast/css/color-correction-on-text-shadow-expected.png: Removed.
+        * platform/mac/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
+        * platform/mac/fast/css/color-correction-untagged-images-expected.png: Removed.
+        * platform/mac/fast/css/color-correction-untagged-images-expected.txt: Removed.
+        * platform/win/fast/css/color-correction-backgrounds-and-text-expected.txt: Removed.
+        * platform/win/fast/css/color-correction-expected.txt: Removed.
+        * platform/win/fast/css/color-correction-on-background-image-expected.txt: Removed.
+        * platform/win/fast/css/color-correction-on-backgrounds-expected.txt: Removed.
+        * platform/win/fast/css/color-correction-on-box-shadow-expected.txt: Removed.
+        * platform/win/fast/css/color-correction-on-text-expected.txt: Removed.
+        * platform/win/fast/css/color-correction-on-text-shadow-expected.txt: Removed.
+        * platform/win/fast/css/color-correction-untagged-images-expected.txt: Removed.
+
 2015-08-09  Chris Dumez  <cdumez@apple.com>
 
         Regression(r188105): Seems to have caused crashes during PLT on some iPads
 2015-08-09  Chris Dumez  <cdumez@apple.com>
 
         Regression(r188105): Seems to have caused crashes during PLT on some iPads
diff --git a/LayoutTests/fast/css/color-correction-backgrounds-and-text.html b/LayoutTests/fast/css/color-correction-backgrounds-and-text.html
deleted file mode 100644 (file)
index 80f4ae5..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<html>
-<style>
-    .text {
-        color:green;
-        font-size:150px;
-        font-weight:bold;
-    }
-    
-    .container {
-        background-color:green; 
-        width:200px; 
-        height:200px;
-    }
-</style>
-<body>
-
-<p>This container has no color correction, and neither does the text inside, so it will not be visible since both are green and uncorrected.</p>
-<div class="container">
-    <span class="text">G</span>
-</div>
-
-<p>This container has sRGB color correction specified, and so does the text inside, so the text will not be visible since both are green and corrected.</p>
-<div class="container" style="-webkit-color-correction:sRGB;">
-    <span class="text" style="-webkit-color-correction:sRGB;">G</span>
-</div>
-
-<p>This container has sRGB color correction specified. The text inside does not have the property specified, but the text inherits the container's style, so the text will not be visible since both are green and corrected.</p>
-<div class="container" style="-webkit-color-correction:sRGB;">
-    <span class="text">G</span>
-</div>
-
-<p>This container has default color-correction specified, and the text has sRGB color correction specified. This text is visible even though both are green since the text is corrected and the container is not.</p>
-<div class="container" style="-webkit-color-correction:default;">
-    <span class="text" style="-webkit-color-correction:sRGB;">G</span>
-</div>
-
-</body>
-</html>
diff --git a/LayoutTests/fast/css/color-correction-on-background-image.html b/LayoutTests/fast/css/color-correction-on-background-image.html
deleted file mode 100644 (file)
index c763ed3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<style>
-.purple {
-    background-image: url('resources/purple-noprofile.png');
-    width: 400px;
-    height: 400px;
-    float: left;
-}
-</style>
-
-<body>
-
-<p>The two squares below should not match each other. On the left an uncorrected image is tiled as a background, and on the right the same image is tiled as a background, but it is corrected from sRGB.</p>
-<div class="purple"></div>
-<div class="purple" style="-webkit-color-correction: sRGB;"></div>
-
-</body>
-</html>
diff --git a/LayoutTests/fast/css/color-correction-on-backgrounds.html b/LayoutTests/fast/css/color-correction-on-backgrounds.html
deleted file mode 100644 (file)
index da04cd5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<body>
-
-<p>These should match:</p>
-<div style="background-color:#560063; width:100px; height:100px; -webkit-color-correction:sRGB; float:left;"></div>
-<img src="resources/purple-srgb.png"/>
-
-<br/>
-<p>These should not match (at this time):</p>
-<div style="background-color:#560063; width:100px; height:100px; -webkit-color-correction:default; float:left;"></div>
-<img src="resources/purple-srgb.png"/>
-
-</body>
-</html>
diff --git a/LayoutTests/fast/css/color-correction-on-box-shadow.html b/LayoutTests/fast/css/color-correction-on-box-shadow.html
deleted file mode 100644 (file)
index 39f7f52..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<style>
-.purple-corrected {
-    background-color:#560063; 
-    width:100px; 
-    height:100px; 
-    -webkit-color-correction:sRGB; 
-    -webkit-box-shadow: 50px 50px 50px #560063
-}
-
-.purple-uncorrected {
-    background-color:#560063; 
-    width:100px; 
-    height:100px; 
-    -webkit-color-correction:default;  
-}
-</style>
-<body>
-
-<p>The shadow should match the color of the top square and not the color of the bottom square. The top square and its shadow are both color-corrected from sRGB.</p>
-<div class="purple-corrected"></div>
-<br/>
-<div class="purple-uncorrected"></div>
-
-</body>
-</html>
diff --git a/LayoutTests/fast/css/color-correction-on-text-shadow.html b/LayoutTests/fast/css/color-correction-on-text-shadow.html
deleted file mode 100644 (file)
index c9bdc05..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<style>
-.purple-corrected {
-    color:#560063; 
-    font-weight: bold;
-    font-size: 100px;
-    -webkit-color-correction:sRGB; 
-    text-shadow: 50px 50px 2px #560063
-}
-
-.purple-uncorrected {
-    color:#560063; 
-    font-weight: bold;
-    font-size: 100px;
-    -webkit-color-correction:default;  
-}
-</style>
-<body>
-
-<p>This is subtle, but the shadow should match the color of the top H and not the color of the bottom H. The top H and its shadow are both color-corrected from sRGB.</p>
-<span class="purple-corrected">H</span>
-<br/>
-<span class="purple-uncorrected">H</span>
-
-</body>
-</html>
diff --git a/LayoutTests/fast/css/color-correction-on-text.html b/LayoutTests/fast/css/color-correction-on-text.html
deleted file mode 100644 (file)
index 2baea3c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<style>
-    .text {
-        color:green;
-        font-size:150px;
-        font-weight:bold;
-    }
-</style>
-<body>
-
-    <p>The distinction below is subtle, but the middle "H" is color-corrected, and the first and last are not. 
-    </p>
-
-    <span class="text">H</span>
-    <span class="text" style="-webkit-color-correction:sRGB;">H</span>
-    <span class="text">H</span>
-
-</body>
-</html>
diff --git a/LayoutTests/fast/css/color-correction-untagged-images.html b/LayoutTests/fast/css/color-correction-untagged-images.html
deleted file mode 100644 (file)
index fa2f7d8..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<style>
-.purple {
-    border: solid 20px #560063;
-    float: left;
-}
-</style>
-
-<body>
-<p>The two squares below should not match each other. On the left is an uncorrected image and border, and on the right is the same image and same border color corrected from sRGB.</p>
-<img src="resources/purple-noprofile.png" class="purple" />
-<img src="resources/purple-noprofile.png" class="purple" style="-webkit-color-correction:sRGB;" />
-</body>
-</html>
diff --git a/LayoutTests/fast/css/color-correction.html b/LayoutTests/fast/css/color-correction.html
deleted file mode 100644 (file)
index 8dd6e5d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<style>
-.purple {
-    border: solid 20px #560063;
-}
-</style>
-<body>
-<p>This test demonstrates -webkit-color-correction. Below are 3 images with 20 pixel borders. The images are all the same -- purple with an sRGB color profile. The border is the same CSS color for all three images. The first image has no special CSS. The second has -webkit-color-correction set to default, so it matches the first image. And the third has -webkit-color-correction set to sRGB. This color-corrects the purple border from the sRGB color space, and the result is that the border and the image match.</p>
-<img src="resources/purple-srgb.png" class="purple" />
-<img src="resources/purple-srgb.png" class="purple" style="-webkit-color-correction: default;"/>
-<img src="resources/purple-srgb.png" class="purple" style="-webkit-color-correction: sRGB;"/>
-</body>
-</html>
index 3a142d0..cef8ffe 100644 (file)
@@ -136,7 +136,6 @@ zoom: 1;
 -webkit-box-pack: start;
 -webkit-box-reflect: none;
 -webkit-box-shadow: none;
 -webkit-box-pack: start;
 -webkit-box-reflect: none;
 -webkit-box-shadow: none;
--webkit-color-correction: default;
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
index c0dd3c7..4dd3d7d 100644 (file)
@@ -135,7 +135,6 @@ zoom: 1
 -webkit-box-pack: start
 -webkit-box-reflect: none
 -webkit-box-shadow: none
 -webkit-box-pack: start
 -webkit-box-reflect: none
 -webkit-box-shadow: none
--webkit-color-correction: default
 -webkit-column-break-after: auto
 -webkit-column-break-before: auto
 -webkit-column-break-inside: auto
 -webkit-column-break-after: auto
 -webkit-column-break-before: auto
 -webkit-column-break-inside: auto
index b09c71b..93f5425 100644 (file)
@@ -32,7 +32,6 @@ var propertiesToTest = {
     "-webkit-box-pack": true,
     "-webkit-box-reflect": true,
     "-webkit-box-shadow": true,
     "-webkit-box-pack": true,
     "-webkit-box-reflect": true,
     "-webkit-box-shadow": true,
-    "-webkit-color-correction": true,
     "-webkit-column-axis": true,
     "-webkit-column-break-after": true,
     "-webkit-column-break-before": true,
     "-webkit-column-axis": true,
     "-webkit-column-break-after": true,
     "-webkit-column-break-before": true,
diff --git a/LayoutTests/fast/css/parsing-color-correction-expected.txt b/LayoutTests/fast/css/parsing-color-correction-expected.txt
deleted file mode 100644 (file)
index ae4fa35..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-This tests checks that all of the input values for -webkit-color-correction parse correctly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS test("-webkit-color-correction: default;") is "default"
-PASS test("-webkit-color-correction: sRGB;") is "srgb"
-PASS test("-webkit-color-correction: srgb;") is "srgb"
-PASS test("-webkit-color-correction: apple;") is ""
-PASS test("-webkit-color-correction: 15;") is ""
-PASS test("-webkit-color-correction: auto;") is ""
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/css/parsing-color-correction.html b/LayoutTests/fast/css/parsing-color-correction.html
deleted file mode 100644 (file)
index 8d855a3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<style type="text/css"></style>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="resources/parsing-color-correction.js"></script>
-<script src="../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/resources/parsing-color-correction.js b/LayoutTests/fast/css/resources/parsing-color-correction.js
deleted file mode 100644 (file)
index 772b640..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-description("This tests checks that all of the input values for -webkit-color-correction parse correctly.");
-
-function test(value)
-{
-    var div = document.createElement("div");
-    div.setAttribute("style", value);
-    document.body.appendChild(div);
-    
-    var result = div.style.getPropertyValue("-webkit-color-correction");
-    document.body.removeChild(div);
-    return result;
-}
-
-shouldBe('test("-webkit-color-correction: default;")', '"default"');
-shouldBe('test("-webkit-color-correction: sRGB;")', '"srgb"');
-shouldBe('test("-webkit-color-correction: srgb;")', '"srgb"');
-
-shouldBeEqualToString('test("-webkit-color-correction: apple;")', '');
-shouldBeEqualToString('test("-webkit-color-correction: 15;")', '');
-shouldBeEqualToString('test("-webkit-color-correction: auto;")', '');
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-backgrounds-and-text-expected.png b/LayoutTests/platform/efl/fast/css/color-correction-backgrounds-and-text-expected.png
deleted file mode 100644 (file)
index 7eb24af..0000000
Binary files a/LayoutTests/platform/efl/fast/css/color-correction-backgrounds-and-text-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-backgrounds-and-text-expected.txt b/LayoutTests/platform/efl/fast/css/color-correction-backgrounds-and-text-expected.txt
deleted file mode 100644 (file)
index b8b637b..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-layer at (0,0) size 785x1072
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1072
-  RenderBlock {HTML} at (0,0) size 785x1072
-    RenderBody {BODY} at (8,8) size 769x1056
-      RenderBlock {P} at (0,0) size 769x36
-        RenderText {#text} at (0,0) size 747x35
-          text run at (0,0) width 747: "This container has no color correction, and neither does the text inside, so it will not be visible since both are green and"
-          text run at (0,18) width 78: "uncorrected."
-      RenderBlock {DIV} at (0,52) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,3) size 117x166
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,268) size 769x36
-        RenderText {#text} at (0,0) size 751x35
-          text run at (0,0) width 751: "This container has sRGB color correction specified, and so does the text inside, so the text will not be visible since both"
-          text run at (0,18) width 151: "are green and corrected."
-      RenderBlock {DIV} at (0,320) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,3) size 117x166
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,536) size 769x36
-        RenderText {#text} at (0,0) size 732x35
-          text run at (0,0) width 732: "This container has sRGB color correction specified. The text inside does not have the property specified, but the text"
-          text run at (0,18) width 584: "inherits the container's style, so the text will not be visible since both are green and corrected."
-      RenderBlock {DIV} at (0,588) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,3) size 117x166
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,804) size 769x36
-        RenderText {#text} at (0,0) size 761x35
-          text run at (0,0) width 761: "This container has default color-correction specified, and the text has sRGB color correction specified. This text is visible"
-          text run at (0,18) width 488: "even though both are green since the text is corrected and the container is not."
-      RenderBlock {DIV} at (0,856) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,3) size 117x166
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-expected.png b/LayoutTests/platform/efl/fast/css/color-correction-expected.png
deleted file mode 100644 (file)
index 9f58710..0000000
Binary files a/LayoutTests/platform/efl/fast/css/color-correction-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-expected.txt b/LayoutTests/platform/efl/fast/css/color-correction-expected.txt
deleted file mode 100644 (file)
index 81d7d01..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x90
-        RenderText {#text} at (0,0) size 769x89
-          text run at (0,0) width 763: "This test demonstrates -webkit-color-correction. Below are 3 images with 20 pixel borders. The images are all the same --"
-          text run at (0,18) width 755: "purple with an sRGB color profile. The border is the same CSS color for all three images. The first image has no special"
-          text run at (0,36) width 769: "CSS. The second has -webkit-color-correction set to default, so it matches the first image. And the third has -webkit-color-"
-          text run at (0,54) width 759: "correction set to sRGB. This color-corrects the purple border from the sRGB color space, and the result is that the border"
-          text run at (0,72) width 134: "and the image match."
-      RenderBlock (anonymous) at (0,106) size 784x144
-        RenderImage {IMG} at (0,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (140,126) size 4x17
-          text run at (140,126) width 4: " "
-        RenderImage {IMG} at (144,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (284,126) size 4x17
-          text run at (284,126) width 4: " "
-        RenderImage {IMG} at (288,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-background-image-expected.png b/LayoutTests/platform/efl/fast/css/color-correction-on-background-image-expected.png
deleted file mode 100644 (file)
index f1c9273..0000000
Binary files a/LayoutTests/platform/efl/fast/css/color-correction-on-background-image-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-background-image-expected.txt b/LayoutTests/platform/efl/fast/css/color-correction-on-background-image-expected.txt
deleted file mode 100644 (file)
index 52c92c7..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 785x860
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x860
-  RenderBlock {HTML} at (0,0) size 785x860
-    RenderBody {BODY} at (8,8) size 769x576
-      RenderBlock {P} at (0,0) size 769x36
-        RenderText {#text} at (0,0) size 768x35
-          text run at (0,0) width 768: "The two squares below should not match each other. On the left an uncorrected image is tiled as a background, and on the"
-          text run at (0,18) width 480: "right the same image is tiled as a background, but it is corrected from sRGB."
-      RenderBlock (floating) {DIV} at (0,52) size 400x400
-      RenderBlock (floating) {DIV} at (0,452) size 400x400
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-backgrounds-expected.png b/LayoutTests/platform/efl/fast/css/color-correction-on-backgrounds-expected.png
deleted file mode 100644 (file)
index 01af9e9..0000000
Binary files a/LayoutTests/platform/efl/fast/css/color-correction-on-backgrounds-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-backgrounds-expected.txt b/LayoutTests/platform/efl/fast/css/color-correction-on-backgrounds-expected.txt
deleted file mode 100644 (file)
index 250c79b..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 130x17
-          text run at (0,0) width 130: "These should match:"
-      RenderBlock (floating) {DIV} at (0,34) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,34) size 784x104
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (200,86) size 4x17
-          text run at (200,86) width 4: " "
-        RenderBR {BR} at (0,0) size 0x0
-      RenderBlock {P} at (0,154) size 784x18
-        RenderText {#text} at (0,0) size 236x17
-          text run at (0,0) width 236: "These should not match (at this time):"
-      RenderBlock (floating) {DIV} at (0,188) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,188) size 784x100
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-box-shadow-expected.png b/LayoutTests/platform/efl/fast/css/color-correction-on-box-shadow-expected.png
deleted file mode 100644 (file)
index 5ed9ca6..0000000
Binary files a/LayoutTests/platform/efl/fast/css/color-correction-on-box-shadow-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-box-shadow-expected.txt b/LayoutTests/platform/efl/fast/css/color-correction-on-box-shadow-expected.txt
deleted file mode 100644 (file)
index 42be845..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 777x35
-          text run at (0,0) width 777: "The shadow should match the color of the top square and not the color of the bottom square. The top square and its shadow"
-          text run at (0,18) width 232: "are both color-corrected from sRGB."
-      RenderBlock {DIV} at (0,52) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,152) size 784x18
-        RenderBR {BR} at (0,0) size 0x17
-      RenderBlock {DIV} at (0,170) size 100x100 [bgcolor=#560063]
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-text-expected.png b/LayoutTests/platform/efl/fast/css/color-correction-on-text-expected.png
deleted file mode 100644 (file)
index a5a234e..0000000
Binary files a/LayoutTests/platform/efl/fast/css/color-correction-on-text-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-text-expected.txt b/LayoutTests/platform/efl/fast/css/color-correction-on-text-expected.txt
deleted file mode 100644 (file)
index a1b1a88..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 618x17
-          text run at (0,0) width 618: "The distinction below is subtle, but the middle \"H\" is color-corrected, and the first and last are not."
-      RenderBlock (anonymous) at (0,34) size 784x172
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,3) size 117x166
-            text run at (0,3) width 117: "H"
-        RenderText {#text} at (117,123) size 4x17
-          text run at (117,123) width 4: " "
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (121,3) size 117x166
-            text run at (121,3) width 117: "H"
-        RenderText {#text} at (238,123) size 4x17
-          text run at (238,123) width 4: " "
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (242,3) size 117x166
-            text run at (242,3) width 117: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-text-shadow-expected.png b/LayoutTests/platform/efl/fast/css/color-correction-on-text-shadow-expected.png
deleted file mode 100644 (file)
index cb77038..0000000
Binary files a/LayoutTests/platform/efl/fast/css/color-correction-on-text-shadow-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-on-text-shadow-expected.txt b/LayoutTests/platform/efl/fast/css/color-correction-on-text-shadow-expected.txt
deleted file mode 100644 (file)
index 37734ef..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 746x35
-          text run at (0,0) width 746: "This is subtle, but the shadow should match the color of the top H and not the color of the bottom H. The top H and its"
-          text run at (0,18) width 285: "shadow are both color-corrected from sRGB."
-      RenderBlock (anonymous) at (0,52) size 784x230
-        RenderInline {SPAN} at (0,0) size 78x111 [color=#560063]
-          RenderText {#text} at (0,2) size 78x111
-            text run at (0,2) width 78: "H"
-        RenderText {#text} at (78,77) size 4x17
-          text run at (78,77) width 4: " "
-        RenderBR {BR} at (82,91) size 0x0
-        RenderInline {SPAN} at (0,0) size 78x111 [color=#560063]
-          RenderText {#text} at (0,117) size 78x111
-            text run at (0,117) width 78: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-untagged-images-expected.png b/LayoutTests/platform/efl/fast/css/color-correction-untagged-images-expected.png
deleted file mode 100644 (file)
index 7cc0755..0000000
Binary files a/LayoutTests/platform/efl/fast/css/color-correction-untagged-images-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/css/color-correction-untagged-images-expected.txt b/LayoutTests/platform/efl/fast/css/color-correction-untagged-images-expected.txt
deleted file mode 100644 (file)
index 1a3b6c9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 772x35
-          text run at (0,0) width 772: "The two squares below should not match each other. On the left is an uncorrected image and border, and on the right is the"
-          text run at (0,18) width 362: "same image and same border color corrected from sRGB."
-      RenderImage {IMG} at (0,52) size 140x140 [border: (20px solid #560063)]
-      RenderImage {IMG} at (140,52) size 140x140 [border: (20px solid #560063)]
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.png b/LayoutTests/platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.png
deleted file mode 100644 (file)
index 025be29..0000000
Binary files a/LayoutTests/platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.txt b/LayoutTests/platform/gtk/fast/css/color-correction-backgrounds-and-text-expected.txt
deleted file mode 100644 (file)
index bfc2ab9..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-layer at (0,0) size 785x1064
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1064
-  RenderBlock {HTML} at (0,0) size 785x1064
-    RenderBody {BODY} at (8,8) size 769x1048
-      RenderBlock {P} at (0,0) size 769x34
-        RenderText {#text} at (0,0) size 747x34
-          text run at (0,0) width 747: "This container has no color correction, and neither does the text inside, so it will not be visible since both are green and"
-          text run at (0,17) width 78: "uncorrected."
-      RenderBlock {DIV} at (0,50) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,0) size 117x166
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,266) size 769x34
-        RenderText {#text} at (0,0) size 751x34
-          text run at (0,0) width 751: "This container has sRGB color correction specified, and so does the text inside, so the text will not be visible since both"
-          text run at (0,17) width 151: "are green and corrected."
-      RenderBlock {DIV} at (0,316) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,0) size 117x166
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,532) size 769x34
-        RenderText {#text} at (0,0) size 732x34
-          text run at (0,0) width 732: "This container has sRGB color correction specified. The text inside does not have the property specified, but the text"
-          text run at (0,17) width 584: "inherits the container's style, so the text will not be visible since both are green and corrected."
-      RenderBlock {DIV} at (0,582) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,0) size 117x166
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,798) size 769x34
-        RenderText {#text} at (0,0) size 761x34
-          text run at (0,0) width 761: "This container has default color-correction specified, and the text has sRGB color correction specified. This text is visible"
-          text run at (0,17) width 488: "even though both are green since the text is corrected and the container is not."
-      RenderBlock {DIV} at (0,848) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,0) size 117x166
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-expected.png b/LayoutTests/platform/gtk/fast/css/color-correction-expected.png
deleted file mode 100644 (file)
index c61d598..0000000
Binary files a/LayoutTests/platform/gtk/fast/css/color-correction-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-expected.txt b/LayoutTests/platform/gtk/fast/css/color-correction-expected.txt
deleted file mode 100644 (file)
index 6a4e9f5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x85
-        RenderText {#text} at (0,0) size 769x85
-          text run at (0,0) width 763: "This test demonstrates -webkit-color-correction. Below are 3 images with 20 pixel borders. The images are all the same --"
-          text run at (0,17) width 755: "purple with an sRGB color profile. The border is the same CSS color for all three images. The first image has no special"
-          text run at (0,34) width 769: "CSS. The second has -webkit-color-correction set to default, so it matches the first image. And the third has -webkit-color-"
-          text run at (0,51) width 759: "correction set to sRGB. This color-corrects the purple border from the sRGB color space, and the result is that the border"
-          text run at (0,68) width 134: "and the image match."
-      RenderBlock (anonymous) at (0,101) size 784x143
-        RenderImage {IMG} at (0,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (140,126) size 4x17
-          text run at (140,126) width 4: " "
-        RenderImage {IMG} at (144,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (284,126) size 4x17
-          text run at (284,126) width 4: " "
-        RenderImage {IMG} at (288,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-background-image-expected.png b/LayoutTests/platform/gtk/fast/css/color-correction-on-background-image-expected.png
deleted file mode 100644 (file)
index bcf3ef3..0000000
Binary files a/LayoutTests/platform/gtk/fast/css/color-correction-on-background-image-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-background-image-expected.txt b/LayoutTests/platform/gtk/fast/css/color-correction-on-background-image-expected.txt
deleted file mode 100644 (file)
index b99c016..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 785x858
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x858
-  RenderBlock {HTML} at (0,0) size 785x858
-    RenderBody {BODY} at (8,8) size 769x576
-      RenderBlock {P} at (0,0) size 769x34
-        RenderText {#text} at (0,0) size 768x34
-          text run at (0,0) width 768: "The two squares below should not match each other. On the left an uncorrected image is tiled as a background, and on the"
-          text run at (0,17) width 480: "right the same image is tiled as a background, but it is corrected from sRGB."
-      RenderBlock (floating) {DIV} at (0,50) size 400x400
-      RenderBlock (floating) {DIV} at (0,450) size 400x400
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-backgrounds-expected.png b/LayoutTests/platform/gtk/fast/css/color-correction-on-backgrounds-expected.png
deleted file mode 100644 (file)
index ed2bffb..0000000
Binary files a/LayoutTests/platform/gtk/fast/css/color-correction-on-backgrounds-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-backgrounds-expected.txt b/LayoutTests/platform/gtk/fast/css/color-correction-on-backgrounds-expected.txt
deleted file mode 100644 (file)
index d4101bd..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x17
-        RenderText {#text} at (0,0) size 130x17
-          text run at (0,0) width 130: "These should match:"
-      RenderBlock (floating) {DIV} at (0,33) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,33) size 784x103
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (200,86) size 4x17
-          text run at (200,86) width 4: " "
-        RenderBR {BR} at (0,0) size 0x0
-      RenderBlock {P} at (0,152) size 784x17
-        RenderText {#text} at (0,0) size 236x17
-          text run at (0,0) width 236: "These should not match (at this time):"
-      RenderBlock (floating) {DIV} at (0,185) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,185) size 784x100
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-box-shadow-expected.png b/LayoutTests/platform/gtk/fast/css/color-correction-on-box-shadow-expected.png
deleted file mode 100644 (file)
index 2477e9b..0000000
Binary files a/LayoutTests/platform/gtk/fast/css/color-correction-on-box-shadow-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-box-shadow-expected.txt b/LayoutTests/platform/gtk/fast/css/color-correction-on-box-shadow-expected.txt
deleted file mode 100644 (file)
index 8c6ecec..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x34
-        RenderText {#text} at (0,0) size 777x34
-          text run at (0,0) width 777: "The shadow should match the color of the top square and not the color of the bottom square. The top square and its shadow"
-          text run at (0,17) width 232: "are both color-corrected from sRGB."
-      RenderBlock {DIV} at (0,50) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,150) size 784x17
-        RenderBR {BR} at (0,0) size 0x17
-      RenderBlock {DIV} at (0,167) size 100x100 [bgcolor=#560063]
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-text-expected.png b/LayoutTests/platform/gtk/fast/css/color-correction-on-text-expected.png
deleted file mode 100644 (file)
index ea22fb2..0000000
Binary files a/LayoutTests/platform/gtk/fast/css/color-correction-on-text-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-text-expected.txt b/LayoutTests/platform/gtk/fast/css/color-correction-on-text-expected.txt
deleted file mode 100644 (file)
index 762a083..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x17
-        RenderText {#text} at (0,0) size 618x17
-          text run at (0,0) width 618: "The distinction below is subtle, but the middle \"H\" is color-corrected, and the first and last are not."
-      RenderBlock (anonymous) at (0,33) size 784x166
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (0,0) size 117x166
-            text run at (0,0) width 117: "H"
-        RenderText {#text} at (117,120) size 4x17
-          text run at (117,120) width 4: " "
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (121,0) size 117x166
-            text run at (121,0) width 117: "H"
-        RenderText {#text} at (238,120) size 4x17
-          text run at (238,120) width 4: " "
-        RenderInline {SPAN} at (0,0) size 117x166 [color=#008000]
-          RenderText {#text} at (242,0) size 117x166
-            text run at (242,0) width 117: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-text-shadow-expected.png b/LayoutTests/platform/gtk/fast/css/color-correction-on-text-shadow-expected.png
deleted file mode 100644 (file)
index 3334808..0000000
Binary files a/LayoutTests/platform/gtk/fast/css/color-correction-on-text-shadow-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-on-text-shadow-expected.txt b/LayoutTests/platform/gtk/fast/css/color-correction-on-text-shadow-expected.txt
deleted file mode 100644 (file)
index 0119fbd..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x34
-        RenderText {#text} at (0,0) size 746x34
-          text run at (0,0) width 746: "This is subtle, but the shadow should match the color of the top H and not the color of the bottom H. The top H and its"
-          text run at (0,17) width 285: "shadow are both color-corrected from sRGB."
-      RenderBlock (anonymous) at (0,50) size 784x222
-        RenderInline {SPAN} at (0,0) size 78x111 [color=#560063]
-          RenderText {#text} at (0,0) size 78x111
-            text run at (0,0) width 78: "H"
-        RenderText {#text} at (78,75) size 4x17
-          text run at (78,75) width 4: " "
-        RenderBR {BR} at (82,89) size 0x0
-        RenderInline {SPAN} at (0,0) size 78x111 [color=#560063]
-          RenderText {#text} at (0,111) size 78x111
-            text run at (0,111) width 78: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-untagged-images-expected.png b/LayoutTests/platform/gtk/fast/css/color-correction-untagged-images-expected.png
deleted file mode 100644 (file)
index 0f720e2..0000000
Binary files a/LayoutTests/platform/gtk/fast/css/color-correction-untagged-images-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/gtk/fast/css/color-correction-untagged-images-expected.txt b/LayoutTests/platform/gtk/fast/css/color-correction-untagged-images-expected.txt
deleted file mode 100644 (file)
index fe6caa3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x34
-        RenderText {#text} at (0,0) size 772x34
-          text run at (0,0) width 772: "The two squares below should not match each other. On the left is an uncorrected image and border, and on the right is the"
-          text run at (0,17) width 362: "same image and same border color corrected from sRGB."
-      RenderImage {IMG} at (0,50) size 140x140 [border: (20px solid #560063)]
-      RenderImage {IMG} at (140,50) size 140x140 [border: (20px solid #560063)]
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-backgrounds-and-text-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-backgrounds-and-text-expected.txt
deleted file mode 100644 (file)
index 63f29c1..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-layer at (0,0) size 800x1088
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x1088
-  RenderBlock {HTML} at (0,0) size 800x1088
-    RenderBody {BODY} at (8,8) size 784x1072
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 764x39
-          text run at (0,0) width 764: "This container has no color correction, and neither does the text inside, so it will not be visible since both are green and"
-          text run at (0,20) width 80: "uncorrected."
-      RenderBlock {DIV} at (0,56) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,272) size 784x40
-        RenderText {#text} at (0,0) size 767x39
-          text run at (0,0) width 767: "This container has sRGB color correction specified, and so does the text inside, so the text will not be visible since both"
-          text run at (0,20) width 154: "are green and corrected."
-      RenderBlock {DIV} at (0,328) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,544) size 784x40
-        RenderText {#text} at (0,0) size 747x39
-          text run at (0,0) width 747: "This container has sRGB color correction specified. The text inside does not have the property specified, but the text"
-          text run at (0,20) width 599: "inherits the container's style, so the text will not be visible since both are green and corrected."
-      RenderBlock {DIV} at (0,600) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,816) size 784x40
-        RenderText {#text} at (0,0) size 779x39
-          text run at (0,0) width 779: "This container has default color-correction specified, and the text has sRGB color correction specified. This text is visible"
-          text run at (0,20) width 499: "even though both are green since the text is corrected and the container is not."
-      RenderBlock {DIV} at (0,872) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-expected.txt
deleted file mode 100644 (file)
index fecd739..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x100
-        RenderText {#text} at (0,0) size 780x99
-          text run at (0,0) width 780: "This test demonstrates -webkit-color-correction. Below are 3 images with 20 pixel borders. The images are all the same --"
-          text run at (0,20) width 770: "purple with an sRGB color profile. The border is the same CSS color for all three images. The first image has no special"
-          text run at (0,40) width 748: "CSS. The second has -webkit-color-correction set to default, so it matches the first image. And the third has -webkit-"
-          text run at (0,60) width 766: "color-correction set to sRGB. This color-corrects the purple border from the sRGB color space, and the result is that the"
-          text run at (0,80) width 183: "border and the image match."
-      RenderBlock (anonymous) at (0,116) size 784x145
-        RenderImage {IMG} at (0,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (140,125) size 4x19
-          text run at (140,125) width 4: " "
-        RenderImage {IMG} at (144,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (284,125) size 4x19
-          text run at (284,125) width 4: " "
-        RenderImage {IMG} at (288,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-background-image-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-background-image-expected.txt
deleted file mode 100644 (file)
index 40311c0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x864
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x864
-  RenderBlock {HTML} at (0,0) size 800x864
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 780x39
-          text run at (0,0) width 780: "The two squares below should not match each other. On the left an uncorrected image is tiled as a background, and on the"
-          text run at (0,20) width 491: "right the same image is tiled as a background, but it is corrected from sRGB."
-      RenderBlock (floating) {DIV} at (0,56) size 400x400
-      RenderBlock (floating) {DIV} at (0,456) size 400x400
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-backgrounds-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-backgrounds-expected.txt
deleted file mode 100644 (file)
index 1789669..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 133x19
-          text run at (0,0) width 133: "These should match:"
-      RenderBlock (floating) {DIV} at (0,36) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,36) size 784x105
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (200,85) size 4x19
-          text run at (200,85) width 4: " "
-        RenderBR {BR} at (0,0) size 0x0
-      RenderBlock {P} at (0,157) size 784x20
-        RenderText {#text} at (0,0) size 243x19
-          text run at (0,0) width 243: "These should not match (at this time):"
-      RenderBlock (floating) {DIV} at (0,193) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,193) size 784x100
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-box-shadow-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-box-shadow-expected.txt
deleted file mode 100644 (file)
index b955519..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 737x39
-          text run at (0,0) width 737: "The shadow should match the color of the top square and not the color of the bottom square. The top square and its"
-          text run at (0,20) width 289: "shadow are both color-corrected from sRGB."
-      RenderBlock {DIV} at (0,56) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,156) size 784x20
-        RenderBR {BR} at (0,0) size 0x19
-      RenderBlock {DIV} at (0,176) size 100x100 [bgcolor=#560063]
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-text-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-text-expected.txt
deleted file mode 100644 (file)
index 7f0d25f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 632x19
-          text run at (0,0) width 632: "The distinction below is subtle, but the middle \"H\" is color-corrected, and the first and last are not."
-      RenderBlock (anonymous) at (0,36) size 784x174
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "H"
-        RenderText {#text} at (116,122) size 5x19
-          text run at (116,122) width 5: " "
-        RenderInline {SPAN} at (0,0) size 118x167 [color=#008000]
-          RenderText {#text} at (120,3) size 118x167
-            text run at (120,3) width 118: "H"
-        RenderText {#text} at (237,122) size 5x19
-          text run at (237,122) width 5: " "
-        RenderInline {SPAN} at (0,0) size 118x167 [color=#008000]
-          RenderText {#text} at (241,3) size 118x167
-            text run at (241,3) width 118: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-text-shadow-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-on-text-shadow-expected.txt
deleted file mode 100644 (file)
index 21b8c24..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 759x39
-          text run at (0,0) width 759: "This is subtle, but the shadow should match the color of the top H and not the color of the bottom H. The top H and its"
-          text run at (0,20) width 289: "shadow are both color-corrected from sRGB."
-      RenderBlock (anonymous) at (0,56) size 784x234
-        RenderInline {SPAN} at (0,0) size 78x112 [color=#560063]
-          RenderText {#text} at (0,2) size 78x112
-            text run at (0,2) width 78: "H"
-        RenderText {#text} at (77,77) size 5x19
-          text run at (77,77) width 5: " "
-        RenderBR {BR} at (81,92) size 1x0
-        RenderInline {SPAN} at (0,0) size 78x112 [color=#560063]
-          RenderText {#text} at (0,119) size 78x112
-            text run at (0,119) width 78: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-untagged-images-expected.txt b/LayoutTests/platform/ios-simulator-wk2/fast/css/color-correction-untagged-images-expected.txt
deleted file mode 100644 (file)
index 516e72f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 784x39
-          text run at (0,0) width 784: "The two squares below should not match each other. On the left is an uncorrected image and border, and on the right is the"
-          text run at (0,20) width 369: "same image and same border color corrected from sRGB."
-      RenderImage {IMG} at (0,56) size 140x140 [border: (20px solid #560063)]
-      RenderImage {IMG} at (140,56) size 140x140 [border: (20px solid #560063)]
diff --git a/LayoutTests/platform/ios-simulator/fast/css/color-correction-backgrounds-and-text-expected.txt b/LayoutTests/platform/ios-simulator/fast/css/color-correction-backgrounds-and-text-expected.txt
deleted file mode 100644 (file)
index 63f29c1..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-layer at (0,0) size 800x1088
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x1088
-  RenderBlock {HTML} at (0,0) size 800x1088
-    RenderBody {BODY} at (8,8) size 784x1072
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 764x39
-          text run at (0,0) width 764: "This container has no color correction, and neither does the text inside, so it will not be visible since both are green and"
-          text run at (0,20) width 80: "uncorrected."
-      RenderBlock {DIV} at (0,56) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,272) size 784x40
-        RenderText {#text} at (0,0) size 767x39
-          text run at (0,0) width 767: "This container has sRGB color correction specified, and so does the text inside, so the text will not be visible since both"
-          text run at (0,20) width 154: "are green and corrected."
-      RenderBlock {DIV} at (0,328) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,544) size 784x40
-        RenderText {#text} at (0,0) size 747x39
-          text run at (0,0) width 747: "This container has sRGB color correction specified. The text inside does not have the property specified, but the text"
-          text run at (0,20) width 599: "inherits the container's style, so the text will not be visible since both are green and corrected."
-      RenderBlock {DIV} at (0,600) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,816) size 784x40
-        RenderText {#text} at (0,0) size 779x39
-          text run at (0,0) width 779: "This container has default color-correction specified, and the text has sRGB color correction specified. This text is visible"
-          text run at (0,20) width 499: "even though both are green since the text is corrected and the container is not."
-      RenderBlock {DIV} at (0,872) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/css/color-correction-expected.txt b/LayoutTests/platform/ios-simulator/fast/css/color-correction-expected.txt
deleted file mode 100644 (file)
index fecd739..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x100
-        RenderText {#text} at (0,0) size 780x99
-          text run at (0,0) width 780: "This test demonstrates -webkit-color-correction. Below are 3 images with 20 pixel borders. The images are all the same --"
-          text run at (0,20) width 770: "purple with an sRGB color profile. The border is the same CSS color for all three images. The first image has no special"
-          text run at (0,40) width 748: "CSS. The second has -webkit-color-correction set to default, so it matches the first image. And the third has -webkit-"
-          text run at (0,60) width 766: "color-correction set to sRGB. This color-corrects the purple border from the sRGB color space, and the result is that the"
-          text run at (0,80) width 183: "border and the image match."
-      RenderBlock (anonymous) at (0,116) size 784x145
-        RenderImage {IMG} at (0,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (140,125) size 4x19
-          text run at (140,125) width 4: " "
-        RenderImage {IMG} at (144,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (284,125) size 4x19
-          text run at (284,125) width 4: " "
-        RenderImage {IMG} at (288,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-background-image-expected.txt b/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-background-image-expected.txt
deleted file mode 100644 (file)
index 40311c0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x864
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x864
-  RenderBlock {HTML} at (0,0) size 800x864
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 780x39
-          text run at (0,0) width 780: "The two squares below should not match each other. On the left an uncorrected image is tiled as a background, and on the"
-          text run at (0,20) width 491: "right the same image is tiled as a background, but it is corrected from sRGB."
-      RenderBlock (floating) {DIV} at (0,56) size 400x400
-      RenderBlock (floating) {DIV} at (0,456) size 400x400
diff --git a/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-backgrounds-expected.txt b/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-backgrounds-expected.txt
deleted file mode 100644 (file)
index 1789669..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 133x19
-          text run at (0,0) width 133: "These should match:"
-      RenderBlock (floating) {DIV} at (0,36) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,36) size 784x105
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (200,85) size 4x19
-          text run at (200,85) width 4: " "
-        RenderBR {BR} at (0,0) size 0x0
-      RenderBlock {P} at (0,157) size 784x20
-        RenderText {#text} at (0,0) size 243x19
-          text run at (0,0) width 243: "These should not match (at this time):"
-      RenderBlock (floating) {DIV} at (0,193) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,193) size 784x100
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-box-shadow-expected.txt b/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-box-shadow-expected.txt
deleted file mode 100644 (file)
index b955519..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 737x39
-          text run at (0,0) width 737: "The shadow should match the color of the top square and not the color of the bottom square. The top square and its"
-          text run at (0,20) width 289: "shadow are both color-corrected from sRGB."
-      RenderBlock {DIV} at (0,56) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,156) size 784x20
-        RenderBR {BR} at (0,0) size 0x19
-      RenderBlock {DIV} at (0,176) size 100x100 [bgcolor=#560063]
diff --git a/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-text-expected.txt b/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-text-expected.txt
deleted file mode 100644 (file)
index 7f0d25f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 632x19
-          text run at (0,0) width 632: "The distinction below is subtle, but the middle \"H\" is color-corrected, and the first and last are not."
-      RenderBlock (anonymous) at (0,36) size 784x174
-        RenderInline {SPAN} at (0,0) size 117x167 [color=#008000]
-          RenderText {#text} at (0,3) size 117x167
-            text run at (0,3) width 117: "H"
-        RenderText {#text} at (116,122) size 5x19
-          text run at (116,122) width 5: " "
-        RenderInline {SPAN} at (0,0) size 118x167 [color=#008000]
-          RenderText {#text} at (120,3) size 118x167
-            text run at (120,3) width 118: "H"
-        RenderText {#text} at (237,122) size 5x19
-          text run at (237,122) width 5: " "
-        RenderInline {SPAN} at (0,0) size 118x167 [color=#008000]
-          RenderText {#text} at (241,3) size 118x167
-            text run at (241,3) width 118: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-text-shadow-expected.txt b/LayoutTests/platform/ios-simulator/fast/css/color-correction-on-text-shadow-expected.txt
deleted file mode 100644 (file)
index 21b8c24..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 759x39
-          text run at (0,0) width 759: "This is subtle, but the shadow should match the color of the top H and not the color of the bottom H. The top H and its"
-          text run at (0,20) width 289: "shadow are both color-corrected from sRGB."
-      RenderBlock (anonymous) at (0,56) size 784x234
-        RenderInline {SPAN} at (0,0) size 78x112 [color=#560063]
-          RenderText {#text} at (0,2) size 78x112
-            text run at (0,2) width 78: "H"
-        RenderText {#text} at (77,77) size 5x19
-          text run at (77,77) width 5: " "
-        RenderBR {BR} at (81,92) size 1x0
-        RenderInline {SPAN} at (0,0) size 78x112 [color=#560063]
-          RenderText {#text} at (0,119) size 78x112
-            text run at (0,119) width 78: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-simulator/fast/css/color-correction-untagged-images-expected.txt b/LayoutTests/platform/ios-simulator/fast/css/color-correction-untagged-images-expected.txt
deleted file mode 100644 (file)
index 516e72f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 784x39
-          text run at (0,0) width 784: "The two squares below should not match each other. On the left is an uncorrected image and border, and on the right is the"
-          text run at (0,20) width 369: "same image and same border color corrected from sRGB."
-      RenderImage {IMG} at (0,56) size 140x140 [border: (20px solid #560063)]
-      RenderImage {IMG} at (140,56) size 140x140 [border: (20px solid #560063)]
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-backgrounds-and-text-expected.png b/LayoutTests/platform/mac/fast/css/color-correction-backgrounds-and-text-expected.png
deleted file mode 100644 (file)
index 1be449d..0000000
Binary files a/LayoutTests/platform/mac/fast/css/color-correction-backgrounds-and-text-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-backgrounds-and-text-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-backgrounds-and-text-expected.txt
deleted file mode 100644 (file)
index f19eb21..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-layer at (0,0) size 785x1072
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1072
-  RenderBlock {HTML} at (0,0) size 785x1072
-    RenderBody {BODY} at (8,8) size 769x1056
-      RenderBlock {P} at (0,0) size 769x36
-        RenderText {#text} at (0,0) size 764x36
-          text run at (0,0) width 764: "This container has no color correction, and neither does the text inside, so it will not be visible since both are green and"
-          text run at (0,18) width 80: "uncorrected."
-      RenderBlock {DIV} at (0,52) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,268) size 769x36
-        RenderText {#text} at (0,0) size 766x36
-          text run at (0,0) width 766: "This container has sRGB color correction specified, and so does the text inside, so the text will not be visible since both"
-          text run at (0,18) width 154: "are green and corrected."
-      RenderBlock {DIV} at (0,320) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,536) size 769x36
-        RenderText {#text} at (0,0) size 745x36
-          text run at (0,0) width 745: "This container has sRGB color correction specified. The text inside does not have the property specified, but the text"
-          text run at (0,18) width 599: "inherits the container's style, so the text will not be visible since both are green and corrected."
-      RenderBlock {DIV} at (0,588) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,804) size 769x36
-        RenderText {#text} at (0,0) size 731x36
-          text run at (0,0) width 731: "This container has default color-correction specified, and the text has sRGB color correction specified. This text is"
-          text run at (0,18) width 545: "visible even though both are green since the text is corrected and the container is not."
-      RenderBlock {DIV} at (0,856) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-expected.png b/LayoutTests/platform/mac/fast/css/color-correction-expected.png
deleted file mode 100644 (file)
index 7985bc9..0000000
Binary files a/LayoutTests/platform/mac/fast/css/color-correction-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-expected.txt
deleted file mode 100644 (file)
index 40a0f6c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x90
-        RenderText {#text} at (0,0) size 780x90
-          text run at (0,0) width 780: "This test demonstrates -webkit-color-correction. Below are 3 images with 20 pixel borders. The images are all the same --"
-          text run at (0,18) width 768: "purple with an sRGB color profile. The border is the same CSS color for all three images. The first image has no special"
-          text run at (0,36) width 747: "CSS. The second has -webkit-color-correction set to default, so it matches the first image. And the third has -webkit-"
-          text run at (0,54) width 766: "color-correction set to sRGB. This color-corrects the purple border from the sRGB color space, and the result is that the"
-          text run at (0,72) width 183: "border and the image match."
-      RenderBlock (anonymous) at (0,106) size 784x144
-        RenderImage {IMG} at (0,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (140,126) size 4x18
-          text run at (140,126) width 4: " "
-        RenderImage {IMG} at (144,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (284,126) size 4x18
-          text run at (284,126) width 4: " "
-        RenderImage {IMG} at (288,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.png b/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.png
deleted file mode 100644 (file)
index 9ffe200..0000000
Binary files a/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-on-background-image-expected.txt
deleted file mode 100644 (file)
index c73b39c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 785x860
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x860
-  RenderBlock {HTML} at (0,0) size 785x860
-    RenderBody {BODY} at (8,8) size 769x576
-      RenderBlock {P} at (0,0) size 769x36
-        RenderText {#text} at (0,0) size 756x36
-          text run at (0,0) width 756: "The two squares below should not match each other. On the left an uncorrected image is tiled as a background, and on"
-          text run at (0,18) width 515: "the right the same image is tiled as a background, but it is corrected from sRGB."
-      RenderBlock (floating) {DIV} at (0,52) size 400x400
-      RenderBlock (floating) {DIV} at (0,452) size 400x400
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-backgrounds-expected.png b/LayoutTests/platform/mac/fast/css/color-correction-on-backgrounds-expected.png
deleted file mode 100644 (file)
index 2fadb1e..0000000
Binary files a/LayoutTests/platform/mac/fast/css/color-correction-on-backgrounds-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-backgrounds-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-on-backgrounds-expected.txt
deleted file mode 100644 (file)
index 7fb1610..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 133x18
-          text run at (0,0) width 133: "These should match:"
-      RenderBlock (floating) {DIV} at (0,34) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,34) size 784x104
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (200,86) size 4x18
-          text run at (200,86) width 4: " "
-        RenderBR {BR} at (0,0) size 0x0
-      RenderBlock {P} at (0,154) size 784x18
-        RenderText {#text} at (0,0) size 243x18
-          text run at (0,0) width 243: "These should not match (at this time):"
-      RenderBlock (floating) {DIV} at (0,188) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,188) size 784x100
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-box-shadow-expected.png b/LayoutTests/platform/mac/fast/css/color-correction-on-box-shadow-expected.png
deleted file mode 100644 (file)
index be10510..0000000
Binary files a/LayoutTests/platform/mac/fast/css/color-correction-on-box-shadow-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-box-shadow-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-on-box-shadow-expected.txt
deleted file mode 100644 (file)
index 58c7a8b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 737x36
-          text run at (0,0) width 737: "The shadow should match the color of the top square and not the color of the bottom square. The top square and its"
-          text run at (0,18) width 289: "shadow are both color-corrected from sRGB."
-      RenderBlock {DIV} at (0,52) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,152) size 784x18
-        RenderBR {BR} at (0,0) size 0x18
-      RenderBlock {DIV} at (0,170) size 100x100 [bgcolor=#560063]
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-text-expected.png b/LayoutTests/platform/mac/fast/css/color-correction-on-text-expected.png
deleted file mode 100644 (file)
index fd86d75..0000000
Binary files a/LayoutTests/platform/mac/fast/css/color-correction-on-text-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-text-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-on-text-expected.txt
deleted file mode 100644 (file)
index 29a66a3..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 631x18
-          text run at (0,0) width 631: "The distinction below is subtle, but the middle \"H\" is color-corrected, and the first and last are not."
-      RenderBlock (anonymous) at (0,34) size 784x174
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "H"
-        RenderText {#text} at (116,122) size 5x18
-          text run at (116,122) width 5: " "
-        RenderInline {SPAN} at (0,0) size 118x174 [color=#008000]
-          RenderText {#text} at (120,0) size 118x174
-            text run at (120,0) width 118: "H"
-        RenderText {#text} at (237,122) size 5x18
-          text run at (237,122) width 5: " "
-        RenderInline {SPAN} at (0,0) size 118x174 [color=#008000]
-          RenderText {#text} at (241,0) size 118x174
-            text run at (241,0) width 118: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-text-shadow-expected.png b/LayoutTests/platform/mac/fast/css/color-correction-on-text-shadow-expected.png
deleted file mode 100644 (file)
index 078dedf..0000000
Binary files a/LayoutTests/platform/mac/fast/css/color-correction-on-text-shadow-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-on-text-shadow-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-on-text-shadow-expected.txt
deleted file mode 100644 (file)
index 9593721..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 759x36
-          text run at (0,0) width 759: "This is subtle, but the shadow should match the color of the top H and not the color of the bottom H. The top H and its"
-          text run at (0,18) width 289: "shadow are both color-corrected from sRGB."
-      RenderBlock (anonymous) at (0,52) size 784x230
-        RenderInline {SPAN} at (0,0) size 78x115 [color=#560063]
-          RenderText {#text} at (0,0) size 78x115
-            text run at (0,0) width 78: "H"
-        RenderText {#text} at (77,76) size 5x18
-          text run at (77,76) width 5: " "
-        RenderBR {BR} at (81,90) size 1x0
-        RenderInline {SPAN} at (0,0) size 78x115 [color=#560063]
-          RenderText {#text} at (0,115) size 78x115
-            text run at (0,115) width 78: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-untagged-images-expected.png b/LayoutTests/platform/mac/fast/css/color-correction-untagged-images-expected.png
deleted file mode 100644 (file)
index e3a4ce7..0000000
Binary files a/LayoutTests/platform/mac/fast/css/color-correction-untagged-images-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/css/color-correction-untagged-images-expected.txt b/LayoutTests/platform/mac/fast/css/color-correction-untagged-images-expected.txt
deleted file mode 100644 (file)
index ff0b471..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 784x36
-          text run at (0,0) width 784: "The two squares below should not match each other. On the left is an uncorrected image and border, and on the right is the"
-          text run at (0,18) width 369: "same image and same border color corrected from sRGB."
-      RenderImage {IMG} at (0,52) size 140x140 [border: (20px solid #560063)]
-      RenderImage {IMG} at (140,52) size 140x140 [border: (20px solid #560063)]
diff --git a/LayoutTests/platform/win/fast/css/color-correction-backgrounds-and-text-expected.txt b/LayoutTests/platform/win/fast/css/color-correction-backgrounds-and-text-expected.txt
deleted file mode 100644 (file)
index 97a53ba..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-layer at (0,0) size 785x1072
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1072
-  RenderBlock {HTML} at (0,0) size 785x1072
-    RenderBody {BODY} at (8,8) size 769x1056
-      RenderBlock {P} at (0,0) size 769x36
-        RenderText {#text} at (0,0) size 747x36
-          text run at (0,0) width 747: "This container has no color correction, and neither does the text inside, so it will not be visible since both are green and"
-          text run at (0,18) width 78: "uncorrected."
-      RenderBlock {DIV} at (0,52) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,268) size 769x36
-        RenderText {#text} at (0,0) size 751x36
-          text run at (0,0) width 751: "This container has sRGB color correction specified, and so does the text inside, so the text will not be visible since both"
-          text run at (0,18) width 151: "are green and corrected."
-      RenderBlock {DIV} at (0,320) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,536) size 769x36
-        RenderText {#text} at (0,0) size 732x36
-          text run at (0,0) width 732: "This container has sRGB color correction specified. The text inside does not have the property specified, but the text"
-          text run at (0,18) width 584: "inherits the container's style, so the text will not be visible since both are green and corrected."
-      RenderBlock {DIV} at (0,588) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (0,804) size 769x36
-        RenderText {#text} at (0,0) size 761x36
-          text run at (0,0) width 761: "This container has default color-correction specified, and the text has sRGB color correction specified. This text is visible"
-          text run at (0,18) width 488: "even though both are green since the text is corrected and the container is not."
-      RenderBlock {DIV} at (0,856) size 200x200 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "G"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/css/color-correction-expected.txt b/LayoutTests/platform/win/fast/css/color-correction-expected.txt
deleted file mode 100644 (file)
index a668ff3..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x90
-        RenderText {#text} at (0,0) size 769x90
-          text run at (0,0) width 763: "This test demonstrates -webkit-color-correction. Below are 3 images with 20 pixel borders. The images are all the same --"
-          text run at (0,18) width 755: "purple with an sRGB color profile. The border is the same CSS color for all three images. The first image has no special"
-          text run at (0,36) width 769: "CSS. The second has -webkit-color-correction set to default, so it matches the first image. And the third has -webkit-color-"
-          text run at (0,54) width 759: "correction set to sRGB. This color-corrects the purple border from the sRGB color space, and the result is that the border"
-          text run at (0,72) width 134: "and the image match."
-      RenderBlock (anonymous) at (0,106) size 784x144
-        RenderImage {IMG} at (0,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (140,126) size 4x18
-          text run at (140,126) width 4: " "
-        RenderImage {IMG} at (144,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (284,126) size 4x18
-          text run at (284,126) width 4: " "
-        RenderImage {IMG} at (288,0) size 140x140 [border: (20px solid #560063)]
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/css/color-correction-on-background-image-expected.txt b/LayoutTests/platform/win/fast/css/color-correction-on-background-image-expected.txt
deleted file mode 100644 (file)
index 2ed4c7d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 785x860
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x860
-  RenderBlock {HTML} at (0,0) size 785x860
-    RenderBody {BODY} at (8,8) size 769x576
-      RenderBlock {P} at (0,0) size 769x36
-        RenderText {#text} at (0,0) size 768x36
-          text run at (0,0) width 768: "The two squares below should not match each other. On the left an uncorrected image is tiled as a background, and on the"
-          text run at (0,18) width 480: "right the same image is tiled as a background, but it is corrected from sRGB."
-      RenderBlock (floating) {DIV} at (0,52) size 400x400
-      RenderBlock (floating) {DIV} at (0,452) size 400x400
diff --git a/LayoutTests/platform/win/fast/css/color-correction-on-backgrounds-expected.txt b/LayoutTests/platform/win/fast/css/color-correction-on-backgrounds-expected.txt
deleted file mode 100644 (file)
index fde0c21..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 130x18
-          text run at (0,0) width 130: "These should match:"
-      RenderBlock (floating) {DIV} at (0,34) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,34) size 784x104
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (200,86) size 4x18
-          text run at (200,86) width 4: " "
-        RenderBR {BR} at (0,0) size 0x0
-      RenderBlock {P} at (0,154) size 784x18
-        RenderText {#text} at (0,0) size 236x18
-          text run at (0,0) width 236: "These should not match (at this time):"
-      RenderBlock (floating) {DIV} at (0,188) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,188) size 784x100
-        RenderImage {IMG} at (100,0) size 100x100
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/css/color-correction-on-box-shadow-expected.txt b/LayoutTests/platform/win/fast/css/color-correction-on-box-shadow-expected.txt
deleted file mode 100644 (file)
index 8a10ff6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 777x36
-          text run at (0,0) width 777: "The shadow should match the color of the top square and not the color of the bottom square. The top square and its shadow"
-          text run at (0,18) width 232: "are both color-corrected from sRGB."
-      RenderBlock {DIV} at (0,52) size 100x100 [bgcolor=#560063]
-      RenderBlock (anonymous) at (0,152) size 784x18
-        RenderBR {BR} at (0,0) size 0x18
-      RenderBlock {DIV} at (0,170) size 100x100 [bgcolor=#560063]
diff --git a/LayoutTests/platform/win/fast/css/color-correction-on-text-expected.txt b/LayoutTests/platform/win/fast/css/color-correction-on-text-expected.txt
deleted file mode 100644 (file)
index b30c17f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 618x18
-          text run at (0,0) width 618: "The distinction below is subtle, but the middle \"H\" is color-corrected, and the first and last are not."
-      RenderBlock (anonymous) at (0,34) size 784x174
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (0,0) size 117x174
-            text run at (0,0) width 117: "H"
-        RenderText {#text} at (117,122) size 4x18
-          text run at (117,122) width 4: " "
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (121,0) size 117x174
-            text run at (121,0) width 117: "H"
-        RenderText {#text} at (238,122) size 4x18
-          text run at (238,122) width 4: " "
-        RenderInline {SPAN} at (0,0) size 117x174 [color=#008000]
-          RenderText {#text} at (242,0) size 117x174
-            text run at (242,0) width 117: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/css/color-correction-on-text-shadow-expected.txt b/LayoutTests/platform/win/fast/css/color-correction-on-text-shadow-expected.txt
deleted file mode 100644 (file)
index 9e80f94..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 746x36
-          text run at (0,0) width 746: "This is subtle, but the shadow should match the color of the top H and not the color of the bottom H. The top H and its"
-          text run at (0,18) width 285: "shadow are both color-corrected from sRGB."
-      RenderBlock (anonymous) at (0,52) size 784x230
-        RenderInline {SPAN} at (0,0) size 78x115 [color=#560063]
-          RenderText {#text} at (0,0) size 78x115
-            text run at (0,0) width 78: "H"
-        RenderText {#text} at (78,76) size 4x18
-          text run at (78,76) width 4: " "
-        RenderBR {BR} at (82,90) size 0x0
-        RenderInline {SPAN} at (0,0) size 78x115 [color=#560063]
-          RenderText {#text} at (0,115) size 78x115
-            text run at (0,115) width 78: "H"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/css/color-correction-untagged-images-expected.txt b/LayoutTests/platform/win/fast/css/color-correction-untagged-images-expected.txt
deleted file mode 100644 (file)
index 21bd3ad..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 772x36
-          text run at (0,0) width 772: "The two squares below should not match each other. On the left is an uncorrected image and border, and on the right is the"
-          text run at (0,18) width 362: "same image and same border color corrected from sRGB."
-      RenderImage {IMG} at (0,52) size 140x140 [border: (20px solid #560063)]
-      RenderImage {IMG} at (140,52) size 140x140 [border: (20px solid #560063)]
index feb8453..2fb96ab 100644 (file)
@@ -270,8 +270,6 @@ rect: style.getPropertyValue(-webkit-box-reflect) : none
 rect: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-box-shadow) : none
 rect: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
 rect: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-box-shadow) : none
 rect: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-color-correction) : default
-rect: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-after) : auto
 rect: style.getPropertyCSSValue(-webkit-column-break-after) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-before) : auto
 rect: style.getPropertyValue(-webkit-column-break-after) : auto
 rect: style.getPropertyCSSValue(-webkit-column-break-after) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-before) : auto
@@ -794,8 +792,6 @@ g: style.getPropertyValue(-webkit-box-reflect) : none
 g: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-box-shadow) : none
 g: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
 g: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-box-shadow) : none
 g: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-color-correction) : default
-g: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-after) : auto
 g: style.getPropertyCSSValue(-webkit-column-break-after) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-before) : auto
 g: style.getPropertyValue(-webkit-column-break-after) : auto
 g: style.getPropertyCSSValue(-webkit-column-break-after) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-before) : auto
index 53a3a4b..9bb2abe 100644 (file)
@@ -1,3 +1,61 @@
+2015-08-08  Darin Adler  <darin@apple.com>
+
+        Remove -webkit-color-correction CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=147812
+
+        Reviewed by Maciej Stachowiak.
+
+        Covered by existing tests.
+
+        I am doing some general cleanup of handling of color spaces in WebKit.
+        This removes the obsolete web-visible property that allowed clients to
+        get color correction on older Apple platforms where we chose not to do
+        it all the time for performance reasons. Currently, it has no effect on
+        any supported platform.
+
+        Now that this property is removed, a website can detect that it's not
+        there if it uses getComputedStyle, but I don't expect this to have
+        significant compatibility fallout. It's harmless to continue using the
+        property in legacy content or websites that have not been updated, since
+        unknown property names are ignored and it had no effect before anyway.
+
+        * css/CSSComputedStyleDeclaration.cpp: Removed
+        CSSPropertyWebkitColorCorrection from the list of computed properties.
+        (WebCore::ComputedStyleExtractor::propertyValue): Removed the
+        CSSPropertyWebkitColorCorrection case.
+
+        * css/CSSParser.cpp:
+        (WebCore::isValidKeywordPropertyAndValue): Removed the
+        CSSPropertyWebkitColorCorrection case.
+        (WebCore::isKeywordPropertyID): Ditto.
+        (WebCore::CSSParser::parseValue): Ditto.
+
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted the overload
+        of this that converts a ColorSpace to a CSSPrimitiveValue.
+        (WebCore::CSSPrimitiveValue::operator ColorSpace): Deleted.
+
+        * css/CSSPropertyNames.in: Removed -webkit-color-correction.
+
+        * css/CSSValueKeywords.in: Removed the -webkit-color-correction section,
+        which contained sRGB.
+
+        * css/SVGCSSValueKeywords.in: Uncommented sRGB now that it's not shared
+        with -webkit-color-correction.
+
+        * rendering/style/RenderStyle.h: Removed setColorSpace and initialColorSpace.
+        Kept colorSpace around for now, but it simply returns ColorSpaceSRGB.
+        This prevents us from needing to touch every single call site that passes
+        the color space in to functions in the platform graphics abstraction.
+        We'll touch most of those call sites when we change Color to include the
+        color space and eventually we can delete this.
+
+        * rendering/style/StyleRareInheritedData.cpp: Deleted colorSpace.
+        (WebCore::StyleRareInheritedData::StyleRareInheritedData): Deleted
+        code to initialize colorSpace and to copy colorSpace.
+        (WebCore::StyleRareInheritedData::operator==): Deleted code to compare
+        colorSpace.
+
 2015-08-09  Eric Carlson  <eric.carlson@apple.com>
 
         [Mac] Always require ExternalDeviceAutoPlayCandidate flag to AirPlay automatically
 2015-08-09  Eric Carlson  <eric.carlson@apple.com>
 
         [Mac] Always require ExternalDeviceAutoPlayCandidate flag to AirPlay automatically
index f2446a3..2ec4442 100644 (file)
@@ -282,7 +282,6 @@ static const CSSPropertyID computedProperties[] = {
     CSSPropertyWebkitBoxReflect,
     CSSPropertyWebkitBoxShadow,
     CSSPropertyWebkitClipPath,
     CSSPropertyWebkitBoxReflect,
     CSSPropertyWebkitBoxShadow,
     CSSPropertyWebkitClipPath,
-    CSSPropertyWebkitColorCorrection,
     CSSPropertyWebkitColumnBreakAfter,
     CSSPropertyWebkitColumnBreakBefore,
     CSSPropertyWebkitColumnBreakInside,
     CSSPropertyWebkitColumnBreakAfter,
     CSSPropertyWebkitColumnBreakBefore,
     CSSPropertyWebkitColumnBreakInside,
@@ -3006,8 +3005,6 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
         }
         case CSSPropertyPointerEvents:
             return cssValuePool().createValue(style->pointerEvents());
         }
         case CSSPropertyPointerEvents:
             return cssValuePool().createValue(style->pointerEvents());
-        case CSSPropertyWebkitColorCorrection:
-            return cssValuePool().createValue(style->colorSpace());
         case CSSPropertyWebkitLineGrid:
             if (style->lineGrid().isNull())
                 return cssValuePool().createIdentifierValue(CSSValueNone);
         case CSSPropertyWebkitLineGrid:
             if (style->lineGrid().isNull())
                 return cssValuePool().createIdentifierValue(CSSValueNone);
index 4dbec3a..c57fa03 100644 (file)
@@ -873,10 +873,6 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int
         if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueJustify)
             return true;
         break;
         if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueJustify)
             return true;
         break;
-    case CSSPropertyWebkitColorCorrection:
-        if (valueID == CSSValueSrgb || valueID == CSSValueDefault)
-            return true;
-        break;
     case CSSPropertyColumnFill:
         if (valueID == CSSValueAuto || valueID == CSSValueBalance)
             return true;
     case CSSPropertyColumnFill:
         if (valueID == CSSValueAuto || valueID == CSSValueBalance)
             return true;
@@ -1111,7 +1107,6 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId)
     case CSSPropertyWebkitBoxLines:
     case CSSPropertyWebkitBoxOrient:
     case CSSPropertyWebkitBoxPack:
     case CSSPropertyWebkitBoxLines:
     case CSSPropertyWebkitBoxOrient:
     case CSSPropertyWebkitBoxPack:
-    case CSSPropertyWebkitColorCorrection:
     case CSSPropertyWebkitColumnBreakAfter:
     case CSSPropertyWebkitColumnBreakBefore:
     case CSSPropertyWebkitColumnBreakInside:
     case CSSPropertyWebkitColumnBreakAfter:
     case CSSPropertyWebkitColumnBreakBefore:
     case CSSPropertyWebkitColumnBreakInside:
@@ -3100,7 +3095,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
     case CSSPropertyWebkitBoxLines:
     case CSSPropertyWebkitBoxOrient:
     case CSSPropertyWebkitBoxPack:
     case CSSPropertyWebkitBoxLines:
     case CSSPropertyWebkitBoxOrient:
     case CSSPropertyWebkitBoxPack:
-    case CSSPropertyWebkitColorCorrection:
     case CSSPropertyWebkitColumnBreakAfter:
     case CSSPropertyWebkitColumnBreakBefore:
     case CSSPropertyWebkitColumnBreakInside:
     case CSSPropertyWebkitColumnBreakAfter:
     case CSSPropertyWebkitColumnBreakBefore:
     case CSSPropertyWebkitColumnBreakInside:
index 61b9b2b..ff6ea76 100644 (file)
@@ -3747,42 +3747,6 @@ template<> inline CSSPrimitiveValue::operator TextRenderingMode() const
     return AutoTextRendering;
 }
 
     return AutoTextRendering;
 }
 
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColorSpace space)
-    : CSSValue(PrimitiveClass)
-{
-    m_primitiveUnitType = CSS_VALUE_ID;
-    switch (space) {
-    case ColorSpaceDeviceRGB:
-        m_value.valueID = CSSValueDefault;
-        break;
-    case ColorSpaceSRGB:
-        m_value.valueID = CSSValueSrgb;
-        break;
-    case ColorSpaceLinearRGB:
-        // CSS color correction does not support linearRGB yet.
-        ASSERT_NOT_REACHED();
-        m_value.valueID = CSSValueDefault;
-        break;
-    }
-}
-
-template<> inline CSSPrimitiveValue::operator ColorSpace() const
-{
-    ASSERT(isValueID());
-
-    switch (m_value.valueID) {
-    case CSSValueDefault:
-        return ColorSpaceDeviceRGB;
-    case CSSValueSrgb:
-        return ColorSpaceSRGB;
-    default:
-        break;
-    }
-
-    ASSERT_NOT_REACHED();
-    return ColorSpaceDeviceRGB;
-}
-
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Hyphens hyphens)
     : CSSValue(PrimitiveClass)
 {
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Hyphens hyphens)
     : CSSValue(PrimitiveClass)
 {
index eaeb14d..fd6369f 100644 (file)
@@ -419,7 +419,6 @@ alt [NameForMethods=ContentAltText, Custom=Value]
 // Let -webkit-box-shadow blur radius be w_r and box-shadow blur radius be b_r. For
 // w_r > 8px, b_r = 8 + 4 * sqrt((w_r - 8) / 2).
 -webkit-box-shadow [Custom=All]
 // Let -webkit-box-shadow blur radius be w_r and box-shadow blur radius be b_r. For
 // w_r > 8px, b_r = 8 + 4 * sqrt((w_r - 8) / 2).
 -webkit-box-shadow [Custom=All]
--webkit-color-correction [Inherited, NameForMethods=ColorSpace]
 -webkit-column-axis
 -webkit-column-break-after [Initial=initialPageBreak]
 -webkit-column-break-before [Initial=initialPageBreak]
 -webkit-column-axis
 -webkit-column-break-after [Initial=initialPageBreak]
 -webkit-column-break-before [Initial=initialPageBreak]
index 620c7e2..fd80919 100644 (file)
@@ -920,10 +920,6 @@ geometricPrecision
 economy
 exact
 
 economy
 exact
 
-// -webkit-color-correction
-//default
-sRGB
-
 #if defined(ENABLE_VIEW_MODE_CSS_MEDIA) && ENABLE_VIEW_MODE_CSS_MEDIA
 // (-webkit-view-mode:) media feature:
 floating
 #if defined(ENABLE_VIEW_MODE_CSS_MEDIA) && ENABLE_VIEW_MODE_CSS_MEDIA
 // (-webkit-view-mode:) media feature:
 floating
index e1b03d0..564ae6d 100644 (file)
@@ -176,7 +176,7 @@ new
 // CSS_PROP_STOP_OPACITY
 // CSS_PROP_COLOR_INTERPOLATION
 //auto
 // CSS_PROP_STOP_OPACITY
 // CSS_PROP_COLOR_INTERPOLATION
 //auto
-//sRGB
+sRGB
 linearRGB
 
 // CSS_PROP_COLOR_INTERPOLATION_FILTERS
 linearRGB
 
 // CSS_PROP_COLOR_INTERPOLATION_FILTERS
index 0436f2b..cccc93d 100644 (file)
@@ -895,7 +895,7 @@ public:
     void getTextShadowBlockDirectionExtent(LayoutUnit& logicalTop, LayoutUnit& logicalBottom) const { getShadowBlockDirectionExtent(textShadow(), logicalTop, logicalBottom); }
 
     float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; }
     void getTextShadowBlockDirectionExtent(LayoutUnit& logicalTop, LayoutUnit& logicalBottom) const { getShadowBlockDirectionExtent(textShadow(), logicalTop, logicalBottom); }
 
     float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; }
-    ColorSpace colorSpace() const { return static_cast<ColorSpace>(rareInheritedData->colorSpace); }
+    static ColorSpace colorSpace() { return ColorSpaceSRGB; } // FIXME: Remove after adding color space handling into the Color class.
     float opacity() const { return rareNonInheritedData->opacity; }
     ControlPart appearance() const { return static_cast<ControlPart>(rareNonInheritedData->m_appearance); }
     AspectRatioType aspectRatioType() const { return static_cast<AspectRatioType>(rareNonInheritedData->m_aspectRatioType); }
     float opacity() const { return rareNonInheritedData->opacity; }
     ControlPart appearance() const { return static_cast<ControlPart>(rareNonInheritedData->m_appearance); }
     AspectRatioType aspectRatioType() const { return static_cast<AspectRatioType>(rareNonInheritedData->m_aspectRatioType); }
@@ -1489,7 +1489,6 @@ public:
     void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStrokeColor, c); }
     void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidth, w); }
     void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillColor, c); }
     void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStrokeColor, c); }
     void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidth, w); }
     void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillColor, c); }
-    void setColorSpace(ColorSpace space) { SET_VAR(rareInheritedData, colorSpace, space); }
     void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNonInheritedData, opacity, v); }
     void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearance, a); }
     // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment
     void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNonInheritedData, opacity, v); }
     void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearance, a); }
     // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment
@@ -1866,7 +1865,6 @@ public:
     static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
     static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed), Length(0, Fixed)); }
     static ECaptionSide initialCaptionSide() { return CAPTOP; }
     static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
     static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed), Length(0, Fixed)); }
     static ECaptionSide initialCaptionSide() { return CAPTOP; }
-    static ColorSpace initialColorSpace() { return ColorSpaceDeviceRGB; }
     static ColumnAxis initialColumnAxis() { return AutoColumnAxis; }
     static ColumnProgression initialColumnProgression() { return NormalColumnProgression; }
     static TextDirection initialDirection() { return LTR; }
     static ColumnAxis initialColumnAxis() { return AutoColumnAxis; }
     static ColumnProgression initialColumnProgression() { return NormalColumnProgression; }
     static TextDirection initialDirection() { return LTR; }
index c60240b..6b3924c 100644 (file)
@@ -81,7 +81,6 @@ StyleRareInheritedData::StyleRareInheritedData()
     , lineBreak(LineBreakAuto)
     , resize(RenderStyle::initialResize())
     , userSelect(RenderStyle::initialUserSelect())
     , lineBreak(LineBreakAuto)
     , resize(RenderStyle::initialResize())
     , userSelect(RenderStyle::initialUserSelect())
-    , colorSpace(ColorSpaceDeviceRGB)
     , speak(SpeakNormal)
     , hyphens(HyphensManual)
     , textEmphasisFill(TextEmphasisFillFilled)
     , speak(SpeakNormal)
     , hyphens(HyphensManual)
     , textEmphasisFill(TextEmphasisFillFilled)
@@ -163,7 +162,6 @@ inline StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedDa
     , lineBreak(o.lineBreak)
     , resize(o.resize)
     , userSelect(o.userSelect)
     , lineBreak(o.lineBreak)
     , resize(o.resize)
     , userSelect(o.userSelect)
-    , colorSpace(o.colorSpace)
     , speak(o.speak)
     , hyphens(o.hyphens)
     , textEmphasisFill(o.textEmphasisFill)
     , speak(o.speak)
     , hyphens(o.hyphens)
     , textEmphasisFill(o.textEmphasisFill)
@@ -282,7 +280,6 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
 #endif
         && resize == o.resize
         && userSelect == o.userSelect
 #endif
         && resize == o.resize
         && userSelect == o.userSelect
-        && colorSpace == o.colorSpace
         && speak == o.speak
         && hyphens == o.hyphens
         && hyphenationLimitBefore == o.hyphenationLimitBefore
         && speak == o.speak
         && hyphens == o.hyphens
         && hyphenationLimitBefore == o.hyphenationLimitBefore