Attachment 342039 Details for Bug 186306 – Patch

[patch] Patch

bug-186306-20180606102728.patch (text/plain), 106.70 KB, created by Antoine Quint on 2018-06-06 01:27:30 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2018-06-06 01:27:30 PDT

Size: 106.70 KB

patch

obsolete

>Subversion Revision: 232537
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5fdeb5e05a8e6c21c7ec451e2e7f1711e8b9f811..56ea0c52e4081dd886a30cd150978420df1d2b64 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,55 @@
>+2018-06-06  Antoine Quint  <graouts@apple.com>
>+
>+        Rename color-filter to -apple-color-filter and do not expose it to Web content
>+        https://bugs.webkit.org/show_bug.cgi?id=186306
>+        <rdar://problem/39874167>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rename the color-filter CSS property to -apple-color-filter.
>+
>+        * animation/KeyframeEffectReadOnly.cpp:
>+        (WebCore::KeyframeEffectReadOnly::checkForMatchingColorFilterFunctionLists):
>+        * css/CSSComputedStyleDeclaration.cpp:
>+        (WebCore::ComputedStyleExtractor::valueForPropertyinStyle):
>+        * css/CSSGradientValue.cpp:
>+        (WebCore::CSSGradientValue::image):
>+        (WebCore::CSSGradientValue::computeStops):
>+        (WebCore::CSSGradientValue::knownToBeOpaque const):
>+        * css/CSSProperties.json:
>+        * css/parser/CSSPropertyParser.cpp:
>+        (WebCore::CSSPropertyParser::parseSingleValue):
>+        * page/animation/CSSPropertyAnimation.cpp:
>+        (WebCore::blendFunc):
>+        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
>+        * page/animation/ImplicitAnimation.cpp:
>+        (WebCore::ImplicitAnimation::checkForMatchingColorFilterFunctionLists):
>+        * page/animation/KeyframeAnimation.cpp:
>+        (WebCore::KeyframeAnimation::checkForMatchingColorFilterFunctionLists):
>+        * rendering/InlineTextBox.cpp:
>+        (WebCore::InlineTextBox::paintMarkedTextForeground):
>+        (WebCore::InlineTextBox::paintMarkedTextDecoration):
>+        * rendering/style/RenderStyle.cpp:
>+        (WebCore::RenderStyle::changeRequiresRepaint const):
>+        (WebCore::RenderStyle::visitedDependentColorWithColorFilter const):
>+        (WebCore::RenderStyle::colorByApplyingColorFilter const):
>+        * rendering/style/RenderStyle.h:
>+        (WebCore::RenderStyle::mutableAppleColorFilter):
>+        (WebCore::RenderStyle::appleColorFilter const):
>+        (WebCore::RenderStyle::hasAppleColorFilter const):
>+        (WebCore::RenderStyle::setAppleColorFilter):
>+        (WebCore::RenderStyle::initialAppleColorFilter):
>+        (WebCore::RenderStyle::mutableColorFilter): Deleted.
>+        (WebCore::RenderStyle::colorFilter const): Deleted.
>+        (WebCore::RenderStyle::hasColorFilter const): Deleted.
>+        (WebCore::RenderStyle::setColorFilter): Deleted.
>+        (WebCore::RenderStyle::initialColorFilter): Deleted.
>+        * rendering/style/StyleRareInheritedData.cpp:
>+        (WebCore::StyleRareInheritedData::StyleRareInheritedData):
>+        (WebCore::StyleRareInheritedData::operator== const):
>+        (WebCore::StyleRareInheritedData::hasColorFilters const):
>+        * rendering/style/StyleRareInheritedData.h:
>+
> 2018-06-05  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] Only expose CSSAnimation and CSSTransition if the WebAnimationsCSSIntegration runtime flag is enabled
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 238285a80e6337dec6497204298fda1313907c08..f0c2cd89aa4259b2688be880d6ce5a9347233ce8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,30 @@
>+2018-06-06  Antoine Quint  <graouts@apple.com>
>+
>+        Rename color-filter to -apple-color-filter and do not expose it to Web content
>+        https://bugs.webkit.org/show_bug.cgi?id=186306
>+        <rdar://problem/39874167>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Change the ColorFilter setting to no longer be exposed as an experimental feature and ensure it's turned off by default.
>+        To allow internal clients to use the -apple-color-filter property, we expose a new _colorFilterEnabled property as SPI
>+        to WKWebViewConfigurationPrivate.
>+
>+        * Shared/WebPreferences.yaml:
>+        * UIProcess/API/C/WKPreferences.cpp:
>+        (WKPreferencesSetColorFilterEnabled):
>+        (WKPreferencesGetColorFilterEnabled):
>+        * UIProcess/API/C/WKPreferencesRefPrivate.h:
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _initializeWithConfiguration:]):
>+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
>+        (-[WKWebViewConfiguration init]):
>+        (-[WKWebViewConfiguration copyWithZone:]):
>+        (-[WKWebViewConfiguration _setAttachmentElementEnabled:]):
>+        (-[WKWebViewConfiguration _colorFilterEnabled]):
>+        (-[WKWebViewConfiguration _setColorFilterEnabled:]):
>+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
>+
> 2018-06-05  Per Arne Vollan  <pvollan@apple.com>
> 
>         Move OpenGL display mask to screen data struct.
>diff --git a/Source/WebCore/animation/KeyframeEffectReadOnly.cpp b/Source/WebCore/animation/KeyframeEffectReadOnly.cpp
>index b0bfff9bd8b8d42b509b00c911edcc4f93c1a6cf..8ba7b6c1764f0322d7ded656255cbb3e12fbd5dd 100644
>--- a/Source/WebCore/animation/KeyframeEffectReadOnly.cpp
>+++ b/Source/WebCore/animation/KeyframeEffectReadOnly.cpp
>@@ -814,8 +814,8 @@ void KeyframeEffectReadOnly::checkForMatchingBackdropFilterFunctionLists()
> 
> void KeyframeEffectReadOnly::checkForMatchingColorFilterFunctionLists()
> {
>-    m_colorFilterFunctionListsMatch = checkForMatchingFilterFunctionLists(CSSPropertyColorFilter, [] (const RenderStyle& style) -> const FilterOperations& {
>-        return style.colorFilter();
>+    m_colorFilterFunctionListsMatch = checkForMatchingFilterFunctionLists(CSSPropertyAppleColorFilter, [] (const RenderStyle& style) -> const FilterOperations& {
>+        return style.appleColorFilter();
>     });
> }
> 
>diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>index 9735dc1b6efe0e4a47066415d64af4ab457ef432..78695c4c859f96d89cbdaaa65bcf84c3123be2e4 100644
>--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>@@ -143,7 +143,7 @@ static const CSSPropertyID computedProperties[] = {
>     CSSPropertyClear,
>     CSSPropertyClip,
>     CSSPropertyColor,
>-    CSSPropertyColorFilter,
>+    CSSPropertyAppleColorFilter,
>     CSSPropertyCounterIncrement,
>     CSSPropertyCounterReset,
>     CSSPropertyContent,
>@@ -3849,8 +3849,8 @@ RefPtr<CSSValue> ComputedStyleExtractor::valueForPropertyinStyle(const RenderSty
>             return shapePropertyValue(style, style.shapeOutside());
>         case CSSPropertyFilter:
>             return valueForFilter(style, style.filter());
>-        case CSSPropertyColorFilter:
>-            return valueForFilter(style, style.colorFilter());
>+        case CSSPropertyAppleColorFilter:
>+            return valueForFilter(style, style.appleColorFilter());
> #if ENABLE(FILTERS_LEVEL_2)
>         case CSSPropertyWebkitBackdropFilter:
>             return valueForFilter(style, style.backdropFilter());
>diff --git a/Source/WebCore/css/CSSGradientValue.cpp b/Source/WebCore/css/CSSGradientValue.cpp
>index 171d4726383292609f2209eb5678bee14d5a682b..7fb1de559e21796a7df2b19f82f838195b719e1b 100644
>--- a/Source/WebCore/css/CSSGradientValue.cpp
>+++ b/Source/WebCore/css/CSSGradientValue.cpp
>@@ -52,7 +52,7 @@ RefPtr<Image> CSSGradientValue::image(RenderElement& renderer, const FloatSize&
> {
>     if (size.isEmpty())
>         return nullptr;
>-    bool cacheable = isCacheable() && !renderer.style().hasColorFilter();
>+    bool cacheable = isCacheable() && !renderer.style().hasAppleColorFilter();
>     if (cacheable) {
>         if (!clients().contains(&renderer))
>             return nullptr;
>@@ -241,8 +241,8 @@ Gradient::ColorStopVector CSSGradientValue::computeStops(GradientAdapter& gradie
>                 offset = stop.m_position->floatValue(CSSPrimitiveValue::CSS_NUMBER);
> 
>             Color color = stop.m_resolvedColor;
>-            if (style.hasColorFilter())
>-                style.colorFilter().transformColor(color);
>+            if (style.hasAppleColorFilter())
>+                style.appleColorFilter().transformColor(color);
>             result.uncheckedAppend({ offset, color });
>         }
> 
>@@ -264,8 +264,8 @@ Gradient::ColorStopVector CSSGradientValue::computeStops(GradientAdapter& gradie
>         stops[i].isMidpoint = stop.isMidpoint;
> 
>         Color color = stop.m_resolvedColor;
>-        if (style.hasColorFilter())
>-            style.colorFilter().transformColor(color);
>+        if (style.hasAppleColorFilter())
>+            style.appleColorFilter().transformColor(color);
> 
>         stops[i].color = color;
> 
>@@ -579,12 +579,12 @@ bool CSSGradientValue::isCacheable() const
> 
> bool CSSGradientValue::knownToBeOpaque(const RenderElement& renderer) const
> {
>-    bool hasColorFilter = renderer.style().hasColorFilter();
>+    bool hasColorFilter = renderer.style().hasAppleColorFilter();
> 
>     for (auto& stop : m_stops) {
>         if (hasColorFilter) {
>             Color stopColor = stop.m_resolvedColor;
>-            renderer.style().colorFilter().transformColor(stopColor);
>+            renderer.style().appleColorFilter().transformColor(stopColor);
>             if (!stopColor.isOpaque())
>                 return false;
>         }
>diff --git a/Source/WebCore/css/CSSProperties.json b/Source/WebCore/css/CSSProperties.json
>index cde4a403d934ab5c6da476df854d996b233efa5c..9741c0213154521358f964a7d34f97113af8f9e3 100644
>--- a/Source/WebCore/css/CSSProperties.json
>+++ b/Source/WebCore/css/CSSProperties.json
>@@ -4522,13 +4522,13 @@
>                 "url": "https://www.w3.org/TR/filter-effects/#FilterProperty"
>             }
>         },
>-        "color-filter": {
>+        "-apple-color-filter": {
>             "inherited": true,
>             "codegen-properties": {
>                 "conditional-converter": "FilterOperations"
>             },
>             "status": {
>-                "status": "experimental"
>+                "status": "non-standard"
>             }
>         },
>         "align-content": {
>diff --git a/Source/WebCore/css/parser/CSSPropertyParser.cpp b/Source/WebCore/css/parser/CSSPropertyParser.cpp
>index 106f76c40e9343b4659aa5e8fcceb4f005f7342e..3d1cdd2b0c9a9df02873a3b7b7ebd7b0e4b072d7 100644
>--- a/Source/WebCore/css/parser/CSSPropertyParser.cpp
>+++ b/Source/WebCore/css/parser/CSSPropertyParser.cpp
>@@ -4134,7 +4134,7 @@ RefPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID property, CSS
>     case CSSPropertyWebkitBackdropFilter:
> #endif
>         return consumeFilter(m_range, m_context, AllowedFilterFunctions::All);
>-    case CSSPropertyColorFilter:
>+    case CSSPropertyAppleColorFilter:
>         if (!m_context.colorFilterEnabled)
>             return nullptr;
>         return consumeFilter(m_range, m_context, AllowedFilterFunctions::Color);
>diff --git a/Source/WebCore/page/animation/CSSPropertyAnimation.cpp b/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
>index 72aa66f8941b1f1b42520ef136ccae1b11143cb5..3fb9fe6fb2d83d4ca6cb4074dc043cf73955e463 100644
>--- a/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
>+++ b/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
>@@ -216,7 +216,7 @@ static inline FilterOperations blendFunc(const CSSPropertyBlendingClient* anim,
>         listsMatch = anim->backdropFilterFunctionListsMatch();
>         break;
> #endif
>-    case CSSPropertyColorFilter:
>+    case CSSPropertyAppleColorFilter:
>         listsMatch = anim->colorFilterFunctionListsMatch();
>         break;
>     default:
>@@ -1564,7 +1564,7 @@ CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap()
> #if ENABLE(FILTERS_LEVEL_2)
>         new PropertyWrapperFilter(CSSPropertyWebkitBackdropFilter, &RenderStyle::backdropFilter, &RenderStyle::setBackdropFilter),
> #endif
>-        new PropertyWrapperFilter(CSSPropertyColorFilter, &RenderStyle::colorFilter, &RenderStyle::setColorFilter),
>+        new PropertyWrapperFilter(CSSPropertyAppleColorFilter, &RenderStyle::appleColorFilter, &RenderStyle::setAppleColorFilter),
> 
>         new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
> 
>diff --git a/Source/WebCore/page/animation/ImplicitAnimation.cpp b/Source/WebCore/page/animation/ImplicitAnimation.cpp
>index 080cfccdcc6808b0862f2aba70f58fe01389a4cd..0f91e6eae80e6426b42c201aa6779480a894a622 100644
>--- a/Source/WebCore/page/animation/ImplicitAnimation.cpp
>+++ b/Source/WebCore/page/animation/ImplicitAnimation.cpp
>@@ -319,7 +319,7 @@ void ImplicitAnimation::checkForMatchingColorFilterFunctionLists()
>     if (!m_fromStyle || !m_toStyle)
>         return;
> 
>-    m_colorFilterFunctionListsMatch = filterOperationsMatch(&m_fromStyle->colorFilter(), m_toStyle->colorFilter());
>+    m_colorFilterFunctionListsMatch = filterOperationsMatch(&m_fromStyle->appleColorFilter(), m_toStyle->appleColorFilter());
> }
> 
> std::optional<Seconds> ImplicitAnimation::timeToNextService()
>diff --git a/Source/WebCore/page/animation/KeyframeAnimation.cpp b/Source/WebCore/page/animation/KeyframeAnimation.cpp
>index d0484decd89c988367f35d78f964b6708a9789e3..2f556c2727e4c8f73b7201e62e1871f22f9f562d 100644
>--- a/Source/WebCore/page/animation/KeyframeAnimation.cpp
>+++ b/Source/WebCore/page/animation/KeyframeAnimation.cpp
>@@ -497,8 +497,8 @@ void KeyframeAnimation::checkForMatchingBackdropFilterFunctionLists()
> 
> void KeyframeAnimation::checkForMatchingColorFilterFunctionLists()
> {
>-    m_colorFilterFunctionListsMatch = checkForMatchingFilterFunctionLists(CSSPropertyColorFilter, [] (const RenderStyle& style) -> const FilterOperations& {
>-        return style.colorFilter();
>+    m_colorFilterFunctionListsMatch = checkForMatchingFilterFunctionLists(CSSPropertyAppleColorFilter, [] (const RenderStyle& style) -> const FilterOperations& {
>+        return style.appleColorFilter();
>     });
> }
> 
>diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp
>index d537e553aba30b39d5c09fc4bf35fc7d02a1b26f..3e7e161cbd903bc53c66e7b0c3257eb8bdddeb4f 100644
>--- a/Source/WebCore/rendering/InlineTextBox.cpp
>+++ b/Source/WebCore/rendering/InlineTextBox.cpp
>@@ -1013,8 +1013,8 @@ void InlineTextBox::paintMarkedTextForeground(PaintInfo& paintInfo, const FloatR
>     textPainter.setIsHorizontal(isHorizontal());
>     if (markedText.style.textShadow) {
>         textPainter.setShadow(&markedText.style.textShadow.value());
>-        if (lineStyle.hasColorFilter())
>-            textPainter.setShadowColorFilter(&lineStyle.colorFilter());
>+        if (lineStyle.hasAppleColorFilter())
>+            textPainter.setShadowColorFilter(&lineStyle.appleColorFilter());
>     }
>     textPainter.setEmphasisMark(emphasisMark, emphasisMarkOffset, combinedText());
> 
>@@ -1069,8 +1069,8 @@ void InlineTextBox::paintMarkedTextDecoration(PaintInfo& paintInfo, const FloatR
>     decorationPainter.setIsHorizontal(isHorizontal());
>     if (markedText.style.textShadow) {
>         decorationPainter.setTextShadow(&markedText.style.textShadow.value());
>-        if (lineStyle().hasColorFilter())
>-            decorationPainter.setShadowColorFilter(&lineStyle().colorFilter());
>+        if (lineStyle().hasAppleColorFilter())
>+            decorationPainter.setShadowColorFilter(&lineStyle().appleColorFilter());
>     }
> 
>     {
>diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
>index f61988f24c2d177dcd7fa5b8de23632d7a148a6b..779b0f4b710697c58a082cf7744e6d51ceba3731 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.cpp
>+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
>@@ -905,7 +905,7 @@ bool RenderStyle::changeRequiresRepaint(const RenderStyle& other, OptionSet<Styl
>         || !m_backgroundData->isEquivalentForPainting(*other.m_backgroundData)
>         || m_rareInheritedData->userModify != other.m_rareInheritedData->userModify
>         || m_rareInheritedData->userSelect != other.m_rareInheritedData->userSelect
>-        || m_rareInheritedData->colorFilter != other.m_rareInheritedData->colorFilter
>+        || m_rareInheritedData->appleColorFilter != other.m_rareInheritedData->appleColorFilter
>         || m_rareNonInheritedData->userDrag != other.m_rareNonInheritedData->userDrag
>         || m_rareNonInheritedData->borderFit != other.m_rareNonInheritedData->borderFit
>         || m_rareNonInheritedData->objectFit != other.m_rareNonInheritedData->objectFit
>@@ -1848,7 +1848,7 @@ Color RenderStyle::visitedDependentColor(CSSPropertyID colorProperty) const
> 
> Color RenderStyle::visitedDependentColorWithColorFilter(CSSPropertyID colorProperty) const
> {
>-    if (!hasColorFilter())
>+    if (!hasAppleColorFilter())
>         return visitedDependentColor(colorProperty);
> 
>     return colorByApplyingColorFilter(visitedDependentColor(colorProperty));
>@@ -1857,7 +1857,7 @@ Color RenderStyle::visitedDependentColorWithColorFilter(CSSPropertyID colorPrope
> Color RenderStyle::colorByApplyingColorFilter(const Color& color) const
> {
>     Color transformedColor = color;
>-    colorFilter().transformColor(transformedColor);
>+    appleColorFilter().transformColor(transformedColor);
>     return transformedColor;
> }
> 
>diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
>index 7783fd602b460b61c5edf467f8002a30ae641ab0..18ee86aec68ab6d0d4731354324172f90576d7de 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.h
>+++ b/Source/WebCore/rendering/style/RenderStyle.h
>@@ -754,9 +754,9 @@ public:
>     bool hasFilter() const { return !m_rareNonInheritedData->filter->operations.operations().isEmpty(); }
>     bool hasReferenceFilterOnly() const;
> 
>-    FilterOperations& mutableColorFilter() { return m_rareInheritedData.access().colorFilter.access().operations; }
>-    const FilterOperations& colorFilter() const { return m_rareInheritedData->colorFilter->operations; }
>-    bool hasColorFilter() const { return !m_rareInheritedData->colorFilter->operations.operations().isEmpty(); }
>+    FilterOperations& mutableAppleColorFilter() { return m_rareInheritedData.access().appleColorFilter.access().operations; }
>+    const FilterOperations& appleColorFilter() const { return m_rareInheritedData->appleColorFilter->operations; }
>+    bool hasAppleColorFilter() const { return !m_rareInheritedData->appleColorFilter->operations.operations().isEmpty(); }
> 
> #if ENABLE(FILTERS_LEVEL_2)
>     FilterOperations& mutableBackdropFilter() { return m_rareNonInheritedData.access().backdropFilter.access().operations; }
>@@ -1162,7 +1162,7 @@ public:
>     void setRubyPosition(RubyPosition position) { SET_VAR(m_rareInheritedData, rubyPosition, static_cast<unsigned>(position)); }
> 
>     void setFilter(const FilterOperations& ops) { SET_NESTED_VAR(m_rareNonInheritedData, filter, operations, ops); }
>-    void setColorFilter(const FilterOperations& ops) { SET_NESTED_VAR(m_rareInheritedData, colorFilter, operations, ops); }
>+    void setAppleColorFilter(const FilterOperations& ops) { SET_NESTED_VAR(m_rareInheritedData, appleColorFilter, operations, ops); }
> 
> #if ENABLE(FILTERS_LEVEL_2)
>     void setBackdropFilter(const FilterOperations& ops) { SET_NESTED_VAR(m_rareNonInheritedData, backdropFilter, operations, ops); }
>@@ -1668,7 +1668,7 @@ public:
> #endif
> 
>     static const FilterOperations& initialFilter() { static NeverDestroyed<FilterOperations> ops; return ops; }
>-    static const FilterOperations& initialColorFilter() { static NeverDestroyed<FilterOperations> ops; return ops; }
>+    static const FilterOperations& initialAppleColorFilter() { static NeverDestroyed<FilterOperations> ops; return ops; }
> 
> #if ENABLE(FILTERS_LEVEL_2)
>     static const FilterOperations& initialBackdropFilter() { static NeverDestroyed<FilterOperations> ops; return ops; }
>diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
>index cbef75e42e45a799d3934ddb717e48a051af0260..5a847c83431b4390c5ef5ca0c5967b94ee693ab0 100644
>--- a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
>+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
>@@ -137,7 +137,7 @@ StyleRareInheritedData::StyleRareInheritedData()
>     , hyphenationLimitBefore(-1)
>     , hyphenationLimitAfter(-1)
>     , hyphenationLimitLines(-1)
>-    , colorFilter(StyleFilterData::create())
>+    , appleColorFilter(StyleFilterData::create())
>     , lineGrid(RenderStyle::initialLineGrid())
>     , tabSize(RenderStyle::initialTabSize())
> #if ENABLE(TEXT_AUTOSIZING)
>@@ -233,7 +233,7 @@ inline StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedDa
>     , hyphenationLimitAfter(o.hyphenationLimitAfter)
>     , hyphenationLimitLines(o.hyphenationLimitLines)
>     , textEmphasisCustomMark(o.textEmphasisCustomMark)
>-    , colorFilter(o.colorFilter)
>+    , appleColorFilter(o.appleColorFilter)
>     , lineGrid(o.lineGrid)
>     , tabSize(o.tabSize)
> #if ENABLE(TEXT_AUTOSIZING)
>@@ -310,7 +310,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
>         && hyphenationString == o.hyphenationString
>         && textEmphasisCustomMark == o.textEmphasisCustomMark
>         && arePointingToEqualData(quotes, o.quotes)
>-        && colorFilter == o.colorFilter
>+        && appleColorFilter == o.appleColorFilter
>         && tabSize == o.tabSize
>         && lineGrid == o.lineGrid
> #if ENABLE(CSS_IMAGE_ORIENTATION)
>@@ -351,7 +351,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
> 
> bool StyleRareInheritedData::hasColorFilters() const
> {
>-    return !colorFilter->operations.isEmpty();
>+    return !appleColorFilter->operations.isEmpty();
> }
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.h b/Source/WebCore/rendering/style/StyleRareInheritedData.h
>index e39a097d8778b617e1ca93dd02acd77d9fac7a34..dda53e3d670b8db4881fdebf24e3da0b91277e63 100644
>--- a/Source/WebCore/rendering/style/StyleRareInheritedData.h
>+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.h
>@@ -159,7 +159,7 @@ public:
> 
>     AtomicString textEmphasisCustomMark;
>     RefPtr<QuotesData> quotes;
>-    DataRef<StyleFilterData> colorFilter;
>+    DataRef<StyleFilterData> appleColorFilter;
> 
>     AtomicString lineGrid;
>     unsigned tabSize;
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index 34246b8547dde4b97e594d5fe8591eafb3a0096a..1c2995062cc430a342099e3f8d9b97dd2acc29b2 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -1083,13 +1083,6 @@ CacheAPIEnabled:
>   category: experimental
>   webcoreBinding: RuntimeEnabledFeatures
> 
>-ColorFilterEnabled:
>-  type: bool
>-  defaultValue: DEFAULT_EXPERIMENTAL_FEATURES_ENABLED
>-  humanReadableName: "Color Filter"
>-  humanReadableDescription: "Enable CSS Color Filter property"
>-  category: experimental
>-
> ConstantPropertiesEnabled:
>   type: bool
>   defaultValue: true
>@@ -1299,3 +1292,7 @@ DisabledAdaptationsMetaTagEnabled:
>     humanReadableDescription: "Enable the 'disabled-adaptations' meta tag"
>     category: experimental
>     webcoreBinding: RuntimeEnabledFeatures
>+
>+ColorFilterEnabled:
>+  type: bool
>+  defaultValue: false
>diff --git a/Source/WebKit/UIProcess/API/C/WKPreferences.cpp b/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>index 455c2742bcd376ef156b4202f43098d151c9e705..69284fc6c06e9d646694364dea2625bcb9932f97 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>@@ -2003,3 +2003,13 @@ bool WKPreferencesGetServerTimingEnabled(WKPreferencesRef preferencesRef)
> {
>     return toImpl(preferencesRef)->serverTimingEnabled();
> }
>+
>+void WKPreferencesSetColorFilterEnabled(WKPreferencesRef preferencesRef, bool flag)
>+{
>+    toImpl(preferencesRef)->setColorFilterEnabled(flag);
>+}
>+
>+bool WKPreferencesGetColorFilterEnabled(WKPreferencesRef preferencesRef)
>+{
>+    return toImpl(preferencesRef)->colorFilterEnabled();
>+}
>diff --git a/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h b/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h
>index 10e47ed3263fbc0d4b4a2a928f820fe578571a1b..c74435e3e95e20e4e3ca0778e4449dcec7ac0030 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h
>+++ b/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h
>@@ -565,6 +565,10 @@ WK_EXPORT bool WKPreferencesGetAllowCrossOriginSubresourcesToAskForCredentials(W
> WK_EXPORT void WKPreferencesSetServerTimingEnabled(WKPreferencesRef, bool flag);
> WK_EXPORT bool WKPreferencesGetServerTimingEnabled(WKPreferencesRef);
> 
>+// Defaults to false.
>+WK_EXPORT void WKPreferencesSetColorFilterEnabled(WKPreferencesRef preferencesRef, bool flag);
>+WK_EXPORT bool WKPreferencesGetColorFilterEnabled(WKPreferencesRef preferencesRef);
>+
> #ifdef __cplusplus
> }
> #endif
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 1cb60ec25c2274dc825a9b35a6a5426e16532e8e..710988c6d512f55dfdb0d25db1e538678c4977fe 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -615,6 +615,8 @@ - (void)_initializeWithConfiguration:(WKWebViewConfiguration *)configuration
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mediaContentTypesRequiringHardwareSupportKey(), WebKit::WebPreferencesStore::Value(String([_configuration _mediaContentTypesRequiringHardwareSupport])));
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowMediaContentTypesRequiringHardwareSupportAsFallbackKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowMediaContentTypesRequiringHardwareSupportAsFallback]));
> 
>+    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::colorFilterEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _colorFilterEnabled]));
>+
> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
>     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::legacyEncryptedMediaAPIEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _legacyEncryptedMediaAPIEnabled]));
> #endif
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>index 1258b42698dcb2ea3efc6c394c7d276c259828d8..a0875645e1053e45c3faa20b70f9ffff3dcd8cd2 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>@@ -164,6 +164,8 @@ @implementation WKWebViewConfiguration {
> 
>     RetainPtr<NSString> _overrideContentSecurityPolicy;
>     RetainPtr<NSString> _mediaContentTypesRequiringHardwareSupport;
>+
>+    BOOL _colorFilterEnabled;
> }
> 
> - (instancetype)init
>@@ -243,6 +245,8 @@ - (instancetype)init
>     _mediaContentTypesRequiringHardwareSupport = Settings::defaultMediaContentTypesRequiringHardwareSupport();
>     _allowMediaContentTypesRequiringHardwareSupportAsFallback = YES;
> 
>+    _colorFilterEnabled = NO;
>+
>     return self;
> }
> 
>@@ -397,6 +401,7 @@ - (id)copyWithZone:(NSZone *)zone
>     configuration->_allowMediaContentTypesRequiringHardwareSupportAsFallback = self->_allowMediaContentTypesRequiringHardwareSupportAsFallback;
> 
>     configuration->_groupIdentifier = adoptNS([self->_groupIdentifier copyWithZone:zone]);
>+    configuration->_colorFilterEnabled = self->_colorFilterEnabled;
> 
>     return configuration;
> }
>@@ -737,6 +742,16 @@ - (void)_setAttachmentElementEnabled:(BOOL)attachmentElementEnabled
>     _attachmentElementEnabled = attachmentElementEnabled;
> }
> 
>+- (BOOL)_colorFilterEnabled
>+{
>+    return _colorFilterEnabled;
>+}
>+
>+- (void)_setColorFilterEnabled:(BOOL)colorFilterEnabled
>+{
>+    _colorFilterEnabled = colorFilterEnabled;
>+}
>+
> - (BOOL)_requiresUserActionForVideoPlayback
> {
>     return self.mediaTypesRequiringUserActionForPlayback & WKAudiovisualMediaTypeVideo;
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
>index 8a95278ce6af9f54b6e0e51a2bda65fb0b71f2ee..299d138d0cca435fffc240daf02026a5d0377140 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
>@@ -70,6 +70,7 @@ typedef NS_ENUM(NSUInteger, _WKDragLiftDelay) {
> @property (nonatomic, setter=_setWaitsForPaintAfterViewDidMoveToWindow:) BOOL _waitsForPaintAfterViewDidMoveToWindow WK_API_AVAILABLE(macosx(10.12.3), ios(10.3));
> @property (nonatomic, setter=_setControlledByAutomation:, getter=_isControlledByAutomation) BOOL _controlledByAutomation WK_API_AVAILABLE(macosx(10.12.3), ios(10.3));
> @property (nonatomic, setter=_setApplicationManifest:) _WKApplicationManifest *_applicationManifest WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
>+@property (nonatomic, setter=_setColorFilterEnabled:) BOOL _colorFilterEnabled WK_API_AVAILABLE(macosx(10.14));
> 
> #if TARGET_OS_IPHONE
> @property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 89b532a386d6e602ff1b3ca2fff9e0cc180baad4..bb083f1085805deac43aabdbcf88a34e13009d9e 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-06-06  Antoine Quint  <graouts@apple.com>
>+
>+        Rename color-filter to -apple-color-filter and do not expose it to Web content
>+        https://bugs.webkit.org/show_bug.cgi?id=186306
>+        <rdar://problem/39874167>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adding an option to turn support for the -apple-color-filter property on via an HTML comment.
>+
>+        * DumpRenderTree/TestOptions.cpp:
>+        (TestOptions::TestOptions):
>+        * DumpRenderTree/TestOptions.h:
>+        * DumpRenderTree/mac/DumpRenderTree.mm:
>+        (setWebPreferencesForTestOptions):
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::resetPreferencesToConsistentValues):
>+        (WTR::updateTestOptionsFromTestHeader):
>+        * WebKitTestRunner/TestOptions.h:
>+        (WTR::TestOptions::hasSameInitializationOptions const):
>+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
>+        (WTR::TestController::platformCreateWebView):
>+
> 2018-06-05  Chris Dumez  <cdumez@apple.com>
> 
>         Regression(r232082): Websites get loaded inside of Messages App chat transcript
>diff --git a/Tools/DumpRenderTree/TestOptions.cpp b/Tools/DumpRenderTree/TestOptions.cpp
>index a96af07e005bdac6bccf8ccb7237cb394f08206a..07a75d60965ecfb8b9b071ddb21de0983b2ca1a5 100644
>--- a/Tools/DumpRenderTree/TestOptions.cpp
>+++ b/Tools/DumpRenderTree/TestOptions.cpp
>@@ -101,6 +101,8 @@ TestOptions::TestOptions(const std::string& pathOrURL, const std::string& absolu
>             allowCrossOriginSubresourcesToAskForCredentials = parseBooleanTestHeaderValue(value);
>         else if (key == "enableWebAnimationsCSSIntegration")
>             enableWebAnimationsCSSIntegration = parseBooleanTestHeaderValue(value);
>+        else if (key == "enableColorFilter")
>+            enableColorFilter = parseBooleanTestHeaderValue(value);
>         pairStart = pairEnd + 1;
>     }
> }
>diff --git a/Tools/DumpRenderTree/TestOptions.h b/Tools/DumpRenderTree/TestOptions.h
>index daf965f00743237ab672c3febe8d09bde4b6080c..afbb9be1ecbab463bec44524d9ac1d230aaa4405 100644
>--- a/Tools/DumpRenderTree/TestOptions.h
>+++ b/Tools/DumpRenderTree/TestOptions.h
>@@ -42,6 +42,7 @@ struct TestOptions {
>     bool enableInspectorAdditions { false };
>     bool dumpJSConsoleLogInStdErr { false };
>     bool allowCrossOriginSubresourcesToAskForCredentials { false };
>+    bool enableColorFilter { false };
> 
>     TestOptions(const std::string& pathOrURL, const std::string& absolutePath);
>     bool webViewIsCompatibleWithOptions(const TestOptions&) const;
>diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>index e3384b109a6e849a196cad268d404364c1af4e10..5f3a6533fa7ff48423a2cddc403b3dd7de32108f 100644
>--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
>@@ -1001,6 +1001,7 @@ static void setWebPreferencesForTestOptions(const TestOptions& options)
>     preferences.inspectorAdditionsEnabled = options.enableInspectorAdditions;
>     preferences.allowCrossOriginSubresourcesToAskForCredentials = options.allowCrossOriginSubresourcesToAskForCredentials;
>     preferences.webAnimationsCSSIntegrationEnabled = options.enableWebAnimationsCSSIntegration;
>+    preferences.colorFilterEnabled = options.enableColorFilter;
> }
> 
> // Called once on DumpRenderTree startup.
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index d9c1f427d0e33027a675423b57325eb360789f9e..bed37b30cde3da6dce9d90635aa343e7478086cd 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -715,6 +715,7 @@ void TestController::resetPreferencesToConsistentValues(const TestOptions& optio
>     WKPreferencesSetIsSecureContextAttributeEnabled(preferences, options.enableIsSecureContextAttribute);
>     WKPreferencesSetAllowCrossOriginSubresourcesToAskForCredentials(preferences, options.allowCrossOriginSubresourcesToAskForCredentials);
>     WKPreferencesSetWebAnimationsCSSIntegrationEnabled(preferences, options.enableWebAnimationsCSSIntegration);
>+    WKPreferencesSetColorFilterEnabled(preferences, options.enableColorFilter);
> 
>     static WKStringRef defaultTextEncoding = WKStringCreateWithUTF8CString("ISO-8859-1");
>     WKPreferencesSetDefaultTextEncodingName(preferences, defaultTextEncoding);
>@@ -1119,6 +1120,8 @@ static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const std:
>             testOptions.enableWebAnimationsCSSIntegration = parseBooleanTestHeaderValue(value);
>         if (key == "enableProcessSwapOnNavigation")
>             testOptions.enableProcessSwapOnNavigation = parseBooleanTestHeaderValue(value);
>+        if (key == "enableColorFilter")
>+            testOptions.enableColorFilter = parseBooleanTestHeaderValue(value);
>         pairStart = pairEnd + 1;
>     }
> }
>diff --git a/Tools/WebKitTestRunner/TestOptions.h b/Tools/WebKitTestRunner/TestOptions.h
>index d08dae99cb8c64be1d27d06fa73561ea41bb162b..1e1ff427e50271b0393cdb29dcdf189b9fe10246 100644
>--- a/Tools/WebKitTestRunner/TestOptions.h
>+++ b/Tools/WebKitTestRunner/TestOptions.h
>@@ -57,6 +57,7 @@ struct TestOptions {
>     bool allowCrossOriginSubresourcesToAskForCredentials { false };
>     bool enableWebAnimationsCSSIntegration { false };
>     bool enableProcessSwapOnNavigation { false };
>+    bool enableColorFilter { false };
> 
>     float deviceScaleFactor { 1 };
>     Vector<String> overrideLanguages;
>@@ -88,7 +89,8 @@ struct TestOptions {
>             || applicationManifest != options.applicationManifest
>             || allowCrossOriginSubresourcesToAskForCredentials != options.allowCrossOriginSubresourcesToAskForCredentials
>             || enableWebAnimationsCSSIntegration != options.enableWebAnimationsCSSIntegration
>-            || enableProcessSwapOnNavigation != options.enableProcessSwapOnNavigation)
>+            || enableProcessSwapOnNavigation != options.enableProcessSwapOnNavigation
>+            || enableColorFilter != options.enableColorFilter)
>             return false;
> 
>         return true;
>diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>index 333a9e949dbdf960112d02a5e84fa3eeec36556e..6bc46870b654f00e05210ba4b4927a819cdb4171 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>+++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>@@ -147,6 +147,9 @@ void TestController::platformCreateWebView(WKPageConfigurationRef, const TestOpt
>     if (options.enableAttachmentElement)
>         [copiedConfiguration _setAttachmentElementEnabled: YES];
> 
>+    if (options.enableColorFilter)
>+        [copiedConfiguration _setColorFilterEnabled: YES];
>+
>     if (options.applicationManifest.length()) {
>         auto manifestPath = [NSString stringWithUTF8String:options.applicationManifest.c_str()];
>         NSString *text = [NSString stringWithContentsOfFile:manifestPath usedEncoding:nullptr error:nullptr];
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b0ecbdaf588b1e547147a1584944ea58b581ede1..093ec845837f5ca8303469047e44ea210fbf8bda 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,73 @@
>+2018-06-06  Antoine Quint  <graouts@apple.com>
>+
>+        Rename color-filter to -apple-color-filter and do not expose it to Web content
>+        https://bugs.webkit.org/show_bug.cgi?id=186306
>+        <rdar://problem/39874167>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update tests for color-filter to test -apple-color-filter and explicitly turn the feature on since it's disabled by default.
>+        We also update a test to not use the colorFilter accessor and setter on CSSStyleDeclaration because using an -apple- prefix
>+        will no longer expose such a getter or setter, using getPropertyValue() and setProperty() instead.
>+
>+        * animations/resources/animation-test-helpers.js:
>+        (getPropertyValue):
>+        (comparePropertyValue):
>+        * css3/color-filters/color-filter-animation-expected.txt:
>+        * css3/color-filters/color-filter-animation.html:
>+        * css3/color-filters/color-filter-backgrounds-borders-expected.html:
>+        * css3/color-filters/color-filter-backgrounds-borders.html:
>+        * css3/color-filters/color-filter-box-shadow-expected.html:
>+        * css3/color-filters/color-filter-box-shadow.html:
>+        * css3/color-filters/color-filter-brightness-expected.html:
>+        * css3/color-filters/color-filter-brightness.html:
>+        * css3/color-filters/color-filter-caret-color-expected.html:
>+        * css3/color-filters/color-filter-caret-color.html:
>+        * css3/color-filters/color-filter-color-property-expected.html:
>+        * css3/color-filters/color-filter-color-property-list-item-expected.html:
>+        * css3/color-filters/color-filter-color-property-list-item.html:
>+        * css3/color-filters/color-filter-color-property.html:
>+        * css3/color-filters/color-filter-color-text-decorations-expected.html:
>+        * css3/color-filters/color-filter-color-text-decorations.html:
>+        * css3/color-filters/color-filter-column-rule-expected.html:
>+        * css3/color-filters/color-filter-column-rule.html:
>+        * css3/color-filters/color-filter-contrast-expected.html:
>+        * css3/color-filters/color-filter-contrast.html:
>+        * css3/color-filters/color-filter-current-color-expected.html:
>+        * css3/color-filters/color-filter-current-color.html:
>+        * css3/color-filters/color-filter-filter-list-expected.html:
>+        * css3/color-filters/color-filter-filter-list.html:
>+        * css3/color-filters/color-filter-gradients-expected.html:
>+        * css3/color-filters/color-filter-gradients.html:
>+        * css3/color-filters/color-filter-grayscale-expected.html:
>+        * css3/color-filters/color-filter-grayscale.html:
>+        * css3/color-filters/color-filter-hue-rotate-expected.html:
>+        * css3/color-filters/color-filter-hue-rotate.html:
>+        * css3/color-filters/color-filter-inherits-expected.html:
>+        * css3/color-filters/color-filter-inherits.html:
>+        * css3/color-filters/color-filter-invert-expected.html:
>+        * css3/color-filters/color-filter-invert.html:
>+        * css3/color-filters/color-filter-opacity-expected.html:
>+        * css3/color-filters/color-filter-opacity.html:
>+        * css3/color-filters/color-filter-outline-expected.html:
>+        * css3/color-filters/color-filter-outline.html:
>+        * css3/color-filters/color-filter-parsing-expected.txt:
>+        * css3/color-filters/color-filter-parsing.html:
>+        * css3/color-filters/color-filter-saturate-expected.html:
>+        * css3/color-filters/color-filter-saturate.html:
>+        * css3/color-filters/color-filter-sepia-expected.html:
>+        * css3/color-filters/color-filter-sepia.html:
>+        * css3/color-filters/color-filter-text-decoration-shadow-expected.html:
>+        * css3/color-filters/color-filter-text-decoration-shadow.html:
>+        * css3/color-filters/color-filter-text-emphasis-expected.html:
>+        * css3/color-filters/color-filter-text-emphasis.html:
>+        * css3/color-filters/color-filter-text-shadow-expected.html:
>+        * css3/color-filters/color-filter-text-shadow.html:
>+        * css3/color-filters/color-filter-text-stroke-expected.html:
>+        * css3/color-filters/color-filter-text-stroke.html:
>+        * css3/color-filters/svg/color-filter-inline-svg-expected.html:
>+        * css3/color-filters/svg/color-filter-inline-svg.html:
>+
> 2018-06-05  Jer Noble  <jer.noble@apple.com>
> 
>         REGRESSION (231817): Videos permanently blank out after switching out of a tab and back in
>diff --git a/LayoutTests/animations/resources/animation-test-helpers.js b/LayoutTests/animations/resources/animation-test-helpers.js
>index 3dff4ddda68374ec2470d753386cdbea0a58eb11..ecfd93df54ecfa4e95a9c86cb67222cd2ca8237d 100644
>--- a/LayoutTests/animations/resources/animation-test-helpers.js
>+++ b/LayoutTests/animations/resources/animation-test-helpers.js
>@@ -431,7 +431,7 @@ function getPropertyValue(property, elementId, iframeId)
>                || property == "webkitMaskImage"
>                || property == "webkitMaskBoxImage"
>                || property == "filter"
>-               || property == "colorFilter"
>+               || property == "-apple-color-filter"
>                || property == "webkitFilter"
>                || property == "webkitBackdropFilter"
>                || property == "webkitClipPath"
>@@ -471,7 +471,7 @@ function comparePropertyValue(property, computedValue, expectedValue, tolerance)
>                     break;
>             }
>         }
>-    } else if (property == "webkitFilter" || property == "webkitBackdropFilter" || property == "filter" || property == "colorFilter") {
>+    } else if (property == "webkitFilter" || property == "webkitBackdropFilter" || property == "filter" || property == "-apple-color-filter") {
>         var filterParameters = parseFilterFunctionList(computedValue);
>         var filter2Parameters = parseFilterFunctionList(expectedValue);
>         result = compareFilterFunctions(filterParameters, filter2Parameters, tolerance);
>diff --git a/LayoutTests/css3/color-filters/color-filter-animation-expected.txt b/LayoutTests/css3/color-filters/color-filter-animation-expected.txt
>index 7bb0c879bdfbddcf6d1d9d2bd6c07ad8c6bf0d55..4d9248f9e231f71264ee2d62f7ea600a6c61beef 100644
>--- a/LayoutTests/css3/color-filters/color-filter-animation-expected.txt
>+++ b/LayoutTests/css3/color-filters/color-filter-animation-expected.txt
>@@ -1,10 +1,10 @@
>        
>-PASS - "colorFilter" property for "grayscale-box" element at 1s saw something close to: grayscale(0.5)
>-PASS - "colorFilter" property for "sepia-box" element at 1s saw something close to: sepia(0.5)
>-PASS - "colorFilter" property for "saturate-box" element at 1s saw something close to: saturate(0.5)
>-PASS - "colorFilter" property for "huerotate-box" element at 1s saw something close to: hue-rotate(90deg)
>-PASS - "colorFilter" property for "invert-box" element at 1s saw something close to: invert(0.5)
>-PASS - "colorFilter" property for "opacity-box" element at 1s saw something close to: opacity(0.5)
>-PASS - "colorFilter" property for "brightness-box" element at 1s saw something close to: brightness(0.5)
>-PASS - "colorFilter" property for "contrast-box" element at 1s saw something close to: contrast(0.5)
>+PASS - "-apple-color-filter" property for "grayscale-box" element at 1s saw something close to: grayscale(0.5)
>+PASS - "-apple-color-filter" property for "sepia-box" element at 1s saw something close to: sepia(0.5)
>+PASS - "-apple-color-filter" property for "saturate-box" element at 1s saw something close to: saturate(0.5)
>+PASS - "-apple-color-filter" property for "huerotate-box" element at 1s saw something close to: hue-rotate(90deg)
>+PASS - "-apple-color-filter" property for "invert-box" element at 1s saw something close to: invert(0.5)
>+PASS - "-apple-color-filter" property for "opacity-box" element at 1s saw something close to: opacity(0.5)
>+PASS - "-apple-color-filter" property for "brightness-box" element at 1s saw something close to: brightness(0.5)
>+PASS - "-apple-color-filter" property for "contrast-box" element at 1s saw something close to: contrast(0.5)
> 
>diff --git a/LayoutTests/css3/color-filters/color-filter-animation.html b/LayoutTests/css3/color-filters/color-filter-animation.html
>index f1ed9fe4694ad91a43ad4fa5cfc3c8c69f5b0b48..152d05825a6592ed7b6da40af92597644926cdef 100644
>--- a/LayoutTests/css3/color-filters/color-filter-animation.html
>+++ b/LayoutTests/css3/color-filters/color-filter-animation.html
>@@ -1,4 +1,4 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> 
> <html>
> <head>
>@@ -45,43 +45,43 @@
> 
> 
>     @keyframes grayscale-anim {
>-        from { color-filter: grayscale(0); }
>-        to   { color-filter: grayscale(1); }
>+        from { -apple-color-filter: grayscale(0); }
>+        to   { -apple-color-filter: grayscale(1); }
>     }
> 
>     @keyframes sepia-anim {
>-        from { color-filter: sepia(0); }
>-        to   { color-filter: sepia(1); }
>+        from { -apple-color-filter: sepia(0); }
>+        to   { -apple-color-filter: sepia(1); }
>     }
> 
>     @keyframes saturate-anim {
>-        from { color-filter: saturate(0); }
>-        to   { color-filter: saturate(1); }
>+        from { -apple-color-filter: saturate(0); }
>+        to   { -apple-color-filter: saturate(1); }
>     }
> 
>     @keyframes huerotate-anim {
>-        from { color-filter: hue-rotate(0); }
>-        to   { color-filter: hue-rotate(180deg); }
>+        from { -apple-color-filter: hue-rotate(0); }
>+        to   { -apple-color-filter: hue-rotate(180deg); }
>     }
> 
>     @keyframes invert-anim {
>-        from { color-filter: invert(0); }
>-        to   { color-filter: invert(1); }
>+        from { -apple-color-filter: invert(0); }
>+        to   { -apple-color-filter: invert(1); }
>     }
> 
>     @keyframes opacity-anim {
>-        from { color-filter: opacity(1); }
>-        to   { color-filter: opacity(0); }
>+        from { -apple-color-filter: opacity(1); }
>+        to   { -apple-color-filter: opacity(0); }
>     }
> 
>     @keyframes brightness-anim {
>-        from { color-filter: brightness(1); }
>-        to   { color-filter: brightness(0); }
>+        from { -apple-color-filter: brightness(1); }
>+        to   { -apple-color-filter: brightness(0); }
>     }
> 
>     @keyframes contrast-anim {
>-        from { color-filter: contrast(1); }
>-        to   { color-filter: contrast(0); }
>+        from { -apple-color-filter: contrast(1); }
>+        to   { -apple-color-filter: contrast(0); }
>     }
> 
>   </style>
>@@ -89,14 +89,14 @@
>   <script type="text/javascript">
>     const expectedValues = [
>       // [animation-name, time, element-id, property, expected-value, tolerance]
>-      ["grayscale-anim",  1, "grayscale-box", "colorFilter", 'grayscale(0.5)', 0.05],
>-      ["sepia-anim",  1, "sepia-box", "colorFilter", 'sepia(0.5)', 0.05],
>-      ["saturate-anim",  1, "saturate-box", "colorFilter", 'saturate(0.5)', 0.05],
>-      ["huerotate-anim",  1, "huerotate-box", "colorFilter", 'hue-rotate(90deg)', 2],
>-      ["invert-anim",  1, "invert-box", "colorFilter", 'invert(0.5)', 0.05],
>-      ["opacity-anim",  1, "opacity-box", "colorFilter", 'opacity(0.5)', 0.05],
>-      ["brightness-anim",  1, "brightness-box", "colorFilter", 'brightness(0.5)', 0.05],
>-      ["contrast-anim",  1, "contrast-box", "colorFilter", 'contrast(0.5)', 0.05],
>+      ["grayscale-anim",  1, "grayscale-box", "-apple-color-filter", 'grayscale(0.5)', 0.05],
>+      ["sepia-anim",  1, "sepia-box", "-apple-color-filter", 'sepia(0.5)', 0.05],
>+      ["saturate-anim",  1, "saturate-box", "-apple-color-filter", 'saturate(0.5)', 0.05],
>+      ["huerotate-anim",  1, "huerotate-box", "-apple-color-filter", 'hue-rotate(90deg)', 2],
>+      ["invert-anim",  1, "invert-box", "-apple-color-filter", 'invert(0.5)', 0.05],
>+      ["opacity-anim",  1, "opacity-box", "-apple-color-filter", 'opacity(0.5)', 0.05],
>+      ["brightness-anim",  1, "brightness-box", "-apple-color-filter", 'brightness(0.5)', 0.05],
>+      ["contrast-anim",  1, "contrast-box", "-apple-color-filter", 'contrast(0.5)', 0.05],
>     ];
>     
>     runAnimationTest(expectedValues);
>diff --git a/LayoutTests/css3/color-filters/color-filter-backgrounds-borders-expected.html b/LayoutTests/css3/color-filters/color-filter-backgrounds-borders-expected.html
>index c87bfc80ee30725eb78c696ee93b73bbf2e1d60b..f1dde3f1b89288b4e542b2cb940a94d4ae46d6b1 100644
>--- a/LayoutTests/css3/color-filters/color-filter-backgrounds-borders-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-backgrounds-borders-expected.html
>@@ -1,10 +1,10 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>-        <meta name="assert" content="color-filter affects backgrounds and borders">
>+        <meta name="assert" content="-apple-color-filter affects backgrounds and borders">
>         <style type="text/css">
>             .test
>             {
>diff --git a/LayoutTests/css3/color-filters/color-filter-backgrounds-borders.html b/LayoutTests/css3/color-filters/color-filter-backgrounds-borders.html
>index db3a9686612a303a971305fbf8b7f57fac06ce0d..476094c5319565368aca4b8470dcfec2be4c1f40 100644
>--- a/LayoutTests/css3/color-filters/color-filter-backgrounds-borders.html
>+++ b/LayoutTests/css3/color-filters/color-filter-backgrounds-borders.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects backgrounds and borders</title>
>+        <title>CSS Test: -apple-color-filter affects backgrounds and borders</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-backgrounds-borders-expected.html">
>+        <link rel="match" href="-apple-color-filter-backgrounds-borders-expected.html">
> 
>-        <meta name="assert" content="color-filter affects backgrounds and borders">
>+        <meta name="assert" content="-apple-color-filter affects backgrounds and borders">
>         <style type="text/css">
>             .test
>             {
>@@ -13,7 +13,7 @@
>                 height: 200px;
>                 background-color: rgb(255, 128, 255);
>                 border: 20px solid yellow;
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>         </style>
>     </head>
>diff --git a/LayoutTests/css3/color-filters/color-filter-box-shadow-expected.html b/LayoutTests/css3/color-filters/color-filter-box-shadow-expected.html
>index bdc517f79b3950f9d51f8fe7aa88d379ede7ee7d..b6f0229098db8378ce63ab4723bbf5d556c24aa4 100644
>--- a/LayoutTests/css3/color-filters/color-filter-box-shadow-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-box-shadow-expected.html
>@@ -1,10 +1,10 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects box-shadow color</title>
>+        <title>CSS Test: -apple-color-filter affects box-shadow color</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>-        <meta name="assert" content="color-filter affects backgrounds and borders">
>+        <meta name="assert" content="-apple-color-filter affects backgrounds and borders">
>         <style type="text/css">
>             .test
>             {
>diff --git a/LayoutTests/css3/color-filters/color-filter-box-shadow.html b/LayoutTests/css3/color-filters/color-filter-box-shadow.html
>index f0900eb27c60d70cf1bd98ece845204d6945d66f..53a6e330f906f8771b947ee8ae6e26a57f9f5cc4 100644
>--- a/LayoutTests/css3/color-filters/color-filter-box-shadow.html
>+++ b/LayoutTests/css3/color-filters/color-filter-box-shadow.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects box-shadow color</title>
>+        <title>CSS Test: -apple-color-filter affects box-shadow color</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-box-shadow-expected.html">
>+        <link rel="match" href="-apple-color-filter-box-shadow-expected.html">
> 
>-        <meta name="assert" content="color-filter affects box-shadow color">
>+        <meta name="assert" content="-apple-color-filter affects box-shadow color">
>         <style type="text/css">
>             .test
>             {
>@@ -13,7 +13,7 @@
>                 height: 200px;
>                 background-color: rgb(255, 128, 255);
>                 box-shadow: 50px 50px 0 yellow;
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>         </style>
>     </head>
>diff --git a/LayoutTests/css3/color-filters/color-filter-brightness-expected.html b/LayoutTests/css3/color-filters/color-filter-brightness-expected.html
>index 84c15db9a354265d7eeae941f0851771b9338c52..bf3e435116753ff165045d4920a1220b1cd1885b 100644
>--- a/LayoutTests/css3/color-filters/color-filter-brightness-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-brightness-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-brightness.html b/LayoutTests/css3/color-filters/color-filter-brightness.html
>index 4847735e62503b33a856aec35770267f9570345a..286b40a31ee88d15d0cbdc0cd5baba832de4e2ca 100644
>--- a/LayoutTests/css3/color-filters/color-filter-brightness.html
>+++ b/LayoutTests/css3/color-filters/color-filter-brightness.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: brightness color-filter</title>
>+        <title>CSS Test: brightness -apple-color-filter</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-brightness-expected.html">
>+        <link rel="match" href="-apple-color-filter-brightness-expected.html">
> 
>-        <meta name="assert" content="brightness color-filter">
>+        <meta name="assert" content="brightness -apple-color-filter">
>         <style type="text/css">
>             .test
>             {
>@@ -19,11 +19,11 @@
>         </style>
>     </head>
>     <body>
>-        <div class="test" style="color-filter: brightness()"></div>
>-        <div class="test" style="color-filter: brightness(2)"></div>
>-        <div class="test" style="color-filter: brightness(1)"></div>
>-        <div class="test" style="color-filter: brightness(0.5)"></div>
>-        <div class="test" style="color-filter: brightness(0)"></div>
>-        <div class="test" style="color-filter: brightness(-0.5)"></div>
>+        <div class="test" style="-apple-color-filter: brightness()"></div>
>+        <div class="test" style="-apple-color-filter: brightness(2)"></div>
>+        <div class="test" style="-apple-color-filter: brightness(1)"></div>
>+        <div class="test" style="-apple-color-filter: brightness(0.5)"></div>
>+        <div class="test" style="-apple-color-filter: brightness(0)"></div>
>+        <div class="test" style="-apple-color-filter: brightness(-0.5)"></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-caret-color-expected.html b/LayoutTests/css3/color-filters/color-filter-caret-color-expected.html
>index 4dd384b33f1cbd7bb711d071f379e8b4e3defde0..1a532b93717c0607c03ac9f7d36e3015ba1c6f2c 100644
>--- a/LayoutTests/css3/color-filters/color-filter-caret-color-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-caret-color-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style>
>diff --git a/LayoutTests/css3/color-filters/color-filter-caret-color.html b/LayoutTests/css3/color-filters/color-filter-caret-color.html
>index f814dd67f352f471415eadb5630931f65fc778ba..768b899964e343e34b3fbd57d36b8886b3b35234 100644
>--- a/LayoutTests/css3/color-filters/color-filter-caret-color.html
>+++ b/LayoutTests/css3/color-filters/color-filter-caret-color.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects caret-color</title>
>+        <title>CSS Test: -apple-color-filter affects caret-color</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-caret-color-expected.html">
>+        <link rel="match" href="-apple-color-filter-caret-color-expected.html">
> 
>-        <meta name="assert" content="color-filter affects caret-color">
>+        <meta name="assert" content="-apple-color-filter affects caret-color">
>         <style>
>         #test-container {
>             height: 50px;
>@@ -15,7 +15,7 @@
>         }
> 
>         #test {
>-            color-filter: invert();
>+            -apple-color-filter: invert();
>             background-color: white;
>             transform-origin: left top;
>             transform: scale(50, 50);
>diff --git a/LayoutTests/css3/color-filters/color-filter-color-property-expected.html b/LayoutTests/css3/color-filters/color-filter-color-property-expected.html
>index 478e8317b94b390d1e0bea21276b711bf6cdcaa7..87b6b02c52a724c83da33fd0d5f3cc5965f3d532 100644
>--- a/LayoutTests/css3/color-filters/color-filter-color-property-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-color-property-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-color-property-list-item-expected.html b/LayoutTests/css3/color-filters/color-filter-color-property-list-item-expected.html
>index 2c57239b5f40d9d7c698d205deb2fe2c0d5629cc..60b5cdf5ac85e9eda6b135df1d0f157b7cf6f546 100644
>--- a/LayoutTests/css3/color-filters/color-filter-color-property-list-item-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-color-property-list-item-expected.html
>@@ -1,10 +1,10 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>-        <meta name="assert" content="color-filter affects the color of text">
>+        <meta name="assert" content="-apple-color-filter affects the color of text">
>         <style type="text/css">
>             div.test
>             {
>diff --git a/LayoutTests/css3/color-filters/color-filter-color-property-list-item.html b/LayoutTests/css3/color-filters/color-filter-color-property-list-item.html
>index ecc6a63de6d2dc673dff9574cfb17345d5a5c85d..df40b4877a713440a387db08afc3c278a6fc4191 100644
>--- a/LayoutTests/css3/color-filters/color-filter-color-property-list-item.html
>+++ b/LayoutTests/css3/color-filters/color-filter-color-property-list-item.html
>@@ -1,17 +1,17 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects the color of a list item bullet</title>
>+        <title>CSS Test: -apple-color-filter affects the color of a list item bullet</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-color-property-list-item-expected.html">
>+        <link rel="match" href="-apple-color-filter-color-property-list-item-expected.html">
> 
>-        <meta name="assert" content="color-filter affects the color of a list item bullet">
>+        <meta name="assert" content="-apple-color-filter affects the color of a list item bullet">
>         <style type="text/css">
>             div.test
>             {
>                 font: 200px Ahem;
>                 color: rgb(255, 128, 255);
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>             ul {
>                 margin: 0;
>diff --git a/LayoutTests/css3/color-filters/color-filter-color-property.html b/LayoutTests/css3/color-filters/color-filter-color-property.html
>index 31792ac287912435e18ed159c20769ce0d41bc1f..e29ca1fc1f2efc705825b5da7b14b90f91bfa3c8 100644
>--- a/LayoutTests/css3/color-filters/color-filter-color-property.html
>+++ b/LayoutTests/css3/color-filters/color-filter-color-property.html
>@@ -1,17 +1,17 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects the color of text</title>
>+        <title>CSS Test: -apple-color-filter affects the color of text</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-color-property-expected.html">
>+        <link rel="match" href="-apple-color-filter-color-property-expected.html">
> 
>-        <meta name="assert" content="color-filter affects the color of text">
>+        <meta name="assert" content="-apple-color-filter affects the color of text">
>         <style type="text/css">
>             div.test
>             {
>                 font: 40px Ahem;
>                 color: rgb(255, 128, 255);
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>         </style>
>     </head>
>diff --git a/LayoutTests/css3/color-filters/color-filter-color-text-decorations-expected.html b/LayoutTests/css3/color-filters/color-filter-color-text-decorations-expected.html
>index 46c92e7881c8ee22ba54208e8abd4bf2f4332482..34f9c1f9e105c4bc19a911187ff6cc481b592927 100644
>--- a/LayoutTests/css3/color-filters/color-filter-color-text-decorations-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-color-text-decorations-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-color-text-decorations.html b/LayoutTests/css3/color-filters/color-filter-color-text-decorations.html
>index 5afe5b93e1e69cb6a6854296f8b15b4b3f07ece6..cecf85999bbb555456475ad191db8821398dfc4f 100644
>--- a/LayoutTests/css3/color-filters/color-filter-color-text-decorations.html
>+++ b/LayoutTests/css3/color-filters/color-filter-color-text-decorations.html
>@@ -1,18 +1,18 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects the color of text</title>
>+        <title>CSS Test: -apple-color-filter affects the color of text</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-color-text-decorations-expected.html">
>+        <link rel="match" href="-apple-color-filter-color-text-decorations-expected.html">
> 
>-        <meta name="assert" content="color-filter affects the color of text decorations">
>+        <meta name="assert" content="-apple-color-filter affects the color of text decorations">
>         <style type="text/css">
>             div.test
>             {
>                 font: 140px sans-serif;
>                 color: rgb(255, 128, 255);
>                 -webkit-text-decoration: underline overline yellow;
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
> 
>             p
>diff --git a/LayoutTests/css3/color-filters/color-filter-column-rule-expected.html b/LayoutTests/css3/color-filters/color-filter-column-rule-expected.html
>index 677131986d1d9577131cedff618b0e31bbc3a67c..cb5c8bb318c457ef53df1757ecc549ffdbac81d6 100644
>--- a/LayoutTests/css3/color-filters/color-filter-column-rule-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-column-rule-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>         <style type="text/css">
>             .test
>diff --git a/LayoutTests/css3/color-filters/color-filter-column-rule.html b/LayoutTests/css3/color-filters/color-filter-column-rule.html
>index 77c1c938c9fdb6fa0995d22e018f18d2ef07cabf..65504cdd4eebfba459081dd3d6053c6abea8697c 100644
>--- a/LayoutTests/css3/color-filters/color-filter-column-rule.html
>+++ b/LayoutTests/css3/color-filters/color-filter-column-rule.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects column-rule color</title>
>+        <title>CSS Test: -apple-color-filter affects column-rule color</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-column-rule-expected.html">
>+        <link rel="match" href="-apple-color-filter-column-rule-expected.html">
> 
>-        <meta name="assert" content="color-filter affects column-rule color">
>+        <meta name="assert" content="-apple-color-filter affects column-rule color">
>         <style type="text/css">
>             .test
>             {
>@@ -17,7 +17,7 @@
>                 column-rule-width: 100px;
>                 column-rule-color: rgb(255, 128, 255);
>                 column-rule-style: solid;
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>         </style>
>     </head>
>diff --git a/LayoutTests/css3/color-filters/color-filter-contrast-expected.html b/LayoutTests/css3/color-filters/color-filter-contrast-expected.html
>index 5579ddeb4779d175d41aaa4a83e443b889e0d2f8..61afbd46898c893bc87c4d686a049689b06d51e2 100644
>--- a/LayoutTests/css3/color-filters/color-filter-contrast-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-contrast-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-contrast.html b/LayoutTests/css3/color-filters/color-filter-contrast.html
>index 83cb4714bdff3d10bf1d827d9457d0b776115c8e..8e62915d9975403f75d0b8bc89a002541a9aded6 100644
>--- a/LayoutTests/css3/color-filters/color-filter-contrast.html
>+++ b/LayoutTests/css3/color-filters/color-filter-contrast.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: contrast color-filter</title>
>+        <title>CSS Test: contrast -apple-color-filter</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-contrast-expected.html">
>+        <link rel="match" href="-apple-color-filter-contrast-expected.html">
> 
>-        <meta name="assert" content="contrast color-filter">
>+        <meta name="assert" content="contrast -apple-color-filter">
>         <style type="text/css">
>             .test
>             {
>@@ -19,11 +19,11 @@
>         </style>
>     </head>
>     <body>
>-        <div class="test" style="color-filter: contrast()"></div>
>-        <div class="test" style="color-filter: contrast(2)"></div>
>-        <div class="test" style="color-filter: contrast(1)"></div>
>-        <div class="test" style="color-filter: contrast(0.5)"></div>
>-        <div class="test" style="color-filter: contrast(0)"></div>
>-        <div class="test" style="color-filter: contrast(-0.5)"></div>
>+        <div class="test" style="-apple-color-filter: contrast()"></div>
>+        <div class="test" style="-apple-color-filter: contrast(2)"></div>
>+        <div class="test" style="-apple-color-filter: contrast(1)"></div>
>+        <div class="test" style="-apple-color-filter: contrast(0.5)"></div>
>+        <div class="test" style="-apple-color-filter: contrast(0)"></div>
>+        <div class="test" style="-apple-color-filter: contrast(-0.5)"></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-current-color-expected.html b/LayoutTests/css3/color-filters/color-filter-current-color-expected.html
>index 681a60de798857090a21dbfd63ff6fa25c46cc6b..f1b79688fdc2f09f15d9e05b5e64cdd8d7222fce 100644
>--- a/LayoutTests/css3/color-filters/color-filter-current-color-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-current-color-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-current-color.html b/LayoutTests/css3/color-filters/color-filter-current-color.html
>index bc2569f05ff7916a7678b70e7d8bf40db90d3060..61de70f8179f3a8d0122e908e4e18633a74f15b8 100644
>--- a/LayoutTests/css3/color-filters/color-filter-current-color.html
>+++ b/LayoutTests/css3/color-filters/color-filter-current-color.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects currentColor</title>
>+        <title>CSS Test: -apple-color-filter affects currentColor</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-current-color-expected.html">
>+        <link rel="match" href="-apple-color-filter-current-color-expected.html">
> 
>-        <meta name="assert" content="color-filter affects currentColor">
>+        <meta name="assert" content="-apple-color-filter affects currentColor">
>         <style type="text/css">
>             .test
>             {
>@@ -14,7 +14,7 @@
>                 margin: 10px;
>                 color: rgb(255, 128, 255);
>                 border: 4px solid yellow;
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>             
>             .first
>diff --git a/LayoutTests/css3/color-filters/color-filter-filter-list-expected.html b/LayoutTests/css3/color-filters/color-filter-filter-list-expected.html
>index 5345a5465fab9a6d775d1ccdbeaa810af5c85f5a..225d23706bc0fe142d9bf3205f9b407a22d28e70 100644
>--- a/LayoutTests/css3/color-filters/color-filter-filter-list-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-filter-list-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-filter-list.html b/LayoutTests/css3/color-filters/color-filter-filter-list.html
>index 779d3a8fb0a89aa2dd5ebd2b601f4dd905ac51eb..7a715d5a085f42a5dcdd33f11614b568005e44e4 100644
>--- a/LayoutTests/css3/color-filters/color-filter-filter-list.html
>+++ b/LayoutTests/css3/color-filters/color-filter-filter-list.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter lists</title>
>+        <title>CSS Test: -apple-color-filter lists</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-filter-list-expected.html">
>+        <link rel="match" href="-apple-color-filter-filter-list-expected.html">
> 
>-        <meta name="assert" content="color-filter lists">
>+        <meta name="assert" content="-apple-color-filter lists">
>         <style type="text/css">
>             .test
>             {
>@@ -20,10 +20,10 @@
>     </head>
>     <body>
>         <div class="test"></div>
>-        <div class="test" style="color-filter: brightness(2) brightness(0.5)"></div>
>-        <div class="test" style="color-filter: invert() hue-rotate(180deg)"></div>
>-        <div class="test" style="color-filter: opacity(0.5) saturate(200%)"></div>
>-        <div class="test" style="color-filter: grayscale(0.2) brightness(2)"></div>
>-        <div class="test" style="color-filter: sepia() brightness(2)"></div>
>+        <div class="test" style="-apple-color-filter: brightness(2) brightness(0.5)"></div>
>+        <div class="test" style="-apple-color-filter: invert() hue-rotate(180deg)"></div>
>+        <div class="test" style="-apple-color-filter: opacity(0.5) saturate(200%)"></div>
>+        <div class="test" style="-apple-color-filter: grayscale(0.2) brightness(2)"></div>
>+        <div class="test" style="-apple-color-filter: sepia() brightness(2)"></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-gradients-expected.html b/LayoutTests/css3/color-filters/color-filter-gradients-expected.html
>index 3a9ce8ccd073dcef875abe8aa71a4eb40401c5cb..99dd3f68fee50e779f54ecb2ec3e1cce6bc4c876 100644
>--- a/LayoutTests/css3/color-filters/color-filter-gradients-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-gradients-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-gradients.html b/LayoutTests/css3/color-filters/color-filter-gradients.html
>index dde0457f3c5aaa34dce56c2d233b92143525a86f..5240ed5bb0aa292e2dac101904fa810ebaabcb77 100644
>--- a/LayoutTests/css3/color-filters/color-filter-gradients.html
>+++ b/LayoutTests/css3/color-filters/color-filter-gradients.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects gradients</title>
>+        <title>CSS Test: -apple-color-filter affects gradients</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-grayscale-expected.html">
>+        <link rel="match" href="-apple-color-filter-grayscale-expected.html">
> 
>-        <meta name="assert" content="color-filter affects gradients">
>+        <meta name="assert" content="-apple-color-filter affects gradients">
>         <style type="text/css">
>             .test
>             {
>@@ -13,7 +13,7 @@
>                 height: 200px;
>                 margin: 10px;
>                 float: left;
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>         </style>
>     </head>
>diff --git a/LayoutTests/css3/color-filters/color-filter-grayscale-expected.html b/LayoutTests/css3/color-filters/color-filter-grayscale-expected.html
>index 6dbcd14660ad2c4690f5f08e13fd34b2d417ab45..fddd84f1062849150b8f32918af75dcc3c8faa46 100644
>--- a/LayoutTests/css3/color-filters/color-filter-grayscale-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-grayscale-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-grayscale.html b/LayoutTests/css3/color-filters/color-filter-grayscale.html
>index c95460a8d235ade20d9b315ae5dd2e6813f932b6..a6783895ff73122ee9033836101ac884aac91881 100644
>--- a/LayoutTests/css3/color-filters/color-filter-grayscale.html
>+++ b/LayoutTests/css3/color-filters/color-filter-grayscale.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: grayscale color-filter</title>
>+        <title>CSS Test: grayscale -apple-color-filter</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-grayscale-expected.html">
>+        <link rel="match" href="-apple-color-filter-grayscale-expected.html">
> 
>-        <meta name="assert" content="grayscale color-filter">
>+        <meta name="assert" content="grayscale -apple-color-filter">
>         <style type="text/css">
>             .test
>             {
>@@ -19,11 +19,11 @@
>         </style>
>     </head>
>     <body>
>-        <div class="test" style="color-filter: grayscale()"></div>
>-        <div class="test" style="color-filter: grayscale(2)"></div>
>-        <div class="test" style="color-filter: grayscale(1)"></div>
>-        <div class="test" style="color-filter: grayscale(0.5)"></div>
>-        <div class="test" style="color-filter: grayscale(0)"></div>
>-        <div class="test" style="color-filter: grayscale(-0.5)"></div>
>+        <div class="test" style="-apple-color-filter: grayscale()"></div>
>+        <div class="test" style="-apple-color-filter: grayscale(2)"></div>
>+        <div class="test" style="-apple-color-filter: grayscale(1)"></div>
>+        <div class="test" style="-apple-color-filter: grayscale(0.5)"></div>
>+        <div class="test" style="-apple-color-filter: grayscale(0)"></div>
>+        <div class="test" style="-apple-color-filter: grayscale(-0.5)"></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-hue-rotate-expected.html b/LayoutTests/css3/color-filters/color-filter-hue-rotate-expected.html
>index becb0104d81219c650409b021f560ca605690429..341d861ec53eea8d2e555c522a4de7998d619e97 100644
>--- a/LayoutTests/css3/color-filters/color-filter-hue-rotate-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-hue-rotate-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-hue-rotate.html b/LayoutTests/css3/color-filters/color-filter-hue-rotate.html
>index a7b065c008ac3351d5fa58da96b9120c65a13816..a4bb1c95f4e813c20cc6a715833bb4e7335fdfbc 100644
>--- a/LayoutTests/css3/color-filters/color-filter-hue-rotate.html
>+++ b/LayoutTests/css3/color-filters/color-filter-hue-rotate.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: hue-rotate color-filter</title>
>+        <title>CSS Test: hue-rotate -apple-color-filter</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-hue-rotate-expected.html">
>+        <link rel="match" href="-apple-color-filter-hue-rotate-expected.html">
> 
>-        <meta name="assert" content="hue-rotate color-filter">
>+        <meta name="assert" content="hue-rotate -apple-color-filter">
>         <style type="text/css">
>             .test
>             {
>@@ -19,11 +19,11 @@
>         </style>
>     </head>
>     <body>
>-        <div class="test" style="color-filter: hue-rotate()"></div>
>-        <div class="test" style="color-filter: hue-rotate(540deg)"></div>
>-        <div class="test" style="color-filter: hue-rotate(360deg)"></div>
>-        <div class="test" style="color-filter: hue-rotate(90deg)"></div>
>-        <div class="test" style="color-filter: hue-rotate(0)"></div>
>-        <div class="test" style="color-filter: hue-rotate(-180deg)"></div>
>+        <div class="test" style="-apple-color-filter: hue-rotate()"></div>
>+        <div class="test" style="-apple-color-filter: hue-rotate(540deg)"></div>
>+        <div class="test" style="-apple-color-filter: hue-rotate(360deg)"></div>
>+        <div class="test" style="-apple-color-filter: hue-rotate(90deg)"></div>
>+        <div class="test" style="-apple-color-filter: hue-rotate(0)"></div>
>+        <div class="test" style="-apple-color-filter: hue-rotate(-180deg)"></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-inherits-expected.html b/LayoutTests/css3/color-filters/color-filter-inherits-expected.html
>index efe800fdd2974e6c428c6e4af5c519b1826cee02..d5bd59213d65cf19dc1c369cb9927ef6b33208d8 100644
>--- a/LayoutTests/css3/color-filters/color-filter-inherits-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-inherits-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-inherits.html b/LayoutTests/css3/color-filters/color-filter-inherits.html
>index b5ce2d093a53acbee946ae2cef41ba38bb3175e3..18fdd5984e26b5ead74efb73c105dd691e9c9dbf 100644
>--- a/LayoutTests/css3/color-filters/color-filter-inherits.html
>+++ b/LayoutTests/css3/color-filters/color-filter-inherits.html
>@@ -1,16 +1,16 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter is inherited</title>
>+        <title>CSS Test: -apple-color-filter is inherited</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-inherits-expected.html">
>+        <link rel="match" href="-apple-color-filter-inherits-expected.html">
> 
>-        <meta name="assert" content="color-filter is inherited">
>+        <meta name="assert" content="-apple-color-filter is inherited">
>         <style type="text/css">
>             .test
>             {
>                 font: 120px Ahem;
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>             
>             .test > div {
>diff --git a/LayoutTests/css3/color-filters/color-filter-invert-expected.html b/LayoutTests/css3/color-filters/color-filter-invert-expected.html
>index ccab9265828c19b4187ac7d8836159f08dd7318c..9733c7afbc40e48ebd34a4ef88fc8628ab97e1d4 100644
>--- a/LayoutTests/css3/color-filters/color-filter-invert-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-invert-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-invert.html b/LayoutTests/css3/color-filters/color-filter-invert.html
>index a27fb080afb8a358df7e8f50f60ed6dfd69ddf47..bf89834346ccb27150fe1a1148b9c2d3441eaef7 100644
>--- a/LayoutTests/css3/color-filters/color-filter-invert.html
>+++ b/LayoutTests/css3/color-filters/color-filter-invert.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: invert color-filter</title>
>+        <title>CSS Test: invert -apple-color-filter</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-invert-expected.html">
>+        <link rel="match" href="-apple-color-filter-invert-expected.html">
> 
>-        <meta name="assert" content="invert color-filter">
>+        <meta name="assert" content="invert -apple-color-filter">
>         <style type="text/css">
>             .test
>             {
>@@ -19,11 +19,11 @@
>         </style>
>     </head>
>     <body>
>-        <div class="test" style="color-filter: invert()"></div>
>-        <div class="test" style="color-filter: invert(2)"></div>
>-        <div class="test" style="color-filter: invert(1)"></div>
>-        <div class="test" style="color-filter: invert(0.5)"></div>
>-        <div class="test" style="color-filter: invert(0)"></div>
>-        <div class="test" style="color-filter: invert(-0.5)"></div>
>+        <div class="test" style="-apple-color-filter: invert()"></div>
>+        <div class="test" style="-apple-color-filter: invert(2)"></div>
>+        <div class="test" style="-apple-color-filter: invert(1)"></div>
>+        <div class="test" style="-apple-color-filter: invert(0.5)"></div>
>+        <div class="test" style="-apple-color-filter: invert(0)"></div>
>+        <div class="test" style="-apple-color-filter: invert(-0.5)"></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-opacity-expected.html b/LayoutTests/css3/color-filters/color-filter-opacity-expected.html
>index ccdc1bf85c2a9069b024f94b87bd8810250f7cdd..f8b9e215661d159ff2c2a946d8adf77417ca4e43 100644
>--- a/LayoutTests/css3/color-filters/color-filter-opacity-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-opacity-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-opacity.html b/LayoutTests/css3/color-filters/color-filter-opacity.html
>index ac1dc6e2dd629cf18bff3179edc2c289c81ea9af..9aa6bf51b7e39a5269f54a507fcc722b407c4c1d 100644
>--- a/LayoutTests/css3/color-filters/color-filter-opacity.html
>+++ b/LayoutTests/css3/color-filters/color-filter-opacity.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: opacity color-filter</title>
>+        <title>CSS Test: opacity -apple-color-filter</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-opacity-expected.html">
>+        <link rel="match" href="-apple-color-filter-opacity-expected.html">
> 
>-        <meta name="assert" content="opacity color-filter">
>+        <meta name="assert" content="opacity -apple-color-filter">
>         <style type="text/css">
>             .test
>             {
>@@ -25,11 +25,11 @@
>         </style>
>     </head>
>     <body>
>-        <div class="test" style="color-filter: opacity()"><div></div></div>
>-        <div class="test" style="color-filter: opacity(2)"><div></div></div>
>-        <div class="test" style="color-filter: opacity(1)"><div></div></div>
>-        <div class="test" style="color-filter: opacity(0.5)"><div></div></div>
>-        <div class="test" style="color-filter: opacity(0)"><div></div></div>
>-        <div class="test" style="color-filter: opacity(-0.5)"><div></div></div>
>+        <div class="test" style="-apple-color-filter: opacity()"><div></div></div>
>+        <div class="test" style="-apple-color-filter: opacity(2)"><div></div></div>
>+        <div class="test" style="-apple-color-filter: opacity(1)"><div></div></div>
>+        <div class="test" style="-apple-color-filter: opacity(0.5)"><div></div></div>
>+        <div class="test" style="-apple-color-filter: opacity(0)"><div></div></div>
>+        <div class="test" style="-apple-color-filter: opacity(-0.5)"><div></div></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-outline-expected.html b/LayoutTests/css3/color-filters/color-filter-outline-expected.html
>index a67ca2651bfe6fc242008a44900f913a96e845e7..55e8dc733a4cb82fb0b52af43208f3e785cab2a3 100644
>--- a/LayoutTests/css3/color-filters/color-filter-outline-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-outline-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-outline.html b/LayoutTests/css3/color-filters/color-filter-outline.html
>index 7922947153d3235fa3e14dc5aa07ccd68a73a7f8..d58d0320fad07535b364b38924d8823bbde1f9bd 100644
>--- a/LayoutTests/css3/color-filters/color-filter-outline.html
>+++ b/LayoutTests/css3/color-filters/color-filter-outline.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects outline color</title>
>+        <title>CSS Test: -apple-color-filter affects outline color</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-outline-expected.html">
>+        <link rel="match" href="-apple-color-filter-outline-expected.html">
> 
>-        <meta name="assert" content="color-filter affects outline color">
>+        <meta name="assert" content="-apple-color-filter affects outline color">
>         <style type="text/css">
>             .test
>             {
>@@ -14,7 +14,7 @@
>                 margin: 50px;
>                 background-color: rgb(255, 128, 255);
>                 outline: 20px solid yellow;
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>         </style>
>     </head>
>diff --git a/LayoutTests/css3/color-filters/color-filter-parsing-expected.txt b/LayoutTests/css3/color-filters/color-filter-parsing-expected.txt
>index ceb397ec4af203ce81d0f9d6dfb5e0514712069a..9cb81af6b2e304511b6cbc9f027827eca9d368cb 100644
>--- a/LayoutTests/css3/color-filters/color-filter-parsing-expected.txt
>+++ b/LayoutTests/css3/color-filters/color-filter-parsing-expected.txt
>@@ -11,8 +11,8 @@ PASS Parse invert
> PASS Parse opacity() 
> PASS Parse saturate() 
> PASS Parse sepia() 
>-PASS drop-shadow() is not allowed in color-filter 
>-PASS blur() is not allowed in color-filter 
>+PASS drop-shadow() is not allowed in -apple-color-filter 
>+PASS blur() is not allowed in -apple-color-filter 
> PASS Canonicalize grayscale() argument 
> PASS Canonicalize hue-rotate() argument 
> PASS Negative value for brightness() is invalid 
>diff --git a/LayoutTests/css3/color-filters/color-filter-parsing.html b/LayoutTests/css3/color-filters/color-filter-parsing.html
>index d0d426a1e353ecdb654e1cbd35c6a5d9319c95e7..e9e05a8754ba2af81bd98221885e3212e7e73692 100644
>--- a/LayoutTests/css3/color-filters/color-filter-parsing.html
>+++ b/LayoutTests/css3/color-filters/color-filter-parsing.html
>@@ -1,7 +1,11 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
> <script src="../../resources/testharness.js"></script>
> <script src="../../resources/testharnessreport.js"></script>
>+</head>
>+<body>
> <div id="test"></div>
>-
> <script>
> 
> var testDiv = document.querySelector('#test');
>@@ -9,9 +13,9 @@ var testDiv = document.querySelector('#test');
> function testColorFilterParsing(value, expected, name)
> {
>     test(() => {
>-        testDiv.style.colorFilter = '';
>-        testDiv.style.colorFilter = value;
>-        var computedStyle = getComputedStyle(testDiv).colorFilter;
>+        testDiv.style.setProperty("-apple-color-filter", "");
>+        testDiv.style.setProperty("-apple-color-filter", value);
>+        var computedStyle = getComputedStyle(testDiv).getPropertyValue("-apple-color-filter");
>         assert_equals(computedStyle, expected);
>     }, name);
> }
>@@ -32,8 +36,8 @@ testColorFilterParsing("saturate()", "saturate(1)", "Parse saturate()");
> testColorFilterParsing("sepia()", "sepia(1)", "Parse sepia()");
> 
> // Functions not allowed.
>-testColorFilterParsing("drop-shadow(110px 110px 0 blue)", "none", "drop-shadow() is not allowed in color-filter");
>-testColorFilterParsing("blur(10px)", "none", "blur() is not allowed in color-filter");
>+testColorFilterParsing("drop-shadow(110px 110px 0 blue)", "none", "drop-shadow() is not allowed in -apple-color-filter");
>+testColorFilterParsing("blur(10px)", "none", "blur() is not allowed in -apple-color-filter");
> 
> // Argument canonicalization.
> testColorFilterParsing("grayscale(30%)", "grayscale(0.3)", "Canonicalize grayscale() argument");
>@@ -64,3 +68,5 @@ testColorFilterParsing("grayscale(50%) hue-rotate(45deg) opacity(0.5)", "graysca
> testColorFilterParsing("grayscale(50%) blur(10px) opacity(0.5)", "none", "Filter list with blur is invalid");
> 
> </script>
>+</body>
>+</html>
>\ No newline at end of file
>diff --git a/LayoutTests/css3/color-filters/color-filter-saturate-expected.html b/LayoutTests/css3/color-filters/color-filter-saturate-expected.html
>index 8a5967d64f3b28098984e9f6743f44d95b2e8993..1e7272492e3e5a39e1ad187a524e99997399db34 100644
>--- a/LayoutTests/css3/color-filters/color-filter-saturate-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-saturate-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-saturate.html b/LayoutTests/css3/color-filters/color-filter-saturate.html
>index cc73db4c8f2d7bb23969f279ef6bb7e71e511c96..9b29130e50f85cae23adc5bade3a03319e5106e5 100644
>--- a/LayoutTests/css3/color-filters/color-filter-saturate.html
>+++ b/LayoutTests/css3/color-filters/color-filter-saturate.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: saturate color-filter</title>
>+        <title>CSS Test: saturate -apple-color-filter</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-saturate-expected.html">
>+        <link rel="match" href="-apple-color-filter-saturate-expected.html">
> 
>-        <meta name="assert" content="saturate color-filter">
>+        <meta name="assert" content="saturate -apple-color-filter">
>         <style type="text/css">
>             .test
>             {
>@@ -19,11 +19,11 @@
>         </style>
>     </head>
>     <body>
>-        <div class="test" style="color-filter: saturate()"></div>
>-        <div class="test" style="color-filter: saturate(1)"></div>
>-        <div class="test" style="color-filter: saturate(2)"></div>
>-        <div class="test" style="color-filter: saturate(0.5)"></div>
>-        <div class="test" style="color-filter: saturate(0)"></div>
>-        <div class="test" style="color-filter: saturate(-0.5)"></div>
>+        <div class="test" style="-apple-color-filter: saturate()"></div>
>+        <div class="test" style="-apple-color-filter: saturate(1)"></div>
>+        <div class="test" style="-apple-color-filter: saturate(2)"></div>
>+        <div class="test" style="-apple-color-filter: saturate(0.5)"></div>
>+        <div class="test" style="-apple-color-filter: saturate(0)"></div>
>+        <div class="test" style="-apple-color-filter: saturate(-0.5)"></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-sepia-expected.html b/LayoutTests/css3/color-filters/color-filter-sepia-expected.html
>index 7f9ef8e8adcbe9570cc00dbc4efe1a9d8acd07d1..a952ec4c1ec0ed796403a1c61e0b68130bbb5436 100644
>--- a/LayoutTests/css3/color-filters/color-filter-sepia-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-sepia-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-sepia.html b/LayoutTests/css3/color-filters/color-filter-sepia.html
>index 40cc4d5356ca2fe1cf43c74c3387021d73d12e03..670297f9aa38ba0d6a819ca5a7d1b923a6dd08f8 100644
>--- a/LayoutTests/css3/color-filters/color-filter-sepia.html
>+++ b/LayoutTests/css3/color-filters/color-filter-sepia.html
>@@ -1,11 +1,11 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: sepia color-filter</title>
>+        <title>CSS Test: sepia -apple-color-filter</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-sepia-expected.html">
>+        <link rel="match" href="-apple-color-filter-sepia-expected.html">
> 
>-        <meta name="assert" content="sepia color-filter">
>+        <meta name="assert" content="sepia -apple-color-filter">
>         <style type="text/css">
>             .test
>             {
>@@ -19,11 +19,11 @@
>         </style>
>     </head>
>     <body>
>-        <div class="test" style="color-filter: sepia()"></div>
>-        <div class="test" style="color-filter: sepia(2)"></div>
>-        <div class="test" style="color-filter: sepia(1)"></div>
>-        <div class="test" style="color-filter: sepia(0.5)"></div>
>-        <div class="test" style="color-filter: sepia(0)"></div>
>-        <div class="test" style="color-filter: sepia(-0.5)"></div>
>+        <div class="test" style="-apple-color-filter: sepia()"></div>
>+        <div class="test" style="-apple-color-filter: sepia(2)"></div>
>+        <div class="test" style="-apple-color-filter: sepia(1)"></div>
>+        <div class="test" style="-apple-color-filter: sepia(0.5)"></div>
>+        <div class="test" style="-apple-color-filter: sepia(0)"></div>
>+        <div class="test" style="-apple-color-filter: sepia(-0.5)"></div>
>     </body>
> </html>
>diff --git a/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow-expected.html b/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow-expected.html
>index 6813a767482e29f793fc060271faaf2181aa5f1f..5dd9006c6d835bb911f5ab7c0f0313ac45412fe2 100644
>--- a/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow.html b/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow.html
>index ce7f7be736532e6a17ca01df94c14a6444d5dbed..146ce8a2cb4f03f5b69fc3787deeb88b81df1192 100644
>--- a/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow.html
>+++ b/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow.html
>@@ -1,17 +1,17 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects text decoration shadows</title>
>+        <title>CSS Test: -apple-color-filter affects text decoration shadows</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-text-decoration-shadow-expected.html">
>+        <link rel="match" href="-apple-color-filter-text-decoration-shadow-expected.html">
> 
>-        <meta name="assert" content="color-filter affects text decoration shadows">
>+        <meta name="assert" content="-apple-color-filter affects text decoration shadows">
>         <style type="text/css">
>             .test
>             {
>                 font: 120px sans-serif;
>                 color: rgb(255, 128, 255);
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>                 margin: 100px 20px;
>                 text-decoration: underline overline line-through;
>             }
>diff --git a/LayoutTests/css3/color-filters/color-filter-text-emphasis-expected.html b/LayoutTests/css3/color-filters/color-filter-text-emphasis-expected.html
>index bfeea4ac329d35e33e4d4b4f92380cd55caa1ddb..62c1b34cfeac04fa4636d86b49a11f419a6e8056 100644
>--- a/LayoutTests/css3/color-filters/color-filter-text-emphasis-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-text-emphasis-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-text-emphasis.html b/LayoutTests/css3/color-filters/color-filter-text-emphasis.html
>index 108f11a19c44da5f35ec6a78b5b535b80c09fb7c..144046e0f7bb1b78e3710ba5818e622c52c3d7f3 100644
>--- a/LayoutTests/css3/color-filters/color-filter-text-emphasis.html
>+++ b/LayoutTests/css3/color-filters/color-filter-text-emphasis.html
>@@ -1,17 +1,17 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects text-emphasis color</title>
>+        <title>CSS Test: -apple-color-filter affects text-emphasis color</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-text-emphasis-expected.html">
>+        <link rel="match" href="-apple-color-filter-text-emphasis-expected.html">
> 
>-        <meta name="assert" content="color-filter affects the color of text-emphasis">
>+        <meta name="assert" content="-apple-color-filter affects the color of text-emphasis">
>         <style type="text/css">
>             .test
>             {
>                 font: 120px Ahem;
>                 color: rgb(255, 128, 255);
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>                 margin: 10px;
>             }
> 
>diff --git a/LayoutTests/css3/color-filters/color-filter-text-shadow-expected.html b/LayoutTests/css3/color-filters/color-filter-text-shadow-expected.html
>index c17e66c4d99b9e866febbc49612a9f8ffd89a090..0aad24de0e88e06d26a224fcf1370f3a05e14c78 100644
>--- a/LayoutTests/css3/color-filters/color-filter-text-shadow-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-text-shadow-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style type="text/css">
>diff --git a/LayoutTests/css3/color-filters/color-filter-text-shadow.html b/LayoutTests/css3/color-filters/color-filter-text-shadow.html
>index c569ba920338c199a23bad2dbcd0f3681811be1a..3195648894203120888722a168ad1d0c6ab314aa 100644
>--- a/LayoutTests/css3/color-filters/color-filter-text-shadow.html
>+++ b/LayoutTests/css3/color-filters/color-filter-text-shadow.html
>@@ -1,17 +1,17 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects the text shadow</title>
>+        <title>CSS Test: -apple-color-filter affects the text shadow</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-text-shadow-expected.html">
>+        <link rel="match" href="-apple-color-filter-text-shadow-expected.html">
> 
>-        <meta name="assert" content="color-filter affects the color of text-shadow">
>+        <meta name="assert" content="-apple-color-filter affects the color of text-shadow">
>         <style type="text/css">
>             .test
>             {
>                 font: 120px Ahem;
>                 color: rgb(255, 128, 255);
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>                 margin: 100px 20px;
>             }
> 
>diff --git a/LayoutTests/css3/color-filters/color-filter-text-stroke-expected.html b/LayoutTests/css3/color-filters/color-filter-text-stroke-expected.html
>index a1ceee630759c2a19a1027b2abb52710982c956d..f3d409b8791ed8c849d44d54c761cee6c47a81fc 100644
>--- a/LayoutTests/css3/color-filters/color-filter-text-stroke-expected.html
>+++ b/LayoutTests/css3/color-filters/color-filter-text-stroke-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>         <style type="text/css">
>             .test
>diff --git a/LayoutTests/css3/color-filters/color-filter-text-stroke.html b/LayoutTests/css3/color-filters/color-filter-text-stroke.html
>index e8e20c605123ff665f221bdb66cdb570a05d3960..ebdd38a4d758095b7109e7af88252b038b0499be 100644
>--- a/LayoutTests/css3/color-filters/color-filter-text-stroke.html
>+++ b/LayoutTests/css3/color-filters/color-filter-text-stroke.html
>@@ -1,18 +1,18 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter affects text stroke</title>
>+        <title>CSS Test: -apple-color-filter affects text stroke</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-text-stroke-expected.html">
>+        <link rel="match" href="-apple-color-filter-text-stroke-expected.html">
> 
>-        <meta name="assert" content="color-filter affects text stroke">
>+        <meta name="assert" content="-apple-color-filter affects text stroke">
>         <style type="text/css">
>             .test
>             {
>                 margin: 50px 20px;
>                 font: 120px Ahem;
>                 color: rgb(255, 128, 255);
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
>         </style>
>     </head>
>diff --git a/LayoutTests/css3/color-filters/svg/color-filter-inline-svg-expected.html b/LayoutTests/css3/color-filters/svg/color-filter-inline-svg-expected.html
>index d08c1823b0abdad553f72865f62e7f12f5b3e112..761803f437c0ecf66c8976991228eacbc09d4597 100644
>--- a/LayoutTests/css3/color-filters/svg/color-filter-inline-svg-expected.html
>+++ b/LayoutTests/css3/color-filters/svg/color-filter-inline-svg-expected.html
>@@ -1,7 +1,7 @@
> <!DOCTYPE html>
> <html>
>     <head>
>-        <title>CSS Test: color-filter reference</title>
>+        <title>CSS Test: -apple-color-filter reference</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
> 
>         <style>
>diff --git a/LayoutTests/css3/color-filters/svg/color-filter-inline-svg.html b/LayoutTests/css3/color-filters/svg/color-filter-inline-svg.html
>index 57ae6af7b2def67498cc316c4e5c79c8d5fc4bff..c91052daf2cb9f54271c0e77e0b66e6bb02feeb4 100644
>--- a/LayoutTests/css3/color-filters/svg/color-filter-inline-svg.html
>+++ b/LayoutTests/css3/color-filters/svg/color-filter-inline-svg.html
>@@ -1,14 +1,14 @@
>-<!DOCTYPE html>
>+<!DOCTYPE html>
> <html >
>     <head>
>-        <title>CSS Test: color-filter affects colors in inline SVG</title>
>+        <title>CSS Test: -apple-color-filter affects colors in inline SVG</title>
>         <link rel="author" title="Apple" href="http://www.apple.com/">
>-        <link rel="match" href="color-filter-inline-svg-expected.html">
>+        <link rel="match" href="-apple-color-filter-inline-svg-expected.html">
> 
>-        <meta name="assert" content="color-filter affects colors in inline SVG">
>+        <meta name="assert" content="-apple-color-filter affects colors in inline SVG">
>         <style>
>             html {
>-                color-filter: invert();
>+                -apple-color-filter: invert();
>             }
> 
>             body {

Flags:

simon.fraser: review+
simon.fraser: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 186306: 341967 | 341968 | 342039