<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192423] branches/safari-601.1.46-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192423">192423</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-11-13 09:03:29 -0800 (Fri, 13 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188647">r188647</a>. rdar://problem/23432373</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestsanimationsresourcesanimationtesthelpersjs">branches/safari-601.1.46-branch/LayoutTests/animations/resources/animation-test-helpers.js</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filtersbackdropeffecthwexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/backdrop/effect-hw-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectblurhwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-blur-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectblurhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-blur.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectbrightnessclampinghwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-clamping-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectbrightnessclampinghtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-clamping.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectbrightnesshwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectbrightnesshtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectcombinedhwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-combined-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectcombinedhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-combined.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectcontrasthwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-contrast-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectcontrasthtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-contrast.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectdropshadowhwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-drop-shadow-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectdropshadowhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-drop-shadow.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectgrayscalehwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-grayscale-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectgrayscalehtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-grayscale.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffecthuerotatehwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-hue-rotate-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffecthuerotatehtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-hue-rotate.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectinverthwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-invert-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectinverthtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-invert.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectopacityhwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-opacity-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectopacityhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-opacity.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectreferencecompositehwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-composite-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectreferencecompositehtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-composite.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectreferencehwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectreferenceorderinghwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-ordering-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectreferenceorderinghtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-ordering.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectreferencehtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectsaturatehwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-saturate-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectsaturatehtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-saturate.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectsepiahwhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-sepia-hw.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filterseffectsepiahtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-sepia.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filtersfilterpropertycomputedstyleexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-computed-style-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filtersfilterpropertyparsingexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-parsing-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filtersscripttestsfilterpropertycomputedstylejs">branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filtersscripttestsfilterpropertyparsingjs">branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-parsing.js</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimageclippedfilterexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/clipped-filter-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimageclippedfilterhtml">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/clipped-filter.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimagefilterimageanimationexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-animation-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimagefilterimageanimationhtml">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-animation.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimagefilterimageblurhtml">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-blur.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimagefilterimageexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimagefilterimagesvghtml">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-svg.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimagefilterimagehtml">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimageparsefilterimageexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/parse-filter-image-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastfilterimageparsefilterimagehtml">branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/parse-filter-image.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestssvgcssgetComputedStylebasicexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSComputedStyleDeclarationcpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSFilterImageValuecpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSParsercpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSPropertyNamesin">branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssSVGCSSComputedStyleDeclarationcpp">branches/safari-601.1.46-branch/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorepageanimationCSSPropertyAnimationcpp">branches/safari-601.1.46-branch/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorepageanimationKeyframeAnimationcpp">branches/safari-601.1.46-branch/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsGraphicsLayercpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsGraphicsLayerClienth">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsLayerClient.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicstexmapTextureMapperAnimationcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderLayercpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderLayerBackingcpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleSVGRenderStyleh">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyle.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleSVGRenderStyleDefscpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleSVGRenderStyleDefsh">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyleDefs.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleWillChangeDatacpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingsvgSVGRenderSupportcpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderSupport.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingsvgSVGRenderingContextcpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingsvgSVGResourcescpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResources.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingsvgSVGResourcesh">branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResources.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingsvgSVGResourcesCachecpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResourcesCache.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp">branches/safari-601.1.46-branch/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestscss3filtersscripttestsunprefixedjs">branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/unprefixed.js</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filtersunprefixedexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/css3/filters/unprefixed-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3filtersunprefixedhtml">branches/safari-601.1.46-branch/LayoutTests/css3/filters/unprefixed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1,5 +1,78 @@
</span><span class="cx"> 2015-11-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188647. rdar://problem/23432373
+
+ 2015-08-18 Dean Jackson <dino@apple.com>
+
+ Support CSS filters without webkit prefix
+ https://bugs.webkit.org/show_bug.cgi?id=148138
+ <rdar://problem/22331434>
+
+ Reviewed by Sam Weinig.
+
+ Globally change -webkit-filter to filter in as many places as
+ possible. Then add a new test that makes sure the prefixed
+ and unprefixed value resolve to the same computed style.
+
+ * animations/resources/animation-test-helpers.js:
+ (parseCSSImage):
+ * css3/filters/backdrop/effect-hw-expected.html:
+ * css3/filters/effect-blur-hw.html:
+ * css3/filters/effect-blur.html:
+ * css3/filters/effect-brightness-clamping-hw.html:
+ * css3/filters/effect-brightness-clamping.html:
+ * css3/filters/effect-brightness-hw.html:
+ * css3/filters/effect-brightness.html:
+ * css3/filters/effect-combined-hw.html:
+ * css3/filters/effect-combined.html:
+ * css3/filters/effect-contrast-hw.html:
+ * css3/filters/effect-contrast.html:
+ * css3/filters/effect-drop-shadow-hw.html:
+ * css3/filters/effect-drop-shadow.html:
+ * css3/filters/effect-grayscale-hw.html:
+ * css3/filters/effect-grayscale.html:
+ * css3/filters/effect-hue-rotate-hw.html:
+ * css3/filters/effect-hue-rotate.html:
+ * css3/filters/effect-invert-hw.html:
+ * css3/filters/effect-invert.html:
+ * css3/filters/effect-opacity-hw.html:
+ * css3/filters/effect-opacity.html:
+ * css3/filters/effect-reference-composite-hw.html:
+ * css3/filters/effect-reference-composite.html:
+ * css3/filters/effect-reference-hw.html:
+ * css3/filters/effect-reference-ordering-hw.html:
+ * css3/filters/effect-reference-ordering.html:
+ * css3/filters/effect-reference.html:
+ * css3/filters/effect-saturate-hw.html:
+ * css3/filters/effect-saturate.html:
+ * css3/filters/effect-sepia-hw.html:
+ * css3/filters/effect-sepia.html:
+ * css3/filters/filter-property-computed-style-expected.txt:
+ * css3/filters/filter-property-parsing-expected.txt:
+ * css3/filters/script-tests/filter-property-computed-style.js:
+ (testComputedFilterRule):
+ * css3/filters/script-tests/filter-property-parsing.js:
+ (testFilterRule):
+ * css3/filters/script-tests/unprefixed.js: Copied from LayoutTests/css3/filters/script-tests/filter-property-computed-style.js.
+ (testComputedFilterRule):
+ * css3/filters/unprefixed-expected.txt: Copied from LayoutTests/css3/filters/filter-property-computed-style-expected.txt.
+ * css3/filters/unprefixed.html: Added.
+ * fast/css/getComputedStyle/computed-style-expected.txt:
+ * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * fast/filter-image/clipped-filter-expected.html:
+ * fast/filter-image/clipped-filter.html:
+ * fast/filter-image/filter-image-animation-expected.txt:
+ * fast/filter-image/filter-image-animation.html:
+ * fast/filter-image/filter-image-blur.html:
+ * fast/filter-image/filter-image-expected.html:
+ * fast/filter-image/filter-image-svg.html:
+ * fast/filter-image/filter-image.html:
+ * fast/filter-image/parse-filter-image-expected.txt:
+ * fast/filter-image/parse-filter-image.html:
+ * svg/css/getComputedStyle-basic-expected.txt:
+
+2015-11-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188530. rdar://problem/23432371
</span><span class="cx">
</span><span class="cx"> 2015-08-17 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsanimationsresourcesanimationtesthelpersjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/animations/resources/animation-test-helpers.js (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/animations/resources/animation-test-helpers.js 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/animations/resources/animation-test-helpers.js 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> // Generator functions can have CSS images as values themself.
</span><span class="cx"> // These functions will call parseCSSImage for each CSS Image.
</span><span class="cx"> switch (functionName) {
</span><del>- case "-webkit-filter":
</del><ins>+ case "filter":
</ins><span class="cx"> return parseFilterImage(functionValue);
</span><span class="cx"> case "-webkit-cross-fade":
</span><span class="cx"> return parseCrossFade(functionValue);
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filtersbackdropeffecthwexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/backdrop/effect-hw-expected.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/backdrop/effect-hw-expected.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/backdrop/effect-hw-expected.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -30,21 +30,21 @@
</span><span class="cx"> </style>
</span><span class="cx"> <div>
</span><span class="cx"> <img src="../resources/reference.png">
</span><del>- <p style="-webkit-filter: invert()"></p>
</del><ins>+ <p style="filter: invert()"></p>
</ins><span class="cx"> </div>
</span><span class="cx"> <div>
</span><span class="cx"> <img src="../resources/reference.png">
</span><del>- <p style="-webkit-filter: contrast(20%)"></p>
</del><ins>+ <p style="filter: contrast(20%)"></p>
</ins><span class="cx"> </div>
</span><span class="cx"> <div>
</span><span class="cx"> <img src="../resources/reference.png">
</span><del>- <p style="-webkit-filter: grayscale()"></p>
</del><ins>+ <p style="filter: grayscale()"></p>
</ins><span class="cx"> </div>
</span><span class="cx"> <div>
</span><span class="cx"> <img src="../resources/reference.png">
</span><del>- <p style="-webkit-filter: sepia()"></p>
</del><ins>+ <p style="filter: sepia()"></p>
</ins><span class="cx"> </div>
</span><span class="cx"> <div>
</span><span class="cx"> <img src="../resources/reference.png">
</span><del>- <p style="-webkit-filter: sepia() hue-rotate(90deg)"></p>
</del><ins>+ <p style="filter: sepia() hue-rotate(90deg)"></p>
</ins><span class="cx"> </div>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectblurhwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-blur-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-blur-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-blur-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: blur(0)" src="resources/reference.png">
-<img style="-webkit-filter: blur(2px)" src="resources/reference.png">
-<img style="-webkit-filter: blur(3px 3px)" src="resources/reference.png">
-<img style="-webkit-filter: blur(10px)" src="resources/reference.png">
</del><ins>+<img style="filter: blur(0)" src="resources/reference.png">
+<img style="filter: blur(2px)" src="resources/reference.png">
+<img style="filter: blur(3px 3px)" src="resources/reference.png">
+<img style="filter: blur(10px)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectblurhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-blur.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-blur.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-blur.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> margin: 10px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: blur(0)" src="resources/reference.png">
-<img style="-webkit-filter: blur(2px)" src="resources/reference.png">
-<img style="-webkit-filter: blur(3px)" src="resources/reference.png">
-<img style="-webkit-filter: blur(10px)" src="resources/reference.png">
</del><ins>+<img style="filter: blur(0)" src="resources/reference.png">
+<img style="filter: blur(2px)" src="resources/reference.png">
+<img style="filter: blur(3px)" src="resources/reference.png">
+<img style="filter: blur(10px)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectbrightnessclampinghwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-clamping-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-clamping-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-clamping-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,15 +3,15 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: brightness(1) brightness(2)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.2) brightness(1.8)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.5) brightness(1.5)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.8) brightness(1.2)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1.2) brightness(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1.5) brightness(0.5)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1.8) brightness(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1) brightness(1)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.8) grayscale(1)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.5) blur(3px)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1) blur(3px)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.5) drop-shadow(5px 5px 5px red)" src="resources/reference.png">
</del><ins>+<img style="filter: brightness(1) brightness(2)" src="resources/reference.png">
+<img style="filter: brightness(0.2) brightness(1.8)" src="resources/reference.png">
+<img style="filter: brightness(0.5) brightness(1.5)" src="resources/reference.png">
+<img style="filter: brightness(0.8) brightness(1.2)" src="resources/reference.png">
+<img style="filter: brightness(1.2) brightness(0.8)" src="resources/reference.png">
+<img style="filter: brightness(1.5) brightness(0.5)" src="resources/reference.png">
+<img style="filter: brightness(1.8) brightness(0.2)" src="resources/reference.png">
+<img style="filter: brightness(1) brightness(1)" src="resources/reference.png">
+<img style="filter: brightness(0.8) grayscale(1)" src="resources/reference.png">
+<img style="filter: brightness(0.5) blur(3px)" src="resources/reference.png">
+<img style="filter: brightness(1) blur(3px)" src="resources/reference.png">
+<img style="filter: brightness(0.5) drop-shadow(5px 5px 5px red)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectbrightnessclampinghtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-clamping.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-clamping.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-clamping.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,15 +4,15 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: brightness(-1) brightness(1)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(-0.8) brightness(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(-0.5) brightness(0.5)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(-0.2) brightness(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.2) brightness(-0.2)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.5) brightness(-0.5)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.8) brightness(-0.8)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1) brightness(-1)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.8) grayscale(1)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.5) blur(3px)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1) blur(3px)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.5) drop-shadow(5px 5px 5px red)" src="resources/reference.png">
</del><ins>+<img style="filter: brightness(-1) brightness(1)" src="resources/reference.png">
+<img style="filter: brightness(-0.8) brightness(0.8)" src="resources/reference.png">
+<img style="filter: brightness(-0.5) brightness(0.5)" src="resources/reference.png">
+<img style="filter: brightness(-0.2) brightness(0.2)" src="resources/reference.png">
+<img style="filter: brightness(0.2) brightness(-0.2)" src="resources/reference.png">
+<img style="filter: brightness(0.5) brightness(-0.5)" src="resources/reference.png">
+<img style="filter: brightness(0.8) brightness(-0.8)" src="resources/reference.png">
+<img style="filter: brightness(1) brightness(-1)" src="resources/reference.png">
+<img style="filter: brightness(0.8) grayscale(1)" src="resources/reference.png">
+<img style="filter: brightness(0.5) blur(3px)" src="resources/reference.png">
+<img style="filter: brightness(1) blur(3px)" src="resources/reference.png">
+<img style="filter: brightness(0.5) drop-shadow(5px 5px 5px red)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectbrightnesshwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,10 +3,10 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: brightness(0)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.7)" src="resources/reference.png">
-<img style="-webkit-filter: brightness()" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1.3)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1.6)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(2)" src="resources/reference.png">
</del><ins>+<img style="filter: brightness(0)" src="resources/reference.png">
+<img style="filter: brightness(0.4)" src="resources/reference.png">
+<img style="filter: brightness(0.7)" src="resources/reference.png">
+<img style="filter: brightness()" src="resources/reference.png">
+<img style="filter: brightness(1.3)" src="resources/reference.png">
+<img style="filter: brightness(1.6)" src="resources/reference.png">
+<img style="filter: brightness(2)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectbrightnesshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-brightness.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: brightness(-1)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(-0.6)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(-0.3)" src="resources/reference.png">
-<img style="-webkit-filter: brightness()" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.3)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: brightness(1)" src="resources/reference.png">
</del><ins>+<img style="filter: brightness(-1)" src="resources/reference.png">
+<img style="filter: brightness(-0.6)" src="resources/reference.png">
+<img style="filter: brightness(-0.3)" src="resources/reference.png">
+<img style="filter: brightness()" src="resources/reference.png">
+<img style="filter: brightness(0.3)" src="resources/reference.png">
+<img style="filter: brightness(0.6)" src="resources/reference.png">
+<img style="filter: brightness(1)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectcombinedhwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-combined-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-combined-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-combined-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: sepia() saturate(3) hue-rotate(180deg)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(3) hue-rotate(90deg)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale() blur(3px)" src="resources/reference.png">
-<img style="-webkit-filter: blur(3px) hue-rotate(-90deg) sepia()" src="resources/reference.png">
-<img style="-webkit-filter: blur(3px) opacity(0.5) hue-rotate(-90deg) sepia()" src="resources/reference.png">
-<img style="-webkit-filter: blur(3px) brightness(1.2) contrast(2)" src="resources/reference.png">
</del><ins>+<img style="filter: sepia() saturate(3) hue-rotate(180deg)" src="resources/reference.png">
+<img style="filter: saturate(3) hue-rotate(90deg)" src="resources/reference.png">
+<img style="filter: grayscale() blur(3px)" src="resources/reference.png">
+<img style="filter: blur(3px) hue-rotate(-90deg) sepia()" src="resources/reference.png">
+<img style="filter: blur(3px) opacity(0.5) hue-rotate(-90deg) sepia()" src="resources/reference.png">
+<img style="filter: blur(3px) brightness(1.2) contrast(2)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectcombinedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-combined.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-combined.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-combined.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -9,9 +9,9 @@
</span><span class="cx"> margin: 10px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: sepia() saturate(3) hue-rotate(180deg)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(3) hue-rotate(90deg)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale() blur(3px)" src="resources/reference.png">
-<img style="-webkit-filter: blur(3px) hue-rotate(-90deg) sepia()" src="resources/reference.png">
-<img style="-webkit-filter: blur(3px) opacity(0.5) hue-rotate(-90deg) sepia()" src="resources/reference.png">
-<img style="-webkit-filter: blur(3px) brightness(1.2) contrast(2)" src="resources/reference.png">
</del><ins>+<img style="filter: sepia() saturate(3) hue-rotate(180deg)" src="resources/reference.png">
+<img style="filter: saturate(3) hue-rotate(90deg)" src="resources/reference.png">
+<img style="filter: grayscale() blur(3px)" src="resources/reference.png">
+<img style="filter: blur(3px) hue-rotate(-90deg) sepia()" src="resources/reference.png">
+<img style="filter: blur(3px) opacity(0.5) hue-rotate(-90deg) sepia()" src="resources/reference.png">
+<img style="filter: blur(3px) brightness(1.2) contrast(2)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectcontrasthwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-contrast-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-contrast-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-contrast-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: contrast(0)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(0.5)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(1.0)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(2)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(5)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(10)" src="resources/reference.png">
</del><ins>+<img style="filter: contrast(0)" src="resources/reference.png">
+<img style="filter: contrast(0.5)" src="resources/reference.png">
+<img style="filter: contrast(1.0)" src="resources/reference.png">
+<img style="filter: contrast(2)" src="resources/reference.png">
+<img style="filter: contrast(5)" src="resources/reference.png">
+<img style="filter: contrast(10)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectcontrasthtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-contrast.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-contrast.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-contrast.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: contrast(0)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(0.5)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(1.0)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(2)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(5)" src="resources/reference.png">
-<img style="-webkit-filter: contrast(10)" src="resources/reference.png">
</del><ins>+<img style="filter: contrast(0)" src="resources/reference.png">
+<img style="filter: contrast(0.5)" src="resources/reference.png">
+<img style="filter: contrast(1.0)" src="resources/reference.png">
+<img style="filter: contrast(2)" src="resources/reference.png">
+<img style="filter: contrast(5)" src="resources/reference.png">
+<img style="filter: contrast(10)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectdropshadowhwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-drop-shadow-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-drop-shadow-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-drop-shadow-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: drop-shadow(0 0 0 black)" src="resources/reference.png">
-<img style="-webkit-filter: drop-shadow(5px 5px 2px black)" src="resources/reference.png">
-<img style="-webkit-filter: drop-shadow(5px 5px 0px red)" src="resources/reference.png">
-<img style="-webkit-filter: drop-shadow(10px 10px 0px red)" src="resources/reference.png">
-<img style="-webkit-filter: drop-shadow(5px 5px 10px blue)" src="resources/reference.png">
</del><ins>+<img style="filter: drop-shadow(0 0 0 black)" src="resources/reference.png">
+<img style="filter: drop-shadow(5px 5px 2px black)" src="resources/reference.png">
+<img style="filter: drop-shadow(5px 5px 0px red)" src="resources/reference.png">
+<img style="filter: drop-shadow(10px 10px 0px red)" src="resources/reference.png">
+<img style="filter: drop-shadow(5px 5px 10px blue)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectdropshadowhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-drop-shadow.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-drop-shadow.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-drop-shadow.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> margin: 15px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: drop-shadow(0 0 0 black)" src="resources/reference.png">
-<img style="-webkit-filter: drop-shadow(5px 5px 2px black)" src="resources/reference.png">
-<img style="-webkit-filter: drop-shadow(5px 5px 0px red)" src="resources/reference.png">
-<img style="-webkit-filter: drop-shadow(10px 10px 0px red)" src="resources/reference.png">
-<img style="-webkit-filter: drop-shadow(5px 5px 10px blue)" src="resources/reference.png">
</del><ins>+<img style="filter: drop-shadow(0 0 0 black)" src="resources/reference.png">
+<img style="filter: drop-shadow(5px 5px 2px black)" src="resources/reference.png">
+<img style="filter: drop-shadow(5px 5px 0px red)" src="resources/reference.png">
+<img style="filter: drop-shadow(10px 10px 0px red)" src="resources/reference.png">
+<img style="filter: drop-shadow(5px 5px 10px blue)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectgrayscalehwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-grayscale-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-grayscale-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-grayscale-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: grayscale(0)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(1.0)" src="resources/reference.png">
</del><ins>+<img style="filter: grayscale(0)" src="resources/reference.png">
+<img style="filter: grayscale(0.2)" src="resources/reference.png">
+<img style="filter: grayscale(0.4)" src="resources/reference.png">
+<img style="filter: grayscale(0.6)" src="resources/reference.png">
+<img style="filter: grayscale(0.8)" src="resources/reference.png">
+<img style="filter: grayscale(1.0)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectgrayscalehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-grayscale.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-grayscale.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-grayscale.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: grayscale(0)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: grayscale(1.0)" src="resources/reference.png">
</del><ins>+<img style="filter: grayscale(0)" src="resources/reference.png">
+<img style="filter: grayscale(0.2)" src="resources/reference.png">
+<img style="filter: grayscale(0.4)" src="resources/reference.png">
+<img style="filter: grayscale(0.6)" src="resources/reference.png">
+<img style="filter: grayscale(0.8)" src="resources/reference.png">
+<img style="filter: grayscale(1.0)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffecthuerotatehwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-hue-rotate-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-hue-rotate-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-hue-rotate-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: hue-rotate(0deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(45deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(90deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(180deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(270deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(360deg)" src="resources/reference.png">
</del><ins>+<img style="filter: hue-rotate(0deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(45deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(90deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(180deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(270deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(360deg)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffecthuerotatehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-hue-rotate.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-hue-rotate.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-hue-rotate.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: hue-rotate(0deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(45deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(90deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(180deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(270deg)" src="resources/reference.png">
-<img style="-webkit-filter: hue-rotate(360deg)" src="resources/reference.png">
</del><ins>+<img style="filter: hue-rotate(0deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(45deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(90deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(180deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(270deg)" src="resources/reference.png">
+<img style="filter: hue-rotate(360deg)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectinverthwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-invert-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-invert-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-invert-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: invert(0)" src="resources/reference.png">
-<img style="-webkit-filter: invert(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: invert(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: invert(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: invert(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: invert(1.0)" src="resources/reference.png">
</del><ins>+<img style="filter: invert(0)" src="resources/reference.png">
+<img style="filter: invert(0.2)" src="resources/reference.png">
+<img style="filter: invert(0.4)" src="resources/reference.png">
+<img style="filter: invert(0.6)" src="resources/reference.png">
+<img style="filter: invert(0.8)" src="resources/reference.png">
+<img style="filter: invert(1.0)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectinverthtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-invert.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-invert.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-invert.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: invert(0)" src="resources/reference.png">
-<img style="-webkit-filter: invert(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: invert(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: invert(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: invert(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: invert(1.0)" src="resources/reference.png">
</del><ins>+<img style="filter: invert(0)" src="resources/reference.png">
+<img style="filter: invert(0.2)" src="resources/reference.png">
+<img style="filter: invert(0.4)" src="resources/reference.png">
+<img style="filter: invert(0.6)" src="resources/reference.png">
+<img style="filter: invert(0.8)" src="resources/reference.png">
+<img style="filter: invert(1.0)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectopacityhwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-opacity-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-opacity-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-opacity-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: opacity(0)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(1.0)" src="resources/reference.png">
</del><ins>+<img style="filter: opacity(0)" src="resources/reference.png">
+<img style="filter: opacity(0.2)" src="resources/reference.png">
+<img style="filter: opacity(0.4)" src="resources/reference.png">
+<img style="filter: opacity(0.6)" src="resources/reference.png">
+<img style="filter: opacity(0.8)" src="resources/reference.png">
+<img style="filter: opacity(1.0)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectopacityhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-opacity.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-opacity.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-opacity.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: opacity(0)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: opacity(1.0)" src="resources/reference.png">
</del><ins>+<img style="filter: opacity(0)" src="resources/reference.png">
+<img style="filter: opacity(0.2)" src="resources/reference.png">
+<img style="filter: opacity(0.4)" src="resources/reference.png">
+<img style="filter: opacity(0.6)" src="resources/reference.png">
+<img style="filter: opacity(0.8)" src="resources/reference.png">
+<img style="filter: opacity(1.0)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectreferencecompositehwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-composite-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-composite-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-composite-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> margin: 10px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: url(#over); filter: url(#over); -webkit-transform: translateZ(0);" src="resources/reference.png">
-<img style="-webkit-filter: url(#in); filter: url(#in); -webkit-transform: translateZ(0);" src="resources/reference.png">
-<img style="-webkit-filter: url(#out); filter: url(#out); -webkit-transform: translateZ(0);" src="resources/reference.png">
-<img style="-webkit-filter: url(#atop); filter: url(#atop); -webkit-transform: translateZ(0);" src="resources/reference.png">
-<img style="-webkit-filter: url(#xor); filter: url(#xor); -webkit-transform: translateZ(0);" src="resources/reference.png">
</del><ins>+<img style="filter: url(#over); filter: url(#over); -webkit-transform: translateZ(0);" src="resources/reference.png">
+<img style="filter: url(#in); filter: url(#in); -webkit-transform: translateZ(0);" src="resources/reference.png">
+<img style="filter: url(#out); filter: url(#out); -webkit-transform: translateZ(0);" src="resources/reference.png">
+<img style="filter: url(#atop); filter: url(#atop); -webkit-transform: translateZ(0);" src="resources/reference.png">
+<img style="filter: url(#xor); filter: url(#xor); -webkit-transform: translateZ(0);" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectreferencecompositehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-composite.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-composite.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-composite.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> margin: 10px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: url(#over); filter: url(#over);" src="resources/reference.png">
-<img style="-webkit-filter: url(#in); filter: url(#in);" src="resources/reference.png">
-<img style="-webkit-filter: url(#out); filter: url(#out);" src="resources/reference.png">
-<img style="-webkit-filter: url(#atop); filter: url(#atop);" src="resources/reference.png">
-<img style="-webkit-filter: url(#xor); filter: url(#xor);" src="resources/reference.png">
</del><ins>+<img style="filter: url(#over); filter: url(#over);" src="resources/reference.png">
+<img style="filter: url(#in); filter: url(#in);" src="resources/reference.png">
+<img style="filter: url(#out); filter: url(#out);" src="resources/reference.png">
+<img style="filter: url(#atop); filter: url(#atop);" src="resources/reference.png">
+<img style="filter: url(#xor); filter: url(#xor);" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectreferencehwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <img src="resources/reference.png">
</span><del>-<img style="-webkit-filter: url(#colormatrix); filter: url(#colormatrix);" src="resources/reference.png">
-<img style="-webkit-filter: url(#morphology); filter: url(#morphology);" src="resources/reference.png">
-<img style="-webkit-filter: url(#componenttransfer); filter: url(#componenttransfer);" src="resources/reference.png">
-<img style="-webkit-filter: url(#blurY); filter: url(#blurY);" src="resources/reference.png">
-<img style="-webkit-filter: url(#blend); filter: url(#blend);" src="resources/reference.png">
-<img style="-webkit-filter: url(#lighting); filter: url(#lighting);" src="resources/reference.png">
-<img style="-webkit-filter: url(#offset); filter: url(#offset);" src="resources/reference.png">
-<img style="-webkit-filter: url(#convolvematrix); filter: url(#convolvematrix);" src="resources/reference.png">
-<img style="-webkit-filter: url(#displacement); filter: url(#displacement);" src="resources/reference.png">
</del><ins>+<img style="filter: url(#colormatrix); filter: url(#colormatrix);" src="resources/reference.png">
+<img style="filter: url(#morphology); filter: url(#morphology);" src="resources/reference.png">
+<img style="filter: url(#componenttransfer); filter: url(#componenttransfer);" src="resources/reference.png">
+<img style="filter: url(#blurY); filter: url(#blurY);" src="resources/reference.png">
+<img style="filter: url(#blend); filter: url(#blend);" src="resources/reference.png">
+<img style="filter: url(#lighting); filter: url(#lighting);" src="resources/reference.png">
+<img style="filter: url(#offset); filter: url(#offset);" src="resources/reference.png">
+<img style="filter: url(#convolvematrix); filter: url(#convolvematrix);" src="resources/reference.png">
+<img style="filter: url(#displacement); filter: url(#displacement);" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectreferenceorderinghwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-ordering-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-ordering-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-ordering-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> -webkit-transform: translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: url(#blurY);" src="resources/reference.png">
-<img style="-webkit-filter: contrast(500%) url(#blurY);" src="resources/reference.png">
-<img style="-webkit-filter: url(#blurY) contrast(500%);" src="resources/reference.png">
-<img style="-webkit-filter: url(#blurX) contrast(500%); url(#blurY);" src="resources/reference.png">
</del><ins>+<img style="filter: url(#blurY);" src="resources/reference.png">
+<img style="filter: contrast(500%) url(#blurY);" src="resources/reference.png">
+<img style="filter: url(#blurY) contrast(500%);" src="resources/reference.png">
+<img style="filter: url(#blurX) contrast(500%); url(#blurY);" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectreferenceorderinghtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-ordering.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-ordering.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference-ordering.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> margin: 10px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: url(#blurY);" src="resources/reference.png">
-<img style="-webkit-filter: contrast(500%) url(#blurY);" src="resources/reference.png">
-<img style="-webkit-filter: url(#blurY) contrast(500%);" src="resources/reference.png">
-<img style="-webkit-filter: url(#blurX) contrast(500%); url(#blurY);" src="resources/reference.png">
</del><ins>+<img style="filter: url(#blurY);" src="resources/reference.png">
+<img style="filter: contrast(500%) url(#blurY);" src="resources/reference.png">
+<img style="filter: url(#blurY) contrast(500%);" src="resources/reference.png">
+<img style="filter: url(#blurX) contrast(500%); url(#blurY);" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectreferencehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-reference.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -45,12 +45,12 @@
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <img src="resources/reference.png">
</span><del>-<img style="-webkit-filter: url(#colormatrix); filter: url(#colormatrix);" src="resources/reference.png">
-<img style="-webkit-filter: url(#morphology); filter: url(#morphology);" src="resources/reference.png">
-<img style="-webkit-filter: url(#componenttransfer); filter: url(#componenttransfer);" src="resources/reference.png">
-<img style="-webkit-filter: url(#blurY); filter: url(#blurY);" src="resources/reference.png">
-<img style="-webkit-filter: url(#blend); filter: url(#blend);" src="resources/reference.png">
-<img style="-webkit-filter: url(#lighting); filter: url(#lighting);" src="resources/reference.png">
-<img style="-webkit-filter: url(#offset); filter: url(#offset);" src="resources/reference.png">
-<img style="-webkit-filter: url(#convolvematrix); filter: url(#convolvematrix);" src="resources/reference.png">
-<img style="-webkit-filter: url(#displacement); filter: url(#displacement);" src="resources/reference.png">
</del><ins>+<img style="filter: url(#colormatrix); filter: url(#colormatrix);" src="resources/reference.png">
+<img style="filter: url(#morphology); filter: url(#morphology);" src="resources/reference.png">
+<img style="filter: url(#componenttransfer); filter: url(#componenttransfer);" src="resources/reference.png">
+<img style="filter: url(#blurY); filter: url(#blurY);" src="resources/reference.png">
+<img style="filter: url(#blend); filter: url(#blend);" src="resources/reference.png">
+<img style="filter: url(#lighting); filter: url(#lighting);" src="resources/reference.png">
+<img style="filter: url(#offset); filter: url(#offset);" src="resources/reference.png">
+<img style="filter: url(#convolvematrix); filter: url(#convolvematrix);" src="resources/reference.png">
+<img style="filter: url(#displacement); filter: url(#displacement);" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectsaturatehwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-saturate-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-saturate-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-saturate-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: saturate(0)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(0.5)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(1.0)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(2)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(5)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(10)" src="resources/reference.png">
</del><ins>+<img style="filter: saturate(0)" src="resources/reference.png">
+<img style="filter: saturate(0.5)" src="resources/reference.png">
+<img style="filter: saturate(1.0)" src="resources/reference.png">
+<img style="filter: saturate(2)" src="resources/reference.png">
+<img style="filter: saturate(5)" src="resources/reference.png">
+<img style="filter: saturate(10)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectsaturatehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-saturate.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-saturate.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-saturate.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: saturate(0)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(0.5)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(1.0)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(2)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(5)" src="resources/reference.png">
-<img style="-webkit-filter: saturate(10)" src="resources/reference.png">
</del><ins>+<img style="filter: saturate(0)" src="resources/reference.png">
+<img style="filter: saturate(0.5)" src="resources/reference.png">
+<img style="filter: saturate(1.0)" src="resources/reference.png">
+<img style="filter: saturate(2)" src="resources/reference.png">
+<img style="filter: saturate(5)" src="resources/reference.png">
+<img style="filter: saturate(10)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectsepiahwhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-sepia-hw.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-sepia-hw.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-sepia-hw.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> -webkit-transform:translateZ(0);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>-<img style="-webkit-filter: sepia(0)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(1.0)" src="resources/reference.png">
</del><ins>+<img style="filter: sepia(0)" src="resources/reference.png">
+<img style="filter: sepia(0.2)" src="resources/reference.png">
+<img style="filter: sepia(0.4)" src="resources/reference.png">
+<img style="filter: sepia(0.6)" src="resources/reference.png">
+<img style="filter: sepia(0.8)" src="resources/reference.png">
+<img style="filter: sepia(1.0)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filterseffectsepiahtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-sepia.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-sepia.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/effect-sepia.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<img style="-webkit-filter: sepia(0)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(0.2)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(0.4)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(0.6)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(0.8)" src="resources/reference.png">
-<img style="-webkit-filter: sepia(1.0)" src="resources/reference.png">
</del><ins>+<img style="filter: sepia(0)" src="resources/reference.png">
+<img style="filter: sepia(0.2)" src="resources/reference.png">
+<img style="filter: sepia(0.4)" src="resources/reference.png">
+<img style="filter: sepia(0.6)" src="resources/reference.png">
+<img style="filter: sepia(0.8)" src="resources/reference.png">
+<img style="filter: sepia(1.0)" src="resources/reference.png">
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filtersfilterpropertycomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-computed-style-expected.txt (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-computed-style-expected.txt 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-computed-style-expected.txt 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-Test the computed style of the -webkit-filter property.
</del><ins>+Test the computed style of the filter property.
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filtersfilterpropertyparsingexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-parsing-expected.txt (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-parsing-expected.txt 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-parsing-expected.txt 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-Test the parsing of the -webkit-filter property.
</del><ins>+Test the parsing of the filter property.
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> Basic reference : url('#a')
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'url(#a)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'url(#a)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> Bare unquoted reference converting to quoted form : url(#a)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'url(#a)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'url(#a)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> Multiple references : url('#a') url('#b')
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'url(#a) url(#b)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'url(#a) url(#b)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> Reference as 2nd value : grayscale(1) url('#a')
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(1) url(#a)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(1) url(#a)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> Integer value : grayscale(1)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> Percentage value : grayscale(50%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(50%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(50%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> Float value converts to integer : grayscale(1.0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> Zero value : grayscale(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(0)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(0)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> No values : grayscale()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> Multiple values : grayscale(0.5) grayscale(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(0.5) grayscale(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(0.5) grayscale(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> Integer value : sepia(1)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'sepia(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'sepia(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> Percentage value : sepia(50%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'sepia(50%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'sepia(50%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> Float value converts to integer : sepia(1.0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'sepia(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'sepia(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> Zero value : sepia(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'sepia(0)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'sepia(0)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> No values : sepia()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'sepia()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'sepia()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> Multiple values : sepia(0.5) sepia(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'sepia(0.5) sepia(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'sepia(0.5) sepia(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> Rule combinations : sepia(0.5) grayscale(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'sepia(0.5) grayscale(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'sepia(0.5) grayscale(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> Integer value : saturate(1)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> Percentage value : saturate(50%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate(50%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate(50%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> Percentage value > 1 : saturate(250%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate(250%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate(250%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> Float value converts to integer : saturate(1.0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> Input value > 1 : saturate(5.5)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate(5.5)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate(5.5)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> Zero value : saturate(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate(0)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate(0)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> No values : saturate()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> Multiple values : saturate(0.5) saturate(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate(0.5) saturate(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate(0.5) saturate(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> Rule combinations : saturate(0.5) grayscale(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'saturate(0.5) grayscale(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'saturate(0.5) grayscale(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> Degrees value as integer : hue-rotate(10deg)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'hue-rotate(10deg)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'hue-rotate(10deg)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> Degrees float value converts to integer : hue-rotate(10.0deg)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'hue-rotate(10deg)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'hue-rotate(10deg)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> Radians value : hue-rotate(10rad)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'hue-rotate(10rad)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'hue-rotate(10rad)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> Gradians value : hue-rotate(10grad)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'hue-rotate(10grad)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'hue-rotate(10grad)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> Turns value : hue-rotate(0.5turn)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'hue-rotate(0.5turn)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'hue-rotate(0.5turn)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> Zero value : hue-rotate(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'hue-rotate(0deg)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'hue-rotate(0deg)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> No values : hue-rotate()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'hue-rotate()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'hue-rotate()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> Rule combinations : hue-rotate(10deg) grayscale(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'hue-rotate(10deg) grayscale(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'hue-rotate(10deg) grayscale(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx"> Integer value : invert(1)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'invert(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'invert(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> Percentage value : invert(50%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'invert(50%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'invert(50%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> Float value converts to integer : invert(1.0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'invert(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'invert(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> Zero value : invert(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'invert(0)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'invert(0)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> No values : invert()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'invert()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'invert()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> Multiple values : invert(0.5) invert(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'invert(0.5) invert(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'invert(0.5) invert(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> Rule combinations : invert(0.5) grayscale(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'invert(0.5) grayscale(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'invert(0.5) grayscale(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> Integer value : opacity(1)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'opacity(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'opacity(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> Percentage value : opacity(50%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'opacity(50%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'opacity(50%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> Float value converts to integer : opacity(1.0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'opacity(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'opacity(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> Zero value : opacity(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'opacity(0)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'opacity(0)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> No values : opacity()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'opacity()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'opacity()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx"> Multiple values : opacity(0.5) opacity(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'opacity(0.5) opacity(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'opacity(0.5) opacity(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> Rule combinations : opacity(0.5) grayscale(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'opacity(0.5) grayscale(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'opacity(0.5) grayscale(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -559,7 +559,7 @@
</span><span class="cx"> Integer value : brightness(1)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx"> Percentage value : brightness(50%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness(50%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness(50%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx"> Float value converts to integer : brightness(1.0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> Zero value : brightness(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness(0)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness(0)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx"> No values : brightness()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> Multiple values : brightness(0.5) brightness(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness(0.5) brightness(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness(0.5) brightness(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -627,7 +627,7 @@
</span><span class="cx"> Rule combinations : brightness(0.5) grayscale(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness(0.5) grayscale(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness(0.5) grayscale(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> Parameter less than -100% : brightness(-1.1)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness(-1.1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness(-1.1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> Parameter more than 100% : brightness(101%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'brightness(101%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'brightness(101%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx"> Rule combinations : grayscale(0.25) brightness(0.5)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(0.25) brightness(0.5)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(0.25) brightness(0.5)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx"> Integer value : contrast(1)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> Percentage value : contrast(50%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast(50%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast(50%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> Percentage value > 1 : contrast(250%)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast(250%)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast(250%)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx"> Float value converts to integer : contrast(1.0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast(1)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast(1)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -719,7 +719,7 @@
</span><span class="cx"> Zero value : contrast(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast(0)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast(0)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -730,7 +730,7 @@
</span><span class="cx"> No values : contrast()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx"> Value greater than one : contrast(2)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast(2)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast(2)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -752,7 +752,7 @@
</span><span class="cx"> Multiple values : contrast(0.5) contrast(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast(0.5) contrast(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast(0.5) contrast(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -765,7 +765,7 @@
</span><span class="cx"> Rule combinations : contrast(0.5) grayscale(0.25)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'contrast(0.5) grayscale(0.25)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'contrast(0.5) grayscale(0.25)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx"> Rule combinations : grayscale(0.25) contrast(0.5)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(0.25) contrast(0.5)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(0.25) contrast(0.5)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -791,7 +791,7 @@
</span><span class="cx"> One zero to px : blur(0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'blur(0px)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'blur(0px)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -802,7 +802,7 @@
</span><span class="cx"> One length : blur(10px)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'blur(10px)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'blur(10px)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -813,7 +813,7 @@
</span><span class="cx"> No values : blur()
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'blur()'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'blur()'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -824,7 +824,7 @@
</span><span class="cx"> Color then three values : drop-shadow(red 1px 2px 3px)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'drop-shadow(red 1px 2px 3px)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'drop-shadow(red 1px 2px 3px)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -835,7 +835,7 @@
</span><span class="cx"> Three values then color : drop-shadow(1px 2px 3px red)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'drop-shadow(red 1px 2px 3px)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'drop-shadow(red 1px 2px 3px)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -846,7 +846,7 @@
</span><span class="cx"> Color then three values with zero length : drop-shadow(#abc 0 0 0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'drop-shadow(rgb(170, 187, 204) 0px 0px 0px)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'drop-shadow(rgb(170, 187, 204) 0px 0px 0px)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -857,7 +857,7 @@
</span><span class="cx"> Three values with zero length : drop-shadow(0 0 0)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'drop-shadow(0px 0px 0px)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'drop-shadow(0px 0px 0px)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -868,7 +868,7 @@
</span><span class="cx"> Two values no color : drop-shadow(1px 2px)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'drop-shadow(1px 2px)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'drop-shadow(1px 2px)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx"> Multiple operations : grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px)'
</del><ins>+PASS declaration.getPropertyValue('filter') is 'grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filtersscripttestsfilterpropertycomputedstylejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-description("Test the computed style of the -webkit-filter property.");
</del><ins>+description("Test the computed style of the filter property.");
</ins><span class="cx">
</span><span class="cx"> // These have to be global for the test helpers to see them.
</span><span class="cx"> var stylesheet, filterStyle, subRule;
</span><span class="lines">@@ -11,9 +11,9 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug(description + " : " + rule);
</span><span class="cx">
</span><del>- stylesheet.insertRule("body { -webkit-filter: " + rule + "; }", 0);
</del><ins>+ stylesheet.insertRule("body { filter: " + rule + "; }", 0);
</ins><span class="cx">
</span><del>- filterStyle = window.getComputedStyle(document.body).getPropertyCSSValue('-webkit-filter');
</del><ins>+ filterStyle = window.getComputedStyle(document.body).getPropertyCSSValue("filter");
</ins><span class="cx"> shouldBe("filterStyle.length", "" + expectedLength);
</span><span class="cx"> for (var i = 0; i < expectedLength; i++) {
</span><span class="cx"> subRule = filterStyle[i];
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filtersscripttestsfilterpropertyparsingjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-parsing.js (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-parsing.js 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-parsing.js 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-description("Test the parsing of the -webkit-filter property.");
</del><ins>+description("Test the parsing of the filter property.");
</ins><span class="cx">
</span><span class="cx"> function jsWrapperClass(node)
</span><span class="cx"> {
</span><span class="lines">@@ -30,16 +30,16 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug(description + " : " + rule);
</span><span class="cx">
</span><del>- stylesheet.insertRule("body { -webkit-filter: " + rule + "; }", 0);
</del><ins>+ stylesheet.insertRule("body { filter: " + rule + "; }", 0);
</ins><span class="cx"> cssRule = stylesheet.cssRules.item(0);
</span><span class="cx">
</span><span class="cx"> shouldBe("cssRule.type", "1");
</span><span class="cx">
</span><span class="cx"> declaration = cssRule.style;
</span><span class="cx"> shouldBe("declaration.length", "1");
</span><del>- shouldBe("declaration.getPropertyValue('-webkit-filter')", "'" + expectedValue + "'");
</del><ins>+ shouldBe("declaration.getPropertyValue('filter')", "'" + expectedValue + "'");
</ins><span class="cx">
</span><del>- filterRule = declaration.getPropertyCSSValue('-webkit-filter');
</del><ins>+ filterRule = declaration.getPropertyCSSValue("filter");
</ins><span class="cx"> shouldBeType("filterRule", "CSSValueList");
</span><span class="cx">
</span><span class="cx"> shouldBe("filterRule.length", "" + expectedLength); // shouldBe expects string arguments
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filtersscripttestsunprefixedjsfromrev192422branchessafari601146branchLayoutTestscss3filtersscripttestsfilterpropertycomputedstylejs"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/unprefixed.js (from rev 192422, branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js) (0 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/unprefixed.js (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/script-tests/unprefixed.js 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -0,0 +1,383 @@
</span><ins>+description("Test that -webkit-filter matches filter.");
+
+// These have to be global for the test helpers to see them.
+var stylesheet, filterStyle, subRule;
+var styleElement = document.createElement("style");
+document.head.appendChild(styleElement);
+stylesheet = styleElement.sheet;
+
+function testComputedFilterRule(description, rule, expectedLength, expectedTypes, expectedTexts)
+{
+ debug("");
+ debug(description + " : " + rule);
+
+ stylesheet.insertRule("body { -webkit-filter: " + rule + "; }", 0);
+
+ filterStyle = window.getComputedStyle(document.body).getPropertyCSSValue("filter");
+ shouldBe("filterStyle.length", "" + expectedLength);
+ for (var i = 0; i < expectedLength; i++) {
+ subRule = filterStyle[i];
+ shouldBe("subRule.operationType", expectedTypes[i]);
+ shouldBe("subRule.cssText", "'" + expectedTexts[i] + "'");
+ }
+ stylesheet.deleteRule(0);
+}
+
+testComputedFilterRule("Basic reference",
+ "url('#a')", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
+ ["url(#a)"]);
+
+testComputedFilterRule("Bare unquoted reference converting to quoted form",
+ "url(#a)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
+ ["url(#a)"]);
+
+testComputedFilterRule("Multiple references",
+ "url('#a') url('#b')", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE", "WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
+ ["url(#a)", "url(#b)"]);
+
+testComputedFilterRule("Reference as 2nd value",
+ "grayscale(1) url('#a')", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE", "WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
+ ["grayscale(1)", "url(#a)"]);
+
+testComputedFilterRule("Integer value",
+ "grayscale(1)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["grayscale(1)"]);
+
+testComputedFilterRule("Float value converts to integer",
+ "grayscale(1.0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["grayscale(1)"]);
+
+testComputedFilterRule("Zero value",
+ "grayscale(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["grayscale(0)"]);
+
+testComputedFilterRule("No values",
+ "grayscale()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["grayscale(1)"]);
+
+testComputedFilterRule("Multiple values",
+ "grayscale(0.5) grayscale(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE", "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["grayscale(0.5)", "grayscale(0.25)"]);
+
+testComputedFilterRule("Integer value",
+ "sepia(1)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_SEPIA"],
+ ["sepia(1)"]);
+
+testComputedFilterRule("Float value converts to integer",
+ "sepia(1.0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_SEPIA"],
+ ["sepia(1)"]);
+
+testComputedFilterRule("Zero value",
+ "sepia(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_SEPIA"],
+ ["sepia(0)"]);
+
+testComputedFilterRule("No values",
+ "sepia()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_SEPIA"],
+ ["sepia(1)"]);
+
+testComputedFilterRule("Multiple values",
+ "sepia(0.5) sepia(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_SEPIA", "WebKitCSSFilterValue.CSS_FILTER_SEPIA"],
+ ["sepia(0.5)", "sepia(0.25)"]);
+
+testComputedFilterRule("Rule combinations",
+ "sepia(0.5) grayscale(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_SEPIA", "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["sepia(0.5)", "grayscale(0.25)"]);
+
+testComputedFilterRule("Integer value",
+ "saturate(1)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_SATURATE"],
+ ["saturate(1)"]);
+
+testComputedFilterRule("Float value converts to integer",
+ "saturate(1.0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_SATURATE"],
+ ["saturate(1)"]);
+
+testComputedFilterRule("Zero value",
+ "saturate(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_SATURATE"],
+ ["saturate(0)"]);
+
+testComputedFilterRule("No values",
+ "saturate()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_SATURATE"],
+ ["saturate(1)"]);
+
+testComputedFilterRule("Multiple values",
+ "saturate(0.5) saturate(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_SATURATE", "WebKitCSSFilterValue.CSS_FILTER_SATURATE"],
+ ["saturate(0.5)", "saturate(0.25)"]);
+
+testComputedFilterRule("Rule combinations",
+ "saturate(0.5) grayscale(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_SATURATE", "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["saturate(0.5)", "grayscale(0.25)"]);
+
+testComputedFilterRule("Degrees value as integer",
+ "hue-rotate(10deg)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE"],
+ ["hue-rotate(10deg)"]);
+
+testComputedFilterRule("Degrees float value converts to integer",
+ "hue-rotate(10.0deg)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE"],
+ ["hue-rotate(10deg)"]);
+
+testComputedFilterRule("Radians value",
+ "hue-rotate(10rad)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE"],
+ ["hue-rotate(572.9577951308232deg)"]);
+
+testComputedFilterRule("Gradians value",
+ "hue-rotate(10grad)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE"],
+ ["hue-rotate(9deg)"]);
+
+testComputedFilterRule("Turns value",
+ "hue-rotate(0.5turn)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE"],
+ ["hue-rotate(180deg)"]);
+
+testComputedFilterRule("Zero value",
+ "hue-rotate(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE"],
+ ["hue-rotate(0deg)"]);
+
+testComputedFilterRule("No values",
+ "hue-rotate()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE"],
+ ["hue-rotate(0deg)"]);
+
+testComputedFilterRule("Rule combinations",
+ "hue-rotate(10deg) grayscale(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE", "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["hue-rotate(10deg)", "grayscale(0.25)"]);
+
+testComputedFilterRule("Integer value",
+ "invert(1)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_INVERT"],
+ ["invert(1)"]);
+
+testComputedFilterRule("Float value converts to integer",
+ "invert(1.0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_INVERT"],
+ ["invert(1)"]);
+
+testComputedFilterRule("Zero value",
+ "invert(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_INVERT"],
+ ["invert(0)"]);
+
+testComputedFilterRule("No values",
+ "invert()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_INVERT"],
+ ["invert(1)"]);
+
+testComputedFilterRule("Multiple values",
+ "invert(0.5) invert(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_INVERT", "WebKitCSSFilterValue.CSS_FILTER_INVERT"],
+ ["invert(0.5)", "invert(0.25)"]);
+
+testComputedFilterRule("Rule combinations",
+ "invert(0.5) grayscale(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_INVERT", "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["invert(0.5)", "grayscale(0.25)"]);
+
+testComputedFilterRule("Integer value",
+ "opacity(1)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_OPACITY"],
+ ["opacity(1)"]);
+
+testComputedFilterRule("Float value converts to integer",
+ "opacity(1.0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_OPACITY"],
+ ["opacity(1)"]);
+
+testComputedFilterRule("Zero value",
+ "opacity(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_OPACITY"],
+ ["opacity(0)"]);
+
+testComputedFilterRule("No values",
+ "opacity()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_OPACITY"],
+ ["opacity(1)"]);
+
+testComputedFilterRule("Multiple values",
+ "opacity(0.5) opacity(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_OPACITY", "WebKitCSSFilterValue.CSS_FILTER_OPACITY"],
+ ["opacity(0.5)", "opacity(0.25)"]);
+
+testComputedFilterRule("Rule combinations",
+ "opacity(0.5) grayscale(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_OPACITY", "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["opacity(0.5)", "grayscale(0.25)"]);
+
+testComputedFilterRule("Integer value",
+ "brightness(1)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS"],
+ ["brightness(1)"]);
+
+testComputedFilterRule("Float value converts to integer",
+ "brightness(1.0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS"],
+ ["brightness(1)"]);
+
+testComputedFilterRule("Zero value",
+ "brightness(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS"],
+ ["brightness(0)"]);
+
+testComputedFilterRule("No values",
+ "brightness()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS"],
+ ["brightness(0)"]);
+
+testComputedFilterRule("Multiple values",
+ "brightness(0.5) brightness(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS", "WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS"],
+ ["brightness(0.5)", "brightness(0.25)"]);
+
+testComputedFilterRule("Rule combinations",
+ "brightness(0.5) grayscale(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS", "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["brightness(0.5)", "grayscale(0.25)"]);
+
+testComputedFilterRule("Integer value",
+ "contrast(1)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_CONTRAST"],
+ ["contrast(1)"]);
+
+testComputedFilterRule("Value greater than 1",
+ "contrast(2)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_CONTRAST"],
+ ["contrast(2)"]);
+
+testComputedFilterRule("Float value converts to integer",
+ "contrast(1.0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_CONTRAST"],
+ ["contrast(1)"]);
+
+testComputedFilterRule("Zero value",
+ "contrast(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_CONTRAST"],
+ ["contrast(0)"]);
+
+testComputedFilterRule("No values",
+ "contrast()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_CONTRAST"],
+ ["contrast(1)"]);
+
+testComputedFilterRule("Multiple values",
+ "contrast(0.5) contrast(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_CONTRAST", "WebKitCSSFilterValue.CSS_FILTER_CONTRAST"],
+ ["contrast(0.5)", "contrast(0.25)"]);
+
+testComputedFilterRule("Rule combinations",
+ "contrast(0.5) grayscale(0.25)", 2,
+ ["WebKitCSSFilterValue.CSS_FILTER_CONTRAST", "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE"],
+ ["contrast(0.5)", "grayscale(0.25)"]);
+
+testComputedFilterRule("One zero to px",
+ "blur(0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_BLUR"],
+ ["blur(0px)"]);
+
+testComputedFilterRule("One length",
+ "blur(2em)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_BLUR"],
+ ["blur(32px)"]);
+
+testComputedFilterRule("One length",
+ "blur(5px)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_BLUR"],
+ ["blur(5px)"]);
+
+testComputedFilterRule("No values",
+ "blur()", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_BLUR"],
+ ["blur(0px)"]);
+
+testComputedFilterRule("Color then three values",
+ "drop-shadow(red 1px 2px 3px)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW"],
+ ["drop-shadow(rgb(255, 0, 0) 1px 2px 3px)"]);
+
+testComputedFilterRule("Three values then color",
+ "drop-shadow(1px 2px 3px red)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW"],
+ ["drop-shadow(rgb(255, 0, 0) 1px 2px 3px)"]);
+
+testComputedFilterRule("Color then three values with zero length",
+ "drop-shadow(#abc 0 0 0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW"],
+ ["drop-shadow(rgb(170, 187, 204) 0px 0px 0px)"]);
+
+testComputedFilterRule("Three values with zero length",
+ "drop-shadow(0 0 0)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW"],
+ ["drop-shadow(rgba(0, 0, 0, 0) 0px 0px 0px)"]);
+
+testComputedFilterRule("Two values no color",
+ "drop-shadow(1px 2px)", 1,
+ ["WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW"],
+ ["drop-shadow(rgba(0, 0, 0, 0) 1px 2px 0px)"]);
+
+testComputedFilterRule("Multiple operations",
+ "grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px)", 7,
+ [
+ "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE",
+ "WebKitCSSFilterValue.CSS_FILTER_SEPIA",
+ "WebKitCSSFilterValue.CSS_FILTER_SATURATE",
+ "WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE",
+ "WebKitCSSFilterValue.CSS_FILTER_INVERT",
+ "WebKitCSSFilterValue.CSS_FILTER_OPACITY",
+ "WebKitCSSFilterValue.CSS_FILTER_BLUR",
+ ],
+ [
+ "grayscale(0.5)",
+ "sepia(0.25)",
+ "saturate(0.75)",
+ "hue-rotate(35deg)",
+ "invert(0.2)",
+ "opacity(0.9)",
+ "blur(5px)"
+ ]);
+
+testComputedFilterRule("Percentage values",
+ "grayscale(50%) sepia(25%) saturate(75%) invert(20%) opacity(90%) brightness(60%) contrast(30%)", 7,
+ [
+ "WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE",
+ "WebKitCSSFilterValue.CSS_FILTER_SEPIA",
+ "WebKitCSSFilterValue.CSS_FILTER_SATURATE",
+ "WebKitCSSFilterValue.CSS_FILTER_INVERT",
+ "WebKitCSSFilterValue.CSS_FILTER_OPACITY",
+ "WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS",
+ "WebKitCSSFilterValue.CSS_FILTER_CONTRAST"
+ ],
+ [
+ "grayscale(0.5)",
+ "sepia(0.25)",
+ "saturate(0.75)",
+ "invert(0.2)",
+ "opacity(0.9)",
+ "brightness(0.6)",
+ "contrast(0.3)"
+ ]);
+
+successfullyParsed = true;
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filtersunprefixedexpectedtxtfromrev192422branchessafari601146branchLayoutTestscss3filtersfilterpropertycomputedstyleexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/css3/filters/unprefixed-expected.txt (from rev 192422, branches/safari-601.1.46-branch/LayoutTests/css3/filters/filter-property-computed-style-expected.txt) (0 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/unprefixed-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/unprefixed-expected.txt 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -0,0 +1,390 @@
</span><ins>+Test that -webkit-filter matches filter.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+Basic reference : url('#a')
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
+PASS subRule.cssText is 'url(#a)'
+
+Bare unquoted reference converting to quoted form : url(#a)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
+PASS subRule.cssText is 'url(#a)'
+
+Multiple references : url('#a') url('#b')
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
+PASS subRule.cssText is 'url(#a)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
+PASS subRule.cssText is 'url(#b)'
+
+Reference as 2nd value : grayscale(1) url('#a')
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(1)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
+PASS subRule.cssText is 'url(#a)'
+
+Integer value : grayscale(1)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(1)'
+
+Float value converts to integer : grayscale(1.0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(1)'
+
+Zero value : grayscale(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0)'
+
+No values : grayscale()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(1)'
+
+Multiple values : grayscale(0.5) grayscale(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.25)'
+
+Integer value : sepia(1)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(1)'
+
+Float value converts to integer : sepia(1.0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(1)'
+
+Zero value : sepia(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(0)'
+
+No values : sepia()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(1)'
+
+Multiple values : sepia(0.5) sepia(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(0.25)'
+
+Rule combinations : sepia(0.5) grayscale(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.25)'
+
+Integer value : saturate(1)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(1)'
+
+Float value converts to integer : saturate(1.0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(1)'
+
+Zero value : saturate(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(0)'
+
+No values : saturate()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(1)'
+
+Multiple values : saturate(0.5) saturate(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(0.25)'
+
+Rule combinations : saturate(0.5) grayscale(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.25)'
+
+Degrees value as integer : hue-rotate(10deg)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(10deg)'
+
+Degrees float value converts to integer : hue-rotate(10.0deg)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(10deg)'
+
+Radians value : hue-rotate(10rad)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(572.9577951308232deg)'
+
+Gradians value : hue-rotate(10grad)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(9deg)'
+
+Turns value : hue-rotate(0.5turn)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(180deg)'
+
+Zero value : hue-rotate(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(0deg)'
+
+No values : hue-rotate()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(0deg)'
+
+Rule combinations : hue-rotate(10deg) grayscale(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(10deg)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.25)'
+
+Integer value : invert(1)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(1)'
+
+Float value converts to integer : invert(1.0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(1)'
+
+Zero value : invert(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(0)'
+
+No values : invert()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(1)'
+
+Multiple values : invert(0.5) invert(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(0.25)'
+
+Rule combinations : invert(0.5) grayscale(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.25)'
+
+Integer value : opacity(1)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(1)'
+
+Float value converts to integer : opacity(1.0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(1)'
+
+Zero value : opacity(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(0)'
+
+No values : opacity()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(1)'
+
+Multiple values : opacity(0.5) opacity(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(0.25)'
+
+Rule combinations : opacity(0.5) grayscale(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.25)'
+
+Integer value : brightness(1)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(1)'
+
+Float value converts to integer : brightness(1.0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(1)'
+
+Zero value : brightness(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0)'
+
+No values : brightness()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0)'
+
+Multiple values : brightness(0.5) brightness(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0.25)'
+
+Rule combinations : brightness(0.5) grayscale(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.25)'
+
+Integer value : contrast(1)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(1)'
+
+Value greater than 1 : contrast(2)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(2)'
+
+Float value converts to integer : contrast(1.0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(1)'
+
+Zero value : contrast(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(0)'
+
+No values : contrast()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(1)'
+
+Multiple values : contrast(0.5) contrast(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(0.25)'
+
+Rule combinations : contrast(0.5) grayscale(0.25)
+PASS filterStyle.length is 2
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.25)'
+
+One zero to px : blur(0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BLUR
+PASS subRule.cssText is 'blur(0px)'
+
+One length : blur(2em)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BLUR
+PASS subRule.cssText is 'blur(32px)'
+
+One length : blur(5px)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BLUR
+PASS subRule.cssText is 'blur(5px)'
+
+No values : blur()
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BLUR
+PASS subRule.cssText is 'blur(0px)'
+
+Color then three values : drop-shadow(red 1px 2px 3px)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW
+PASS subRule.cssText is 'drop-shadow(rgb(255, 0, 0) 1px 2px 3px)'
+
+Three values then color : drop-shadow(1px 2px 3px red)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW
+PASS subRule.cssText is 'drop-shadow(rgb(255, 0, 0) 1px 2px 3px)'
+
+Color then three values with zero length : drop-shadow(#abc 0 0 0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW
+PASS subRule.cssText is 'drop-shadow(rgb(170, 187, 204) 0px 0px 0px)'
+
+Three values with zero length : drop-shadow(0 0 0)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW
+PASS subRule.cssText is 'drop-shadow(rgba(0, 0, 0, 0) 0px 0px 0px)'
+
+Two values no color : drop-shadow(1px 2px)
+PASS filterStyle.length is 1
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_DROP_SHADOW
+PASS subRule.cssText is 'drop-shadow(rgba(0, 0, 0, 0) 1px 2px 0px)'
+
+Multiple operations : grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px)
+PASS filterStyle.length is 7
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(0.25)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(0.75)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_HUE_ROTATE
+PASS subRule.cssText is 'hue-rotate(35deg)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(0.2)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(0.9)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BLUR
+PASS subRule.cssText is 'blur(5px)'
+
+Percentage values : grayscale(50%) sepia(25%) saturate(75%) invert(20%) opacity(90%) brightness(60%) contrast(30%)
+PASS filterStyle.length is 7
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
+PASS subRule.cssText is 'grayscale(0.5)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SEPIA
+PASS subRule.cssText is 'sepia(0.25)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_SATURATE
+PASS subRule.cssText is 'saturate(0.75)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_INVERT
+PASS subRule.cssText is 'invert(0.2)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_OPACITY
+PASS subRule.cssText is 'opacity(0.9)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_BRIGHTNESS
+PASS subRule.cssText is 'brightness(0.6)'
+PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_CONTRAST
+PASS subRule.cssText is 'contrast(0.3)'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3filtersunprefixedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/css3/filters/unprefixed.html (0 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/filters/unprefixed.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/filters/unprefixed.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/unprefixed.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -151,6 +151,7 @@
</span><span class="cx"> align-content: start;
</span><span class="cx"> align-items: start;
</span><span class="cx"> align-self: start;
</span><ins>+filter: none;
</ins><span class="cx"> flex-direction: row;
</span><span class="cx"> flex-wrap: nowrap;
</span><span class="cx"> justify-content: start;
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -150,6 +150,7 @@
</span><span class="cx"> align-content: auto
</span><span class="cx"> align-items: auto
</span><span class="cx"> align-self: auto
</span><ins>+filter: none
</ins><span class="cx"> flex-direction: row
</span><span class="cx"> flex-wrap: nowrap
</span><span class="cx"> justify-content: auto
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimageclippedfilterexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/clipped-filter-expected.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/clipped-filter-expected.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/clipped-filter-expected.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> border-radius: 50% 50%;
</span><span class="cx"> }
</span><span class="cx"> .inner {
</span><del>- -webkit-filter: drop-shadow(16px 16px 0px black);
</del><ins>+ filter: drop-shadow(16px 16px 0px black);
</ins><span class="cx"> background-color: red;
</span><span class="cx"> height: 60px;
</span><span class="cx"> width: 200px;
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimageclippedfilterhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/clipped-filter.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/clipped-filter.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/clipped-filter.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .inner {
</span><del>- -webkit-filter: drop-shadow(16px 16px 0px black);
</del><ins>+ filter: drop-shadow(16px 16px 0px black);
</ins><span class="cx"> background-color: red;
</span><span class="cx"> height: 60px;
</span><span class="cx"> width: 200px;
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimagefilterimageanimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-animation-expected.txt (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-animation-expected.txt 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-animation-expected.txt 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><span class="cx">
</span><del>-PASS - "backgroundImage" property for "brightness" element at 1s saw something close to: -webkit-filter(url(image.svg), brightness(0.5))
-PASS - "backgroundImage" property for "blur" element at 1s saw something close to: -webkit-filter(url(image.svg), blur(5px))
-PASS - "backgroundImage" property for "grayscale" element at 1s saw something close to: -webkit-filter(url(image.svg), grayscale(0.5))
-PASS - "backgroundImage" property for "sepia" element at 1s saw something close to: -webkit-filter(url(image.svg), sepia(0.5))
-PASS - "backgroundImage" property for "no" element at 1s saw something close to: -webkit-filter(url(blue.svg), sepia(0))
-PASS - "backgroundImage" property for "string" element at 1s saw something close to: -webkit-filter(url(image.svg), sepia(0.5))
-PASS - "backgroundImage" property for "multiple1" element at 1s saw something close to: -webkit-filter(url(image.svg), sepia(0.5) blur(1.5px) hue-rotate(22.5deg))
-PASS - "backgroundImage" property for "multiple2" element at 1s saw something close to: -webkit-filter(url(image.svg), contrast(0.5) blur(1.5px) hue-rotate(22.5deg))
-PASS - "backgroundImage" property for "urlfilter" element at 1s saw something close to: -webkit-filter(url(image.svg), sepia(0.25))
-PASS - "backgroundImage" property for "filterurl" element at 1s saw something close to: -webkit-filter(url(image.svg), sepia(0.25))
-PASS - "backgroundImage" property for "filterdiffurl" element at 1s saw something close to: -webkit-filter(url(blue.svg), sepia(0.5))
-PASS - "backgroundImage" property for "generated1" element at 1s saw something close to: -webkit-filter(-webkit-filter(url(image.svg), blur(3px)), sepia(0))
-PASS - "backgroundImage" property for "generated2" element at 1s saw something close to: -webkit-filter(-webkit-cross-fade(url(image.svg), url(image.svg), 50%), sepia(0))
</del><ins>+PASS - "backgroundImage" property for "brightness" element at 1s saw something close to: filter(url(image.svg), brightness(0.5))
+PASS - "backgroundImage" property for "blur" element at 1s saw something close to: filter(url(image.svg), blur(5px))
+PASS - "backgroundImage" property for "grayscale" element at 1s saw something close to: filter(url(image.svg), grayscale(0.5))
+PASS - "backgroundImage" property for "sepia" element at 1s saw something close to: filter(url(image.svg), sepia(0.5))
+PASS - "backgroundImage" property for "no" element at 1s saw something close to: filter(url(blue.svg), sepia(0))
+PASS - "backgroundImage" property for "string" element at 1s saw something close to: filter(url(image.svg), sepia(0.5))
+PASS - "backgroundImage" property for "multiple1" element at 1s saw something close to: filter(url(image.svg), sepia(0.5) blur(1.5px) hue-rotate(22.5deg))
+PASS - "backgroundImage" property for "multiple2" element at 1s saw something close to: filter(url(image.svg), contrast(0.5) blur(1.5px) hue-rotate(22.5deg))
+PASS - "backgroundImage" property for "urlfilter" element at 1s saw something close to: filter(url(image.svg), sepia(0.25))
+PASS - "backgroundImage" property for "filterurl" element at 1s saw something close to: filter(url(image.svg), sepia(0.25))
+PASS - "backgroundImage" property for "filterdiffurl" element at 1s saw something close to: filter(url(blue.svg), sepia(0.5))
+PASS - "backgroundImage" property for "generated1" element at 1s saw something close to: filter(filter(url(image.svg), blur(3px)), sepia(0))
+PASS - "backgroundImage" property for "generated2" element at 1s saw something close to: filter(-webkit-cross-fade(url(image.svg), url(image.svg), 50%), sepia(0))
</ins><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimagefilterimageanimationhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-animation.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-animation.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-animation.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -64,88 +64,88 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes brightness-anim {
</span><del>- from { background-image: -webkit-filter(url(resources/image.svg), brightness(1)); }
- to { background-image: -webkit-filter(url(resources/image.svg), brightness(0)); }
</del><ins>+ from { background-image: filter(url(resources/image.svg), brightness(1)); }
+ to { background-image: filter(url(resources/image.svg), brightness(0)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes blur-anim {
</span><del>- from { background-image: -webkit-filter(url(resources/image.svg), blur(0)); }
- to { background-image: -webkit-filter(url(resources/image.svg), blur(10px)); }
</del><ins>+ from { background-image: filter(url(resources/image.svg), blur(0)); }
+ to { background-image: filter(url(resources/image.svg), blur(10px)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes grayscale-anim {
</span><del>- from { background-image: -webkit-filter(url(resources/image.svg), grayscale(1)); }
- to { background-image: -webkit-filter(url(resources/image.svg), grayscale(0)); }
</del><ins>+ from { background-image: filter(url(resources/image.svg), grayscale(1)); }
+ to { background-image: filter(url(resources/image.svg), grayscale(0)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes sepia-anim {
</span><del>- from { background-image: -webkit-filter(url(resources/image.svg), sepia(1)); }
- to { background-image: -webkit-filter(url(resources/image.svg), sepia(0)); }
</del><ins>+ from { background-image: filter(url(resources/image.svg), sepia(1)); }
+ to { background-image: filter(url(resources/image.svg), sepia(0)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes no-anim {
</span><del>- from { background-image: -webkit-filter(url(resources/image.svg), sepia(1)); }
- to { background-image: -webkit-filter(url(resources/blue.svg), sepia(0)); }
</del><ins>+ from { background-image: filter(url(resources/image.svg), sepia(1)); }
+ to { background-image: filter(url(resources/blue.svg), sepia(0)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes string-anim {
</span><del>- from { background-image: -webkit-filter('resources/image.svg', sepia(1)); }
- to { background-image: -webkit-filter(url(resources/image.svg), sepia(0)); }
</del><ins>+ from { background-image: filter('resources/image.svg', sepia(1)); }
+ to { background-image: filter(url(resources/image.svg), sepia(0)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes multiple-anim1 {
</span><del>- from { background-image: -webkit-filter(url(resources/image.svg), sepia(0.25) blur(3px) hue-rotate(45deg)); }
- to { background-image: -webkit-filter(url(resources/image.svg), sepia(0.75)); }
</del><ins>+ from { background-image: filter(url(resources/image.svg), sepia(0.25) blur(3px) hue-rotate(45deg)); }
+ to { background-image: filter(url(resources/image.svg), sepia(0.75)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes multiple-anim2 {
</span><del>- from { background-image: -webkit-filter(url(resources/image.svg), contrast(0.25)); }
- to { background-image: -webkit-filter(url(resources/image.svg), contrast(0.75) blur(3px) hue-rotate(45deg)); }
</del><ins>+ from { background-image: filter(url(resources/image.svg), contrast(0.25)); }
+ to { background-image: filter(url(resources/image.svg), contrast(0.75) blur(3px) hue-rotate(45deg)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes url-to-filter-anim {
</span><span class="cx"> from { background-image: url(resources/image.svg); }
</span><del>- to { background-image: -webkit-filter(url(resources/image.svg), sepia(0.5)); }
</del><ins>+ to { background-image: filter(url(resources/image.svg), sepia(0.5)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes filter-to-url-anim {
</span><del>- from { background-image: -webkit-filter(url(resources/image.svg), sepia(0.5)); }
</del><ins>+ from { background-image: filter(url(resources/image.svg), sepia(0.5)); }
</ins><span class="cx"> to { background-image: url(resources/image.svg); }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes filter-diff-url-anim {
</span><span class="cx"> from { background-image: url(resources/image.svg); }
</span><del>- to { background-image: -webkit-filter(url(resources/blue.svg), sepia(0.5)); }
</del><ins>+ to { background-image: filter(url(resources/blue.svg), sepia(0.5)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes generated-anim1 {
</span><del>- from { background-image: -webkit-filter(-webkit-filter(url(resources/image.svg), blur(3px)), sepia(1)); }
- to { background-image: -webkit-filter(-webkit-filter(url(resources/image.svg), blur(3px)), sepia(0)); }
</del><ins>+ from { background-image: filter(filter(url(resources/image.svg), blur(3px)), sepia(1)); }
+ to { background-image: filter(filter(url(resources/image.svg), blur(3px)), sepia(0)); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes generated-anim2 {
</span><del>- from { background-image: -webkit-filter(-webkit-cross-fade(url(resources/image.svg), url(resources/image.svg), 50%), sepia(1)); }
- to { background-image: -webkit-filter(-webkit-cross-fade(url(resources/image.svg), url(resources/image.svg), 50%), sepia(0)); }
</del><ins>+ from { background-image: filter(-webkit-cross-fade(url(resources/image.svg), url(resources/image.svg), 50%), sepia(1)); }
+ to { background-image: filter(-webkit-cross-fade(url(resources/image.svg), url(resources/image.svg), 50%), sepia(0)); }
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../animations/resources/animation-test-helpers.js"></script>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> const expectedValues = [
</span><span class="cx"> // [animation-name, time, element-id, property, expected-value, tolerance]
</span><del>- ["brightness-anim", 1, "brightness", "backgroundImage", "-webkit-filter(url(image.svg), brightness(0.5))", 0.05],
- ["blur-anim", 1, "blur", "backgroundImage", "-webkit-filter(url(image.svg), blur(5px))", 0.05],
- ["grayscale-anim", 1, "grayscale", "backgroundImage", "-webkit-filter(url(image.svg), grayscale(0.5))", 0.05],
- ["sepia-anim", 1, "sepia", "backgroundImage", "-webkit-filter(url(image.svg), sepia(0.5))", 0.05],
- ["no-anim", 1, "no", "backgroundImage", "-webkit-filter(url(blue.svg), sepia(0))", 0],
- ["string-anim", 1, "string", "backgroundImage", "-webkit-filter(url(image.svg), sepia(0.5))", 0],
- ["multiple-anim1", 1, "multiple1", "backgroundImage", "-webkit-filter(url(image.svg), sepia(0.5) blur(1.5px) hue-rotate(22.5deg))", 0.05],
- ["multiple-anim2", 1, "multiple2", "backgroundImage", "-webkit-filter(url(image.svg), contrast(0.5) blur(1.5px) hue-rotate(22.5deg))", 0.05],
- ["url-to-filter-anim", 1, "urlfilter", "backgroundImage", " -webkit-filter(url(image.svg), sepia(0.25))", 0.05],
- ["filter-to-url-anim", 1, "filterurl", "backgroundImage", " -webkit-filter(url(image.svg), sepia(0.25))", 0.05],
- ["filter-diff-url-anim", 1, "filterdiffurl", "backgroundImage", " -webkit-filter(url(blue.svg), sepia(0.5))", 0],
</del><ins>+ ["brightness-anim", 1, "brightness", "backgroundImage", "filter(url(image.svg), brightness(0.5))", 0.05],
+ ["blur-anim", 1, "blur", "backgroundImage", "filter(url(image.svg), blur(5px))", 0.05],
+ ["grayscale-anim", 1, "grayscale", "backgroundImage", "filter(url(image.svg), grayscale(0.5))", 0.05],
+ ["sepia-anim", 1, "sepia", "backgroundImage", "filter(url(image.svg), sepia(0.5))", 0.05],
+ ["no-anim", 1, "no", "backgroundImage", "filter(url(blue.svg), sepia(0))", 0],
+ ["string-anim", 1, "string", "backgroundImage", "filter(url(image.svg), sepia(0.5))", 0],
+ ["multiple-anim1", 1, "multiple1", "backgroundImage", "filter(url(image.svg), sepia(0.5) blur(1.5px) hue-rotate(22.5deg))", 0.05],
+ ["multiple-anim2", 1, "multiple2", "backgroundImage", "filter(url(image.svg), contrast(0.5) blur(1.5px) hue-rotate(22.5deg))", 0.05],
+ ["url-to-filter-anim", 1, "urlfilter", "backgroundImage", " filter(url(image.svg), sepia(0.25))", 0.05],
+ ["filter-to-url-anim", 1, "filterurl", "backgroundImage", " filter(url(image.svg), sepia(0.25))", 0.05],
+ ["filter-diff-url-anim", 1, "filterdiffurl", "backgroundImage", " filter(url(blue.svg), sepia(0.5))", 0],
</ins><span class="cx"> // FIXME: We need to support generated images as input to other generated images for animations first.
</span><del>- ["generated-anim1", 1, "generated1", "backgroundImage", "-webkit-filter(-webkit-filter(url(image.svg), blur(3px)), sepia(0))", 0],
- ["generated-anim2", 1, "generated2", "backgroundImage", "-webkit-filter(-webkit-cross-fade(url(image.svg), url(image.svg), 50%), sepia(0))", 0],
</del><ins>+ ["generated-anim1", 1, "generated1", "backgroundImage", "filter(filter(url(image.svg), blur(3px)), sepia(0))", 0],
+ ["generated-anim2", 1, "generated2", "backgroundImage", "filter(-webkit-cross-fade(url(image.svg), url(image.svg), 50%), sepia(0))", 0],
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> runAnimationTest(expectedValues);
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimagefilterimageblurhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-blur.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-blur.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-blur.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> div {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 100px;
</span><del>- background-image: -webkit-filter(url(resources/svg-noblur.svg), blur(3px));
</del><ins>+ background-image: filter(url(resources/svg-noblur.svg), blur(3px));
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimagefilterimageexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-expected.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-expected.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-expected.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -2,43 +2,46 @@
</span><span class="cx"> <html lang="en">
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><del>-img {
- width: 50px;
- height: 50px;
- margin: 0;
- padding: 0;
- float: left;
</del><ins>+img {
+ width: 50px;
+ height: 50px;
+ margin: 0;
+ padding: 0;
+ float: left;
</ins><span class="cx"> }
</span><span class="cx"> .f0 {
</span><del>- -webkit-filter: brightness(0.5);
</del><ins>+ filter: brightness(0.5);
</ins><span class="cx"> }
</span><span class="cx"> .f1 {
</span><del>- -webkit-filter: contrast(0.5);
</del><ins>+ filter: contrast(0.5);
</ins><span class="cx"> }
</span><span class="cx"> .f2 {
</span><del>- -webkit-filter: saturate(0.5);
</del><ins>+ filter: saturate(0.5);
</ins><span class="cx"> }
</span><span class="cx"> .f3 {
</span><del>- -webkit-filter: sepia(0.5);
</del><ins>+ filter: sepia(0.5);
</ins><span class="cx"> }
</span><span class="cx"> .f4 {
</span><del>- -webkit-filter: grayscale(0.5);
</del><ins>+ filter: grayscale(0.5);
</ins><span class="cx"> }
</span><span class="cx"> .f5 {
</span><del>- -webkit-filter: invert(0.5);
</del><ins>+ filter: invert(0.5);
</ins><span class="cx"> }
</span><span class="cx"> .f6 {
</span><del>- -webkit-filter: opacity(0.5);
</del><ins>+ filter: opacity(0.5);
</ins><span class="cx"> }
</span><span class="cx"> .f7 {
</span><del>- -webkit-filter: sepia(0.3) brightness(1.2) contrast(0.2);
</del><ins>+ filter: sepia(0.3) brightness(1.2) contrast(0.2);
</ins><span class="cx"> }
</span><span class="cx"> .f8 {
</span><del>- -webkit-filter: brightness(0.5) sepia(0.3) brightness(1.2) contrast(0.2);
</del><ins>+ filter: brightness(0.5) sepia(0.3) brightness(1.2) contrast(0.2);
</ins><span class="cx"> }
</span><span class="cx"> .f9 {
</span><del>- -webkit-filter: contrast(0.5) contrast(1.5);
</del><ins>+ filter: contrast(0.5) contrast(1.5);
</ins><span class="cx"> }
</span><ins>+.f10 {
+ filter: contrast(0.5);
+}
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -52,5 +55,6 @@
</span><span class="cx"> <img class="f7" src="resources/image.svg">
</span><span class="cx"> <img class="f8" src="resources/image.svg">
</span><span class="cx"> <img class="f9" src="resources/image.svg">
</span><ins>+<img class="f10" src="resources/image.svg">
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimagefilterimagesvghtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-svg.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-svg.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image-svg.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> </script>
</span><span class="cx"> <style>
</span><span class="cx"> div {
</span><del>- background-image: -webkit-filter(url(image.svg), url(#filter));
</del><ins>+ background-image: filter(url(image.svg), url(#filter));
</ins><span class="cx"> width: 100px;
</span><span class="cx"> height: 100px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimagefilterimagehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/filter-image.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -2,63 +2,68 @@
</span><span class="cx"> <html lang="en">
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><del>-div {
- width: 50px;
- height: 50px;
- margin: 0;
- padding: 0;
- float: left;
</del><ins>+div {
+ width: 50px;
+ height: 50px;
+ margin: 0;
+ padding: 0;
+ float: left;
</ins><span class="cx"> }
</span><span class="cx"> .f0 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- brightness(0.5));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ brightness(0.5));
</ins><span class="cx"> }
</span><span class="cx"> .f1 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- contrast(0.5));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ contrast(0.5));
</ins><span class="cx"> }
</span><span class="cx"> .f2 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- saturate(0.5));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ saturate(0.5));
</ins><span class="cx"> }
</span><span class="cx"> .f3 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- sepia(0.5));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ sepia(0.5));
</ins><span class="cx"> }
</span><span class="cx"> .f4 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- grayscale(0.5));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ grayscale(0.5));
</ins><span class="cx"> }
</span><span class="cx"> .f5 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- invert(0.5));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ invert(0.5));
</ins><span class="cx"> }
</span><span class="cx"> .f6 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- opacity(0.5));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ opacity(0.5));
</ins><span class="cx"> }
</span><span class="cx"> .f7 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- sepia(0.3) brightness(1.2) contrast(0.2));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ sepia(0.3) brightness(1.2) contrast(0.2));
</ins><span class="cx"> }
</span><span class="cx"> .f8 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- brightness(0.5) sepia(0.3) brightness(1.2) contrast(0.2));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ brightness(0.5) sepia(0.3) brightness(1.2) contrast(0.2));
</ins><span class="cx"> }
</span><span class="cx"> .f9 {
</span><del>- background-image: -webkit-filter(
- url("resources/image.svg"),
- contrast(0.5) contrast(1.5));
</del><ins>+ background-image: filter(
+ url("resources/image.svg"),
+ contrast(0.5) contrast(1.5));
</ins><span class="cx"> }
</span><ins>+.f10 {
+ background-image: -webkit-filter(
+ url("resources/image.svg"),
+ contrast(0.5));
+}
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -72,5 +77,6 @@
</span><span class="cx"> <div class="f7"></div>
</span><span class="cx"> <div class="f8"></div>
</span><span class="cx"> <div class="f9"></div>
</span><ins>+<div class="f10"></div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimageparsefilterimageexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/parse-filter-image-expected.txt (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/parse-filter-image-expected.txt 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/parse-filter-image-expected.txt 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -3,114 +3,114 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS innerStyle("background-image", "-webkit-filter(none, blur(3px))") is "-webkit-filter(none, blur(3px))"
-PASS innerStyle("background-image", "-webkit-filter(none, url(#a))") is "-webkit-filter(none, url(#a))"
-PASS innerStyle("background-image", "-webkit-filter(none, url(#a))") is "-webkit-filter(none, url(#a))"
-PASS innerStyle("background-image", "-webkit-filter(none, url(#a) url(#b))") is "-webkit-filter(none, url(#a) url(#b))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(1) url(#a))") is "-webkit-filter(none, grayscale(1) url(#a))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(1))") is "-webkit-filter(none, grayscale(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(50%))") is "-webkit-filter(none, grayscale(50%))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(1.0))") is "-webkit-filter(none, grayscale(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(0))") is "-webkit-filter(none, grayscale(0))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(0.5) grayscale(0.25))") is "-webkit-filter(none, grayscale(0.5) grayscale(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, sepia(1))") is "-webkit-filter(none, sepia(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, sepia(50%))") is "-webkit-filter(none, sepia(50%))"
-PASS innerStyle("background-image", "-webkit-filter(none, sepia(1.0))") is "-webkit-filter(none, sepia(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, sepia(0))") is "-webkit-filter(none, sepia(0))"
-PASS innerStyle("background-image", "-webkit-filter(none, sepia(0.5) sepia(0.25))") is "-webkit-filter(none, sepia(0.5) sepia(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, sepia(0.5) grayscale(0.25))") is "-webkit-filter(none, sepia(0.5) grayscale(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, saturate(1))") is "-webkit-filter(none, saturate(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, saturate(50%))") is "-webkit-filter(none, saturate(50%))"
-PASS innerStyle("background-image", "-webkit-filter(none, saturate(250%))") is "-webkit-filter(none, saturate(250%))"
-PASS innerStyle("background-image", "-webkit-filter(none, saturate(1.0))") is "-webkit-filter(none, saturate(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, saturate(5.5))") is "-webkit-filter(none, saturate(5.5))"
-PASS innerStyle("background-image", "-webkit-filter(none, saturate(0))") is "-webkit-filter(none, saturate(0))"
-PASS innerStyle("background-image", "-webkit-filter(none, saturate(0.5) saturate(0.25))") is "-webkit-filter(none, saturate(0.5) saturate(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, saturate(0.5) grayscale(0.25))") is "-webkit-filter(none, saturate(0.5) grayscale(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, hue-rotate(10deg))") is "-webkit-filter(none, hue-rotate(10deg))"
-PASS innerStyle("background-image", "-webkit-filter(none, hue-rotate(10.0deg))") is "-webkit-filter(none, hue-rotate(10deg))"
-PASS innerStyle("background-image", "-webkit-filter(none, hue-rotate(10rad))") is "-webkit-filter(none, hue-rotate(10rad))"
-PASS innerStyle("background-image", "-webkit-filter(none, hue-rotate(10grad))") is "-webkit-filter(none, hue-rotate(10grad))"
-PASS innerStyle("background-image", "-webkit-filter(none, hue-rotate(0.5turn))") is "-webkit-filter(none, hue-rotate(0.5turn))"
-PASS innerStyle("background-image", "-webkit-filter(none, hue-rotate(0))") is "-webkit-filter(none, hue-rotate(0deg))"
-PASS innerStyle("background-image", "-webkit-filter(none, hue-rotate(10deg) grayscale(0.25))") is "-webkit-filter(none, hue-rotate(10deg) grayscale(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, invert(1))") is "-webkit-filter(none, invert(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, invert(50%))") is "-webkit-filter(none, invert(50%))"
-PASS innerStyle("background-image", "-webkit-filter(none, invert(1.0))") is "-webkit-filter(none, invert(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, invert(0))") is "-webkit-filter(none, invert(0))"
-PASS innerStyle("background-image", "-webkit-filter(none, invert(0.5) invert(0.25))") is "-webkit-filter(none, invert(0.5) invert(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, invert(0.5) grayscale(0.25))") is "-webkit-filter(none, invert(0.5) grayscale(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, opacity(1))") is "-webkit-filter(none, opacity(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, opacity(50%))") is "-webkit-filter(none, opacity(50%))"
-PASS innerStyle("background-image", "-webkit-filter(none, opacity(1.0))") is "-webkit-filter(none, opacity(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, opacity(0))") is "-webkit-filter(none, opacity(0))"
-PASS innerStyle("background-image", "-webkit-filter(none, opacity(0.5) opacity(0.25))") is "-webkit-filter(none, opacity(0.5) opacity(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, opacity(0.5) grayscale(0.25))") is "-webkit-filter(none, opacity(0.5) grayscale(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, brightness(1))") is "-webkit-filter(none, brightness(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, brightness(50%))") is "-webkit-filter(none, brightness(50%))"
-PASS innerStyle("background-image", "-webkit-filter(none, brightness(1.0))") is "-webkit-filter(none, brightness(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, brightness(0))") is "-webkit-filter(none, brightness(0))"
-PASS innerStyle("background-image", "-webkit-filter(none, brightness(0.5) brightness(0.25))") is "-webkit-filter(none, brightness(0.5) brightness(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, brightness(0.5) grayscale(0.25))") is "-webkit-filter(none, brightness(0.5) grayscale(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, brightness(-1.1))") is "-webkit-filter(none, brightness(-1.1))"
-PASS innerStyle("background-image", "-webkit-filter(none, brightness(101%))") is "-webkit-filter(none, brightness(101%))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(0.25) brightness(0.5))") is "-webkit-filter(none, grayscale(0.25) brightness(0.5))"
-PASS innerStyle("background-image", "-webkit-filter(none, contrast(1))") is "-webkit-filter(none, contrast(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, contrast(50%))") is "-webkit-filter(none, contrast(50%))"
-PASS innerStyle("background-image", "-webkit-filter(none, contrast(250%))") is "-webkit-filter(none, contrast(250%))"
-PASS innerStyle("background-image", "-webkit-filter(none, contrast(1.0))") is "-webkit-filter(none, contrast(1))"
-PASS innerStyle("background-image", "-webkit-filter(none, contrast(0))") is "-webkit-filter(none, contrast(0))"
-PASS innerStyle("background-image", "-webkit-filter(none, contrast(2))") is "-webkit-filter(none, contrast(2))"
-PASS innerStyle("background-image", "-webkit-filter(none, contrast(0.5) contrast(0.25))") is "-webkit-filter(none, contrast(0.5) contrast(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, contrast(0.5) grayscale(0.25))") is "-webkit-filter(none, contrast(0.5) grayscale(0.25))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(0.25) contrast(0.5))") is "-webkit-filter(none, grayscale(0.25) contrast(0.5))"
-PASS innerStyle("background-image", "-webkit-filter(none, blur(0))") is "-webkit-filter(none, blur(0px))"
-PASS innerStyle("background-image", "-webkit-filter(none, blur(10px))") is "-webkit-filter(none, blur(10px))"
-PASS innerStyle("background-image", "-webkit-filter(none, drop-shadow(red 1px 2px 3px))") is "-webkit-filter(none, drop-shadow(red 1px 2px 3px))"
-PASS innerStyle("background-image", "-webkit-filter(none, drop-shadow(1px 2px 3px red))") is "-webkit-filter(none, drop-shadow(red 1px 2px 3px))"
-PASS innerStyle("background-image", "-webkit-filter(none, drop-shadow(#abc 0 0 0))") is "-webkit-filter(none, drop-shadow(rgb(170, 187, 204) 0px 0px 0px))"
-PASS innerStyle("background-image", "-webkit-filter(none, drop-shadow(0 0 0))") is "-webkit-filter(none, drop-shadow(0px 0px 0px))"
-PASS innerStyle("background-image", "-webkit-filter(none, drop-shadow(1px 2px))") is "-webkit-filter(none, drop-shadow(1px 2px))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px))") is "-webkit-filter(none, grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px))"
-PASS innerStyle("background-image", "-webkit-filter(radial-gradient(ellipse closest-corner, white, black), hue-rotate(90deg))") is "-webkit-filter(radial-gradient(closest-corner, white, black), hue-rotate(90deg))"
-PASS innerStyle("background-image", "-webkit-filter(radial-gradient(circle closest-side at 50px 50%, white, black), hue-rotate(90deg))") is "-webkit-filter(radial-gradient(circle closest-side at 50px 50%, white, black), hue-rotate(90deg))"
-PASS innerStyle("background-image", "-webkit-filter(radial-gradient(ellipse closest-corner at 20px 50px, white, black), hue-rotate(90deg))") is "-webkit-filter(radial-gradient(closest-corner at 20px 50px, white, black), hue-rotate(90deg))"
-PASS innerStyle("background-image", "-webkit-filter(linear-gradient(white, black), hue-rotate(90deg))") is "-webkit-filter(linear-gradient(white, black), hue-rotate(90deg))"
-PASS innerStyle("background-image", "-webkit-filter(linear-gradient(to top left, white, black), hue-rotate(90deg))") is "-webkit-filter(linear-gradient(to left top, white, black), hue-rotate(90deg))"
-PASS innerStyle("background-image", "-webkit-filter(linear-gradient(0deg, white -20%, blue, black 120%), hue-rotate(90deg))") is "-webkit-filter(linear-gradient(0deg, white -20%, blue, black 120%), hue-rotate(90deg))"
-PASS innerStyle("background-image", "-webkit-filter(-webkit-cross-fade(url(http://image1.png), url(http://image2.png), 50%), contrast(0.5))") is "-webkit-filter(-webkit-cross-fade(url(http://image1.png/), url(http://image2.png/), 0.5), contrast(0.5))"
-PASS innerStyle("background-image", "-webkit-filter(url(http://image1.png), brightness(50%))") is "-webkit-filter(url(http://image1.png/), brightness(50%))"
-PASS innerStyle("background-image", "-webkit-filter('http://image1.png', brightness(50%))") is "-webkit-filter(url(http://image1.png/), brightness(50%))"
-PASS innerStyle("border-image-source", "-webkit-filter(url(http://image1.png), invert(50%))") is "-webkit-filter(url(http://image1.png/), invert(50%))"
-PASS innerStyle("-webkit-mask-image", "-webkit-filter(url(http://image1.png), invert(50%))") is "-webkit-filter(url(http://image1.png/), invert(50%))"
-PASS innerStyle("-webkit-mask-box-image-source", "-webkit-filter(url(http://image1.png), invert(50%))") is "-webkit-filter(url(http://image1.png/), invert(50%))"
-PASS innerStyle("content", "-webkit-filter(url(http://image1.png), invert(50%))") is "-webkit-filter(url(http://image1.png/), invert(50%))"
-PASS innerStyle("background-image", "-webkit-filter()") is null
-PASS computedStyle("background-image", "-webkit-filter()") is "none"
-PASS innerStyle("background-image", "-webkit-filter(url(image1.png))") is null
-PASS computedStyle("background-image", "-webkit-filter(url(image1.png))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(url(image1.png), )") is null
-PASS computedStyle("background-image", "-webkit-filter(url(image1.png), )") is "none"
-PASS innerStyle("background-image", "-webkit-filter(url(image1.png) brightness(50%))") is null
-PASS computedStyle("background-image", "-webkit-filter(url(image1.png) brightness(50%))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(brightness(50%) url(image1.png))") is null
-PASS computedStyle("background-image", "-webkit-filter(brightness(50%) url(image1.png))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(brightness(50%), url(image1.png))") is null
-PASS computedStyle("background-image", "-webkit-filter(brightness(50%), url(image1.png))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(url(image1.png) url(#filter))") is null
-PASS computedStyle("background-image", "-webkit-filter(url(image1.png) url(#filter))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(brightness(50%))") is null
-PASS computedStyle("background-image", "-webkit-filter(brightness(50%))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(brightness(50%), )") is null
-PASS computedStyle("background-image", "-webkit-filter(brightness(50%), )") is "none"
-PASS innerStyle("background-image", "-webkit-filter(url(image1.png), brightness(50%), brightness(50%))") is null
-PASS computedStyle("background-image", "-webkit-filter(url(image1.png), brightness(50%), brightness(50%))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(url(image1.png) url(image2.png), brightness(50%))") is null
-PASS computedStyle("background-image", "-webkit-filter(url(image1.png) url(image2.png), brightness(50%))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(url(image1.png), url(image2.png), brightness(50%))") is null
-PASS computedStyle("background-image", "-webkit-filter(url(image1.png), url(image2.png), brightness(50%))") is "none"
-PASS innerStyle("background-image", "-webkit-filter(invalidToken.png, blur(3px))") is null
-PASS computedStyle("background-image", "-webkit-filter(invalidToken.png, blur(3px))") is "none"
</del><ins>+PASS innerStyle("background-image", "filter(none, blur(3px))") is "filter(none, blur(3px))"
+PASS innerStyle("background-image", "filter(none, url(#a))") is "filter(none, url(#a))"
+PASS innerStyle("background-image", "filter(none, url(#a))") is "filter(none, url(#a))"
+PASS innerStyle("background-image", "filter(none, url(#a) url(#b))") is "filter(none, url(#a) url(#b))"
+PASS innerStyle("background-image", "filter(none, grayscale(1) url(#a))") is "filter(none, grayscale(1) url(#a))"
+PASS innerStyle("background-image", "filter(none, grayscale(1))") is "filter(none, grayscale(1))"
+PASS innerStyle("background-image", "filter(none, grayscale(50%))") is "filter(none, grayscale(50%))"
+PASS innerStyle("background-image", "filter(none, grayscale(1.0))") is "filter(none, grayscale(1))"
+PASS innerStyle("background-image", "filter(none, grayscale(0))") is "filter(none, grayscale(0))"
+PASS innerStyle("background-image", "filter(none, grayscale(0.5) grayscale(0.25))") is "filter(none, grayscale(0.5) grayscale(0.25))"
+PASS innerStyle("background-image", "filter(none, sepia(1))") is "filter(none, sepia(1))"
+PASS innerStyle("background-image", "filter(none, sepia(50%))") is "filter(none, sepia(50%))"
+PASS innerStyle("background-image", "filter(none, sepia(1.0))") is "filter(none, sepia(1))"
+PASS innerStyle("background-image", "filter(none, sepia(0))") is "filter(none, sepia(0))"
+PASS innerStyle("background-image", "filter(none, sepia(0.5) sepia(0.25))") is "filter(none, sepia(0.5) sepia(0.25))"
+PASS innerStyle("background-image", "filter(none, sepia(0.5) grayscale(0.25))") is "filter(none, sepia(0.5) grayscale(0.25))"
+PASS innerStyle("background-image", "filter(none, saturate(1))") is "filter(none, saturate(1))"
+PASS innerStyle("background-image", "filter(none, saturate(50%))") is "filter(none, saturate(50%))"
+PASS innerStyle("background-image", "filter(none, saturate(250%))") is "filter(none, saturate(250%))"
+PASS innerStyle("background-image", "filter(none, saturate(1.0))") is "filter(none, saturate(1))"
+PASS innerStyle("background-image", "filter(none, saturate(5.5))") is "filter(none, saturate(5.5))"
+PASS innerStyle("background-image", "filter(none, saturate(0))") is "filter(none, saturate(0))"
+PASS innerStyle("background-image", "filter(none, saturate(0.5) saturate(0.25))") is "filter(none, saturate(0.5) saturate(0.25))"
+PASS innerStyle("background-image", "filter(none, saturate(0.5) grayscale(0.25))") is "filter(none, saturate(0.5) grayscale(0.25))"
+PASS innerStyle("background-image", "filter(none, hue-rotate(10deg))") is "filter(none, hue-rotate(10deg))"
+PASS innerStyle("background-image", "filter(none, hue-rotate(10.0deg))") is "filter(none, hue-rotate(10deg))"
+PASS innerStyle("background-image", "filter(none, hue-rotate(10rad))") is "filter(none, hue-rotate(10rad))"
+PASS innerStyle("background-image", "filter(none, hue-rotate(10grad))") is "filter(none, hue-rotate(10grad))"
+PASS innerStyle("background-image", "filter(none, hue-rotate(0.5turn))") is "filter(none, hue-rotate(0.5turn))"
+PASS innerStyle("background-image", "filter(none, hue-rotate(0))") is "filter(none, hue-rotate(0deg))"
+PASS innerStyle("background-image", "filter(none, hue-rotate(10deg) grayscale(0.25))") is "filter(none, hue-rotate(10deg) grayscale(0.25))"
+PASS innerStyle("background-image", "filter(none, invert(1))") is "filter(none, invert(1))"
+PASS innerStyle("background-image", "filter(none, invert(50%))") is "filter(none, invert(50%))"
+PASS innerStyle("background-image", "filter(none, invert(1.0))") is "filter(none, invert(1))"
+PASS innerStyle("background-image", "filter(none, invert(0))") is "filter(none, invert(0))"
+PASS innerStyle("background-image", "filter(none, invert(0.5) invert(0.25))") is "filter(none, invert(0.5) invert(0.25))"
+PASS innerStyle("background-image", "filter(none, invert(0.5) grayscale(0.25))") is "filter(none, invert(0.5) grayscale(0.25))"
+PASS innerStyle("background-image", "filter(none, opacity(1))") is "filter(none, opacity(1))"
+PASS innerStyle("background-image", "filter(none, opacity(50%))") is "filter(none, opacity(50%))"
+PASS innerStyle("background-image", "filter(none, opacity(1.0))") is "filter(none, opacity(1))"
+PASS innerStyle("background-image", "filter(none, opacity(0))") is "filter(none, opacity(0))"
+PASS innerStyle("background-image", "filter(none, opacity(0.5) opacity(0.25))") is "filter(none, opacity(0.5) opacity(0.25))"
+PASS innerStyle("background-image", "filter(none, opacity(0.5) grayscale(0.25))") is "filter(none, opacity(0.5) grayscale(0.25))"
+PASS innerStyle("background-image", "filter(none, brightness(1))") is "filter(none, brightness(1))"
+PASS innerStyle("background-image", "filter(none, brightness(50%))") is "filter(none, brightness(50%))"
+PASS innerStyle("background-image", "filter(none, brightness(1.0))") is "filter(none, brightness(1))"
+PASS innerStyle("background-image", "filter(none, brightness(0))") is "filter(none, brightness(0))"
+PASS innerStyle("background-image", "filter(none, brightness(0.5) brightness(0.25))") is "filter(none, brightness(0.5) brightness(0.25))"
+PASS innerStyle("background-image", "filter(none, brightness(0.5) grayscale(0.25))") is "filter(none, brightness(0.5) grayscale(0.25))"
+PASS innerStyle("background-image", "filter(none, brightness(-1.1))") is "filter(none, brightness(-1.1))"
+PASS innerStyle("background-image", "filter(none, brightness(101%))") is "filter(none, brightness(101%))"
+PASS innerStyle("background-image", "filter(none, grayscale(0.25) brightness(0.5))") is "filter(none, grayscale(0.25) brightness(0.5))"
+PASS innerStyle("background-image", "filter(none, contrast(1))") is "filter(none, contrast(1))"
+PASS innerStyle("background-image", "filter(none, contrast(50%))") is "filter(none, contrast(50%))"
+PASS innerStyle("background-image", "filter(none, contrast(250%))") is "filter(none, contrast(250%))"
+PASS innerStyle("background-image", "filter(none, contrast(1.0))") is "filter(none, contrast(1))"
+PASS innerStyle("background-image", "filter(none, contrast(0))") is "filter(none, contrast(0))"
+PASS innerStyle("background-image", "filter(none, contrast(2))") is "filter(none, contrast(2))"
+PASS innerStyle("background-image", "filter(none, contrast(0.5) contrast(0.25))") is "filter(none, contrast(0.5) contrast(0.25))"
+PASS innerStyle("background-image", "filter(none, contrast(0.5) grayscale(0.25))") is "filter(none, contrast(0.5) grayscale(0.25))"
+PASS innerStyle("background-image", "filter(none, grayscale(0.25) contrast(0.5))") is "filter(none, grayscale(0.25) contrast(0.5))"
+PASS innerStyle("background-image", "filter(none, blur(0))") is "filter(none, blur(0px))"
+PASS innerStyle("background-image", "filter(none, blur(10px))") is "filter(none, blur(10px))"
+PASS innerStyle("background-image", "filter(none, drop-shadow(red 1px 2px 3px))") is "filter(none, drop-shadow(red 1px 2px 3px))"
+PASS innerStyle("background-image", "filter(none, drop-shadow(1px 2px 3px red))") is "filter(none, drop-shadow(red 1px 2px 3px))"
+PASS innerStyle("background-image", "filter(none, drop-shadow(#abc 0 0 0))") is "filter(none, drop-shadow(rgb(170, 187, 204) 0px 0px 0px))"
+PASS innerStyle("background-image", "filter(none, drop-shadow(0 0 0))") is "filter(none, drop-shadow(0px 0px 0px))"
+PASS innerStyle("background-image", "filter(none, drop-shadow(1px 2px))") is "filter(none, drop-shadow(1px 2px))"
+PASS innerStyle("background-image", "filter(none, grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px))") is "filter(none, grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px))"
+PASS innerStyle("background-image", "filter(radial-gradient(ellipse closest-corner, white, black), hue-rotate(90deg))") is "filter(radial-gradient(closest-corner, white, black), hue-rotate(90deg))"
+PASS innerStyle("background-image", "filter(radial-gradient(circle closest-side at 50px 50%, white, black), hue-rotate(90deg))") is "filter(radial-gradient(circle closest-side at 50px 50%, white, black), hue-rotate(90deg))"
+PASS innerStyle("background-image", "filter(radial-gradient(ellipse closest-corner at 20px 50px, white, black), hue-rotate(90deg))") is "filter(radial-gradient(closest-corner at 20px 50px, white, black), hue-rotate(90deg))"
+PASS innerStyle("background-image", "filter(linear-gradient(white, black), hue-rotate(90deg))") is "filter(linear-gradient(white, black), hue-rotate(90deg))"
+PASS innerStyle("background-image", "filter(linear-gradient(to top left, white, black), hue-rotate(90deg))") is "filter(linear-gradient(to left top, white, black), hue-rotate(90deg))"
+PASS innerStyle("background-image", "filter(linear-gradient(0deg, white -20%, blue, black 120%), hue-rotate(90deg))") is "filter(linear-gradient(0deg, white -20%, blue, black 120%), hue-rotate(90deg))"
+PASS innerStyle("background-image", "filter(-webkit-cross-fade(url(http://image1.png), url(http://image2.png), 50%), contrast(0.5))") is "filter(-webkit-cross-fade(url(http://image1.png/), url(http://image2.png/), 0.5), contrast(0.5))"
+PASS innerStyle("background-image", "filter(url(http://image1.png), brightness(50%))") is "filter(url(http://image1.png/), brightness(50%))"
+PASS innerStyle("background-image", "filter('http://image1.png', brightness(50%))") is "filter(url(http://image1.png/), brightness(50%))"
+PASS innerStyle("border-image-source", "filter(url(http://image1.png), invert(50%))") is "filter(url(http://image1.png/), invert(50%))"
+PASS innerStyle("-webkit-mask-image", "filter(url(http://image1.png), invert(50%))") is "filter(url(http://image1.png/), invert(50%))"
+PASS innerStyle("-webkit-mask-box-image-source", "filter(url(http://image1.png), invert(50%))") is "filter(url(http://image1.png/), invert(50%))"
+PASS innerStyle("content", "filter(url(http://image1.png), invert(50%))") is "filter(url(http://image1.png/), invert(50%))"
+PASS innerStyle("background-image", "filter()") is ""
+PASS computedStyle("background-image", "filter()") is "none"
+PASS innerStyle("background-image", "filter(url(image1.png))") is ""
+PASS computedStyle("background-image", "filter(url(image1.png))") is "none"
+PASS innerStyle("background-image", "filter(url(image1.png), )") is ""
+PASS computedStyle("background-image", "filter(url(image1.png), )") is "none"
+PASS innerStyle("background-image", "filter(url(image1.png) brightness(50%))") is ""
+PASS computedStyle("background-image", "filter(url(image1.png) brightness(50%))") is "none"
+PASS innerStyle("background-image", "filter(brightness(50%) url(image1.png))") is ""
+PASS computedStyle("background-image", "filter(brightness(50%) url(image1.png))") is "none"
+PASS innerStyle("background-image", "filter(brightness(50%), url(image1.png))") is ""
+PASS computedStyle("background-image", "filter(brightness(50%), url(image1.png))") is "none"
+PASS innerStyle("background-image", "filter(url(image1.png) url(#filter))") is ""
+PASS computedStyle("background-image", "filter(url(image1.png) url(#filter))") is "none"
+PASS innerStyle("background-image", "filter(brightness(50%))") is ""
+PASS computedStyle("background-image", "filter(brightness(50%))") is "none"
+PASS innerStyle("background-image", "filter(brightness(50%), )") is ""
+PASS computedStyle("background-image", "filter(brightness(50%), )") is "none"
+PASS innerStyle("background-image", "filter(url(image1.png), brightness(50%), brightness(50%))") is ""
+PASS computedStyle("background-image", "filter(url(image1.png), brightness(50%), brightness(50%))") is "none"
+PASS innerStyle("background-image", "filter(url(image1.png) url(image2.png), brightness(50%))") is ""
+PASS computedStyle("background-image", "filter(url(image1.png) url(image2.png), brightness(50%))") is "none"
+PASS innerStyle("background-image", "filter(url(image1.png), url(image2.png), brightness(50%))") is ""
+PASS computedStyle("background-image", "filter(url(image1.png), url(image2.png), brightness(50%))") is "none"
+PASS innerStyle("background-image", "filter(invalidToken.png, blur(3px))") is ""
+PASS computedStyle("background-image", "filter(invalidToken.png, blur(3px))") is "none"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastfilterimageparsefilterimagehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/parse-filter-image.html (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/parse-filter-image.html 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/filter-image/parse-filter-image.html 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -44,351 +44,351 @@
</span><span class="cx"> // Test different filter combination.
</span><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, blur(3px))",
- "-webkit-filter(none, blur(3px))");
</del><ins>+ "filter(none, blur(3px))",
+ "filter(none, blur(3px))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, url(#a))",
- "-webkit-filter(none, url(#a))");
</del><ins>+ "filter(none, url(#a))",
+ "filter(none, url(#a))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, url(#a))",
- "-webkit-filter(none, url(#a))");
</del><ins>+ "filter(none, url(#a))",
+ "filter(none, url(#a))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, url(#a) url(#b))",
- "-webkit-filter(none, url(#a) url(#b))");
</del><ins>+ "filter(none, url(#a) url(#b))",
+ "filter(none, url(#a) url(#b))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(1) url(#a))",
- "-webkit-filter(none, grayscale(1) url(#a))");
</del><ins>+ "filter(none, grayscale(1) url(#a))",
+ "filter(none, grayscale(1) url(#a))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(1))",
- "-webkit-filter(none, grayscale(1))");
</del><ins>+ "filter(none, grayscale(1))",
+ "filter(none, grayscale(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(50%))",
- "-webkit-filter(none, grayscale(50%))");
</del><ins>+ "filter(none, grayscale(50%))",
+ "filter(none, grayscale(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(1.0))",
- "-webkit-filter(none, grayscale(1))");
</del><ins>+ "filter(none, grayscale(1.0))",
+ "filter(none, grayscale(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(0))",
- "-webkit-filter(none, grayscale(0))");
</del><ins>+ "filter(none, grayscale(0))",
+ "filter(none, grayscale(0))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(0.5) grayscale(0.25))",
- "-webkit-filter(none, grayscale(0.5) grayscale(0.25))");
</del><ins>+ "filter(none, grayscale(0.5) grayscale(0.25))",
+ "filter(none, grayscale(0.5) grayscale(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, sepia(1))",
- "-webkit-filter(none, sepia(1))");
</del><ins>+ "filter(none, sepia(1))",
+ "filter(none, sepia(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, sepia(50%))",
- "-webkit-filter(none, sepia(50%))");
</del><ins>+ "filter(none, sepia(50%))",
+ "filter(none, sepia(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, sepia(1.0))",
- "-webkit-filter(none, sepia(1))");
</del><ins>+ "filter(none, sepia(1.0))",
+ "filter(none, sepia(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, sepia(0))",
- "-webkit-filter(none, sepia(0))");
</del><ins>+ "filter(none, sepia(0))",
+ "filter(none, sepia(0))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, sepia(0.5) sepia(0.25))",
- "-webkit-filter(none, sepia(0.5) sepia(0.25))");
</del><ins>+ "filter(none, sepia(0.5) sepia(0.25))",
+ "filter(none, sepia(0.5) sepia(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, sepia(0.5) grayscale(0.25))",
- "-webkit-filter(none, sepia(0.5) grayscale(0.25))");
</del><ins>+ "filter(none, sepia(0.5) grayscale(0.25))",
+ "filter(none, sepia(0.5) grayscale(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, saturate(1))",
- "-webkit-filter(none, saturate(1))");
</del><ins>+ "filter(none, saturate(1))",
+ "filter(none, saturate(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, saturate(50%))",
- "-webkit-filter(none, saturate(50%))");
</del><ins>+ "filter(none, saturate(50%))",
+ "filter(none, saturate(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, saturate(250%))",
- "-webkit-filter(none, saturate(250%))");
</del><ins>+ "filter(none, saturate(250%))",
+ "filter(none, saturate(250%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, saturate(1.0))",
- "-webkit-filter(none, saturate(1))");
</del><ins>+ "filter(none, saturate(1.0))",
+ "filter(none, saturate(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, saturate(5.5))",
- "-webkit-filter(none, saturate(5.5))");
</del><ins>+ "filter(none, saturate(5.5))",
+ "filter(none, saturate(5.5))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, saturate(0))",
- "-webkit-filter(none, saturate(0))");
</del><ins>+ "filter(none, saturate(0))",
+ "filter(none, saturate(0))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, saturate(0.5) saturate(0.25))",
- "-webkit-filter(none, saturate(0.5) saturate(0.25))");
</del><ins>+ "filter(none, saturate(0.5) saturate(0.25))",
+ "filter(none, saturate(0.5) saturate(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, saturate(0.5) grayscale(0.25))",
- "-webkit-filter(none, saturate(0.5) grayscale(0.25))");
</del><ins>+ "filter(none, saturate(0.5) grayscale(0.25))",
+ "filter(none, saturate(0.5) grayscale(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, hue-rotate(10deg))",
- "-webkit-filter(none, hue-rotate(10deg))");
</del><ins>+ "filter(none, hue-rotate(10deg))",
+ "filter(none, hue-rotate(10deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, hue-rotate(10.0deg))",
- "-webkit-filter(none, hue-rotate(10deg))");
</del><ins>+ "filter(none, hue-rotate(10.0deg))",
+ "filter(none, hue-rotate(10deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, hue-rotate(10rad))",
- "-webkit-filter(none, hue-rotate(10rad))");
</del><ins>+ "filter(none, hue-rotate(10rad))",
+ "filter(none, hue-rotate(10rad))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, hue-rotate(10grad))",
- "-webkit-filter(none, hue-rotate(10grad))");
</del><ins>+ "filter(none, hue-rotate(10grad))",
+ "filter(none, hue-rotate(10grad))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, hue-rotate(0.5turn))",
- "-webkit-filter(none, hue-rotate(0.5turn))");
</del><ins>+ "filter(none, hue-rotate(0.5turn))",
+ "filter(none, hue-rotate(0.5turn))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, hue-rotate(0))",
- "-webkit-filter(none, hue-rotate(0deg))");
</del><ins>+ "filter(none, hue-rotate(0))",
+ "filter(none, hue-rotate(0deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, hue-rotate(10deg) grayscale(0.25))",
- "-webkit-filter(none, hue-rotate(10deg) grayscale(0.25))");
</del><ins>+ "filter(none, hue-rotate(10deg) grayscale(0.25))",
+ "filter(none, hue-rotate(10deg) grayscale(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, invert(1))",
- "-webkit-filter(none, invert(1))");
</del><ins>+ "filter(none, invert(1))",
+ "filter(none, invert(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, invert(50%))",
- "-webkit-filter(none, invert(50%))");
</del><ins>+ "filter(none, invert(50%))",
+ "filter(none, invert(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, invert(1.0))",
- "-webkit-filter(none, invert(1))");
</del><ins>+ "filter(none, invert(1.0))",
+ "filter(none, invert(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, invert(0))",
- "-webkit-filter(none, invert(0))");
</del><ins>+ "filter(none, invert(0))",
+ "filter(none, invert(0))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, invert(0.5) invert(0.25))",
- "-webkit-filter(none, invert(0.5) invert(0.25))");
</del><ins>+ "filter(none, invert(0.5) invert(0.25))",
+ "filter(none, invert(0.5) invert(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, invert(0.5) grayscale(0.25))",
- "-webkit-filter(none, invert(0.5) grayscale(0.25))");
</del><ins>+ "filter(none, invert(0.5) grayscale(0.25))",
+ "filter(none, invert(0.5) grayscale(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, opacity(1))",
- "-webkit-filter(none, opacity(1))");
</del><ins>+ "filter(none, opacity(1))",
+ "filter(none, opacity(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, opacity(50%))",
- "-webkit-filter(none, opacity(50%))");
</del><ins>+ "filter(none, opacity(50%))",
+ "filter(none, opacity(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, opacity(1.0))",
- "-webkit-filter(none, opacity(1))");
</del><ins>+ "filter(none, opacity(1.0))",
+ "filter(none, opacity(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, opacity(0))",
- "-webkit-filter(none, opacity(0))");
</del><ins>+ "filter(none, opacity(0))",
+ "filter(none, opacity(0))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, opacity(0.5) opacity(0.25))",
- "-webkit-filter(none, opacity(0.5) opacity(0.25))");
</del><ins>+ "filter(none, opacity(0.5) opacity(0.25))",
+ "filter(none, opacity(0.5) opacity(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, opacity(0.5) grayscale(0.25))",
- "-webkit-filter(none, opacity(0.5) grayscale(0.25))");
</del><ins>+ "filter(none, opacity(0.5) grayscale(0.25))",
+ "filter(none, opacity(0.5) grayscale(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, brightness(1))",
- "-webkit-filter(none, brightness(1))");
</del><ins>+ "filter(none, brightness(1))",
+ "filter(none, brightness(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, brightness(50%))",
- "-webkit-filter(none, brightness(50%))");
</del><ins>+ "filter(none, brightness(50%))",
+ "filter(none, brightness(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, brightness(1.0))",
- "-webkit-filter(none, brightness(1))");
</del><ins>+ "filter(none, brightness(1.0))",
+ "filter(none, brightness(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, brightness(0))",
- "-webkit-filter(none, brightness(0))");
</del><ins>+ "filter(none, brightness(0))",
+ "filter(none, brightness(0))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, brightness(0.5) brightness(0.25))",
- "-webkit-filter(none, brightness(0.5) brightness(0.25))");
</del><ins>+ "filter(none, brightness(0.5) brightness(0.25))",
+ "filter(none, brightness(0.5) brightness(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, brightness(0.5) grayscale(0.25))",
- "-webkit-filter(none, brightness(0.5) grayscale(0.25))");
</del><ins>+ "filter(none, brightness(0.5) grayscale(0.25))",
+ "filter(none, brightness(0.5) grayscale(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, brightness(-1.1))",
- "-webkit-filter(none, brightness(-1.1))");
</del><ins>+ "filter(none, brightness(-1.1))",
+ "filter(none, brightness(-1.1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, brightness(101%))",
- "-webkit-filter(none, brightness(101%))");
</del><ins>+ "filter(none, brightness(101%))",
+ "filter(none, brightness(101%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(0.25) brightness(0.5))",
- "-webkit-filter(none, grayscale(0.25) brightness(0.5))");
</del><ins>+ "filter(none, grayscale(0.25) brightness(0.5))",
+ "filter(none, grayscale(0.25) brightness(0.5))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, contrast(1))",
- "-webkit-filter(none, contrast(1))");
</del><ins>+ "filter(none, contrast(1))",
+ "filter(none, contrast(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, contrast(50%))",
- "-webkit-filter(none, contrast(50%))");
</del><ins>+ "filter(none, contrast(50%))",
+ "filter(none, contrast(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, contrast(250%))",
- "-webkit-filter(none, contrast(250%))");
</del><ins>+ "filter(none, contrast(250%))",
+ "filter(none, contrast(250%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, contrast(1.0))",
- "-webkit-filter(none, contrast(1))");
</del><ins>+ "filter(none, contrast(1.0))",
+ "filter(none, contrast(1))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, contrast(0))",
- "-webkit-filter(none, contrast(0))");
</del><ins>+ "filter(none, contrast(0))",
+ "filter(none, contrast(0))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, contrast(2))",
- "-webkit-filter(none, contrast(2))");
</del><ins>+ "filter(none, contrast(2))",
+ "filter(none, contrast(2))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, contrast(0.5) contrast(0.25))",
- "-webkit-filter(none, contrast(0.5) contrast(0.25))");
</del><ins>+ "filter(none, contrast(0.5) contrast(0.25))",
+ "filter(none, contrast(0.5) contrast(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, contrast(0.5) grayscale(0.25))",
- "-webkit-filter(none, contrast(0.5) grayscale(0.25))");
</del><ins>+ "filter(none, contrast(0.5) grayscale(0.25))",
+ "filter(none, contrast(0.5) grayscale(0.25))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(0.25) contrast(0.5))",
- "-webkit-filter(none, grayscale(0.25) contrast(0.5))");
</del><ins>+ "filter(none, grayscale(0.25) contrast(0.5))",
+ "filter(none, grayscale(0.25) contrast(0.5))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, blur(0))",
- "-webkit-filter(none, blur(0px))");
</del><ins>+ "filter(none, blur(0))",
+ "filter(none, blur(0px))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, blur(10px))",
- "-webkit-filter(none, blur(10px))");
</del><ins>+ "filter(none, blur(10px))",
+ "filter(none, blur(10px))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, drop-shadow(red 1px 2px 3px))",
- "-webkit-filter(none, drop-shadow(red 1px 2px 3px))");
</del><ins>+ "filter(none, drop-shadow(red 1px 2px 3px))",
+ "filter(none, drop-shadow(red 1px 2px 3px))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, drop-shadow(1px 2px 3px red))",
- "-webkit-filter(none, drop-shadow(red 1px 2px 3px))");
</del><ins>+ "filter(none, drop-shadow(1px 2px 3px red))",
+ "filter(none, drop-shadow(red 1px 2px 3px))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, drop-shadow(#abc 0 0 0))",
- "-webkit-filter(none, drop-shadow(rgb(170, 187, 204) 0px 0px 0px))");
</del><ins>+ "filter(none, drop-shadow(#abc 0 0 0))",
+ "filter(none, drop-shadow(rgb(170, 187, 204) 0px 0px 0px))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, drop-shadow(0 0 0))",
- "-webkit-filter(none, drop-shadow(0px 0px 0px))");
</del><ins>+ "filter(none, drop-shadow(0 0 0))",
+ "filter(none, drop-shadow(0px 0px 0px))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, drop-shadow(1px 2px))",
- "-webkit-filter(none, drop-shadow(1px 2px))");
</del><ins>+ "filter(none, drop-shadow(1px 2px))",
+ "filter(none, drop-shadow(1px 2px))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px))",
- "-webkit-filter(none, grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px))");
</del><ins>+ "filter(none, grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px))",
+ "filter(none, grayscale(0.5) sepia(0.25) saturate(0.75) hue-rotate(35deg) invert(0.2) opacity(0.9) blur(5px) drop-shadow(green 1px 2px 3px))");
</ins><span class="cx">
</span><span class="cx"> // Test different CSS Image values.
</span><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(radial-gradient(ellipse closest-corner, white, black), hue-rotate(90deg))",
- "-webkit-filter(radial-gradient(closest-corner, white, black), hue-rotate(90deg))");
</del><ins>+ "filter(radial-gradient(ellipse closest-corner, white, black), hue-rotate(90deg))",
+ "filter(radial-gradient(closest-corner, white, black), hue-rotate(90deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(radial-gradient(circle closest-side at 50px 50%, white, black), hue-rotate(90deg))",
- "-webkit-filter(radial-gradient(circle closest-side at 50px 50%, white, black), hue-rotate(90deg))");
</del><ins>+ "filter(radial-gradient(circle closest-side at 50px 50%, white, black), hue-rotate(90deg))",
+ "filter(radial-gradient(circle closest-side at 50px 50%, white, black), hue-rotate(90deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(radial-gradient(ellipse closest-corner at 20px 50px, white, black), hue-rotate(90deg))",
- "-webkit-filter(radial-gradient(closest-corner at 20px 50px, white, black), hue-rotate(90deg))");
</del><ins>+ "filter(radial-gradient(ellipse closest-corner at 20px 50px, white, black), hue-rotate(90deg))",
+ "filter(radial-gradient(closest-corner at 20px 50px, white, black), hue-rotate(90deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(linear-gradient(white, black), hue-rotate(90deg))",
- "-webkit-filter(linear-gradient(white, black), hue-rotate(90deg))");
</del><ins>+ "filter(linear-gradient(white, black), hue-rotate(90deg))",
+ "filter(linear-gradient(white, black), hue-rotate(90deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(linear-gradient(to top left, white, black), hue-rotate(90deg))",
- "-webkit-filter(linear-gradient(to left top, white, black), hue-rotate(90deg))");
</del><ins>+ "filter(linear-gradient(to top left, white, black), hue-rotate(90deg))",
+ "filter(linear-gradient(to left top, white, black), hue-rotate(90deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(linear-gradient(0deg, white -20%, blue, black 120%), hue-rotate(90deg))",
- "-webkit-filter(linear-gradient(0deg, white -20%, blue, black 120%), hue-rotate(90deg))");
</del><ins>+ "filter(linear-gradient(0deg, white -20%, blue, black 120%), hue-rotate(90deg))",
+ "filter(linear-gradient(0deg, white -20%, blue, black 120%), hue-rotate(90deg))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(-webkit-cross-fade(url(http://image1.png), url(http://image2.png), 50%), contrast(0.5))",
- "-webkit-filter(-webkit-cross-fade(url(http://image1.png/), url(http://image2.png/), 0.5), contrast(0.5))");
</del><ins>+ "filter(-webkit-cross-fade(url(http://image1.png), url(http://image2.png), 50%), contrast(0.5))",
+ "filter(-webkit-cross-fade(url(http://image1.png/), url(http://image2.png/), 0.5), contrast(0.5))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(url(http://image1.png), brightness(50%))",
- "-webkit-filter(url(http://image1.png/), brightness(50%))");
</del><ins>+ "filter(url(http://image1.png), brightness(50%))",
+ "filter(url(http://image1.png/), brightness(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter('http://image1.png', brightness(50%))",
- "-webkit-filter(url(http://image1.png/), brightness(50%))");
</del><ins>+ "filter('http://image1.png', brightness(50%))",
+ "filter(url(http://image1.png/), brightness(50%))");
</ins><span class="cx">
</span><span class="cx"> // Test different properties, taking CSS Image values.
</span><span class="cx"> testInner(
</span><span class="cx"> "border-image-source",
</span><del>- "-webkit-filter(url(http://image1.png), invert(50%))",
- "-webkit-filter(url(http://image1.png/), invert(50%))");
</del><ins>+ "filter(url(http://image1.png), invert(50%))",
+ "filter(url(http://image1.png/), invert(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "-webkit-mask-image",
</span><del>- "-webkit-filter(url(http://image1.png), invert(50%))",
- "-webkit-filter(url(http://image1.png/), invert(50%))");
</del><ins>+ "filter(url(http://image1.png), invert(50%))",
+ "filter(url(http://image1.png/), invert(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "-webkit-mask-box-image-source",
</span><del>- "-webkit-filter(url(http://image1.png), invert(50%))",
- "-webkit-filter(url(http://image1.png/), invert(50%))");
</del><ins>+ "filter(url(http://image1.png), invert(50%))",
+ "filter(url(http://image1.png/), invert(50%))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "content",
</span><del>- "-webkit-filter(url(http://image1.png), invert(50%))",
- "-webkit-filter(url(http://image1.png/), invert(50%))");
</del><ins>+ "filter(url(http://image1.png), invert(50%))",
+ "filter(url(http://image1.png/), invert(50%))");
</ins><span class="cx">
</span><span class="cx"> // negative tests
</span><del>-negativeTest("background-image", "-webkit-filter()");
-negativeTest("background-image", "-webkit-filter(url(image1.png))");
-negativeTest("background-image", "-webkit-filter(url(image1.png), )");
-negativeTest("background-image", "-webkit-filter(url(image1.png) brightness(50%))");
-negativeTest("background-image", "-webkit-filter(brightness(50%) url(image1.png))");
-negativeTest("background-image", "-webkit-filter(brightness(50%), url(image1.png))");
-negativeTest("background-image", "-webkit-filter(url(image1.png) url(#filter))");
-negativeTest("background-image", "-webkit-filter(brightness(50%))");
-negativeTest("background-image", "-webkit-filter(brightness(50%), )");
-negativeTest("background-image", "-webkit-filter(url(image1.png), brightness(50%), brightness(50%))");
-negativeTest("background-image", "-webkit-filter(url(image1.png) url(image2.png), brightness(50%))");
-negativeTest("background-image", "-webkit-filter(url(image1.png), url(image2.png), brightness(50%))");
-negativeTest("background-image", "-webkit-filter(invalidToken.png, blur(3px))");
</del><ins>+negativeTest("background-image", "filter()");
+negativeTest("background-image", "filter(url(image1.png))");
+negativeTest("background-image", "filter(url(image1.png), )");
+negativeTest("background-image", "filter(url(image1.png) brightness(50%))");
+negativeTest("background-image", "filter(brightness(50%) url(image1.png))");
+negativeTest("background-image", "filter(brightness(50%), url(image1.png))");
+negativeTest("background-image", "filter(url(image1.png) url(#filter))");
+negativeTest("background-image", "filter(brightness(50%))");
+negativeTest("background-image", "filter(brightness(50%), )");
+negativeTest("background-image", "filter(url(image1.png), brightness(50%), brightness(50%))");
+negativeTest("background-image", "filter(url(image1.png) url(image2.png), brightness(50%))");
+negativeTest("background-image", "filter(url(image1.png), url(image2.png), brightness(50%))");
+negativeTest("background-image", "filter(invalidToken.png, blur(3px))");
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -300,6 +300,8 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(align-items) : [object CSSValueList]
</span><span class="cx"> rect: style.getPropertyValue(align-self) : start
</span><span class="cx"> rect: style.getPropertyCSSValue(align-self) : [object CSSValueList]
</span><ins>+rect: style.getPropertyValue(filter) : none
+rect: style.getPropertyCSSValue(filter) : [object CSSPrimitiveValue]
</ins><span class="cx"> rect: style.getPropertyValue(flex-direction) : row
</span><span class="cx"> rect: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(flex-wrap) : nowrap
</span><span class="lines">@@ -804,6 +806,8 @@
</span><span class="cx"> g: style.getPropertyCSSValue(align-items) : [object CSSValueList]
</span><span class="cx"> g: style.getPropertyValue(align-self) : start
</span><span class="cx"> g: style.getPropertyCSSValue(align-self) : [object CSSValueList]
</span><ins>+g: style.getPropertyValue(filter) : none
+g: style.getPropertyCSSValue(filter) : [object CSSPrimitiveValue]
</ins><span class="cx"> g: style.getPropertyValue(flex-direction) : row
</span><span class="cx"> g: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(flex-wrap) : nowrap
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1,5 +1,106 @@
</span><span class="cx"> 2015-11-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188647. rdar://problem/23432373
+
+ 2015-08-18 Dean Jackson <dino@apple.com>
+
+ Support CSS filters without webkit prefix
+ https://bugs.webkit.org/show_bug.cgi?id=148138
+ <rdar://problem/22331434>
+
+ Reviewed by Sam Weinig.
+
+ Add support for the un-prefixed form of the CSS filter property.
+ This was straightforward for the general case on HTML content.
+ It was a bit more tricky on SVG content, where there already
+ was an existing "filter" property/attribute. The parsing
+ code is now shared between SVG and HTML, as is the
+ computed style output.
+
+ Covered by updating the existing tests, and
+ adding one new test: css3/filters/unprefixed.html
+
+ * css/CSSComputedStyleDeclaration.cpp: Rename CSSPropertyWebkitFilter to CSSPropertyFilter.
+ (WebCore::isLayoutDependent):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+
+ * css/CSSFilterImageValue.cpp:
+ (WebCore::CSSFilterImageValue::customCSSText): Use "filter(" as the prefix.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue): Rename CSSPropertyWebkitFilter to CSSPropertyFilter.
+ (WebCore::CSSParser::isGeneratedImageValue): Add support for "filter()".
+ (WebCore::CSSParser::parseGeneratedImage): Ditto.
+ (WebCore::CSSParser::parseBuiltinFilterArguments):
+
+ * css/CSSPropertyNames.in: Add filter. Make -webkit-filter an alias.
+
+ * css/SVGCSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::svgPropertyValue): Deleted.
+
+ * page/animation/CSSPropertyAnimation.cpp: Rename CSSPropertyWebkitFilter to CSSPropertyFilter.
+ (WebCore::PropertyWrapperAcceleratedFilter::PropertyWrapperAcceleratedFilter):
+ * page/animation/KeyframeAnimation.cpp: Ditto.
+ (WebCore::KeyframeAnimation::checkForMatchingFilterFunctionLists):
+
+ * platform/graphics/GraphicsLayer.cpp: Rename AnimatedPropertyWebkitFilter to AnimatedPropertyFilter.
+ (WebCore::GraphicsLayer::validateFilterOperations):
+ * platform/graphics/GraphicsLayerClient.h: Ditto.
+ * platform/graphics/ca/GraphicsLayerCA.cpp: Ditto.
+ (WebCore::GraphicsLayerCA::moveOrCopyAnimations):
+ (WebCore::GraphicsLayerCA::addAnimation):
+ (WebCore::GraphicsLayerCA::createAnimationFromKeyframes):
+ (WebCore::GraphicsLayerCA::createFilterAnimationsFromKeyframes):
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateOrRemoveFilterClients): SVG manages its own filter resources,
+ so we shouldn't add a layer that has an SVG root to the filter clients.
+
+ * rendering/RenderLayerBacking.cpp: Renaming.
+ (WebCore::RenderLayerBacking::startAnimation):
+ (WebCore::RenderLayerBacking::startTransition):
+ (WebCore::RenderLayerBacking::graphicsLayerToCSSProperty):
+ (WebCore::RenderLayerBacking::cssToGraphicsLayerProperty):
+ * rendering/RenderLayerCompositor.cpp: Ditto.
+ (WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
+
+ * rendering/style/SVGRenderStyle.h: Remove the SVG filter style.
+ (WebCore::SVGRenderStyle::isolatesBlending): No need to check for hasFilter().
+ (WebCore::SVGRenderStyle::initialFilterResource): Deleted.
+ (WebCore::SVGRenderStyle::setFilterResource): Deleted.
+ (WebCore::SVGRenderStyle::filterResource): Deleted.
+ (WebCore::SVGRenderStyle::hasFilter): Deleted.
+
+ * rendering/style/SVGRenderStyleDefs.cpp: Remove the filter resource.
+ (WebCore::StyleResourceData::StyleResourceData): Deleted.
+ (WebCore::StyleResourceData::operator==): Deleted.
+ * rendering/style/SVGRenderStyleDefs.h:
+
+ * rendering/style/WillChangeData.cpp: Renaming.
+ (WebCore::propertyCreatesStackingContext):
+ (WebCore::propertyTriggersCompositing):
+
+ * rendering/svg/SVGRenderSupport.cpp:
+ (WebCore::SVGRenderSupport::isolatesBlending): Since SVGRenderStyle no longer checks
+ hasFilter() in its isolatesBlending(), we need to do it here.
+
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+
+ * rendering/svg/SVGRenderTreeAsText.cpp:
+ (WebCore::writeResources): Dump from the CSS style value.
+ * rendering/svg/SVGResources.cpp: Ditto.
+ (WebCore::SVGResources::buildCachedResources):
+ * rendering/svg/SVGResources.h:
+ * rendering/svg/SVGResourcesCache.cpp:
+ (WebCore::SVGResourcesCache::addResourcesFromRenderer):
+
+ * platform/graphics/texmap/TextureMapperLayer.cpp: Renaming.
+ * platform/graphics/texmap/TextureMapperAnimation.cpp:
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+
+2015-11-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188530. rdar://problem/23432371
</span><span class="cx">
</span><span class="cx"> 2015-08-17 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -305,6 +305,7 @@
</span><span class="cx"> CSSPropertyAlignContent,
</span><span class="cx"> CSSPropertyAlignItems,
</span><span class="cx"> CSSPropertyAlignSelf,
</span><ins>+ CSSPropertyFilter,
</ins><span class="cx"> CSSPropertyFlexBasis,
</span><span class="cx"> CSSPropertyFlexGrow,
</span><span class="cx"> CSSPropertyFlexShrink,
</span><span class="lines">@@ -313,7 +314,6 @@
</span><span class="cx"> CSSPropertyJustifyContent,
</span><span class="cx"> CSSPropertyJustifySelf,
</span><span class="cx"> CSSPropertyJustifyItems,
</span><del>- CSSPropertyWebkitFilter,
</del><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> CSSPropertyWebkitBackdropFilter,
</span><span class="cx"> #endif
</span><span class="lines">@@ -1682,7 +1682,7 @@
</span><span class="cx"> case CSSPropertyPerspectiveOrigin:
</span><span class="cx"> case CSSPropertyTransformOrigin:
</span><span class="cx"> case CSSPropertyTransform:
</span><del>- case CSSPropertyWebkitFilter:
</del><ins>+ case CSSPropertyFilter:
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case CSSPropertyWebkitBackdropFilter:
</span><span class="cx"> #endif
</span><span class="lines">@@ -3102,7 +3102,7 @@
</span><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> return shapePropertyValue(*style, style->shapeOutside());
</span><span class="cx"> #endif
</span><del>- case CSSPropertyWebkitFilter:
</del><ins>+ case CSSPropertyFilter:
</ins><span class="cx"> return valueForFilter(*style, style->filter());
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case CSSPropertyWebkitBackdropFilter:
</span><span class="lines">@@ -3306,7 +3306,6 @@
</span><span class="cx"> case CSSPropertyClipRule:
</span><span class="cx"> case CSSPropertyMask:
</span><span class="cx"> case CSSPropertyEnableBackground:
</span><del>- case CSSPropertyFilter:
</del><span class="cx"> case CSSPropertyFloodColor:
</span><span class="cx"> case CSSPropertyFloodOpacity:
</span><span class="cx"> case CSSPropertyLightingColor:
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSFilterImageValue.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSFilterImageValue.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSFilterImageValue.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> String CSSFilterImageValue::customCSSText() const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><del>- result.appendLiteral("-webkit-filter(");
</del><ins>+ result.appendLiteral("filter(");
</ins><span class="cx"> result.append(m_imageValue->cssText());
</span><span class="cx"> result.appendLiteral(", ");
</span><span class="cx"> result.append(m_filterValue->cssText());
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -2512,7 +2512,7 @@
</span><span class="cx"> case CSSPropertyWebkitBoxOrdinalGroup:
</span><span class="cx"> validPrimitive = validateUnit(valueWithCalculation, FInteger | FNonNeg, CSSStrictMode) && valueWithCalculation.value().fValue;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitFilter:
</del><ins>+ case CSSPropertyFilter:
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case CSSPropertyWebkitBackdropFilter:
</span><span class="cx"> #endif
</span><span class="lines">@@ -9144,6 +9144,7 @@
</span><span class="cx"> || equalIgnoringCase(value.function->name, "repeating-radial-gradient(")
</span><span class="cx"> || equalIgnoringCase(value.function->name, "-webkit-canvas(")
</span><span class="cx"> || equalIgnoringCase(value.function->name, "-webkit-cross-fade(")
</span><ins>+ || equalIgnoringCase(value.function->name, "filter(")
</ins><span class="cx"> || equalIgnoringCase(value.function->name, "-webkit-filter(")
</span><span class="cx"> || equalIgnoringCase(value.function->name, "-webkit-named-image(");
</span><span class="cx"> }
</span><span class="lines">@@ -9188,7 +9189,7 @@
</span><span class="cx"> if (equalIgnoringCase(parserValue.function->name, "-webkit-cross-fade("))
</span><span class="cx"> return parseCrossfade(valueList, value);
</span><span class="cx">
</span><del>- if (equalIgnoringCase(parserValue.function->name, "-webkit-filter("))
</del><ins>+ if (equalIgnoringCase(parserValue.function->name, "filter(") || equalIgnoringCase(parserValue.function->name, "-webkit-filter("))
</ins><span class="cx"> return parseFilterImage(valueList, value);
</span><span class="cx">
</span><span class="cx"> if (equalIgnoringCase(parserValue.function->name, "-webkit-named-image("))
</span><span class="lines">@@ -9866,7 +9867,7 @@
</span><span class="cx"> }
</span><span class="cx"> case WebKitCSSFilterValue::DropShadowFilterOperation: {
</span><span class="cx"> // drop-shadow() takes a single shadow.
</span><del>- RefPtr<CSSValueList> shadowValueList = parseShadow(args, CSSPropertyWebkitFilter);
</del><ins>+ RefPtr<CSSValueList> shadowValueList = parseShadow(args, CSSPropertyFilter);
</ins><span class="cx"> if (!shadowValueList || shadowValueList->length() != 1)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -218,7 +218,6 @@
</span><span class="cx"> fill [Inherited, SVG, Custom=All]
</span><span class="cx"> fill-opacity [Inherited, SVG, Converter=Opacity]
</span><span class="cx"> fill-rule [Inherited, SVG]
</span><del>-filter [SVG, Converter=SVGURIReference, NameForMethods=FilterResource]
</del><span class="cx"> float [NameForMethods=Floating]
</span><span class="cx"> flood-color [SVG, Converter=SVGColor]
</span><span class="cx"> flood-opacity [SVG, Converter=Opacity]
</span><span class="lines">@@ -453,7 +452,8 @@
</span><span class="cx"> mix-blend-mode [NameForMethods=BlendMode]
</span><span class="cx"> isolation
</span><span class="cx"> #endif
</span><del>--webkit-filter [ConditionalConverter=FilterOperations]
</del><ins>+filter [ConditionalConverter=FilterOperations]
+-webkit-filter = filter
</ins><span class="cx"> align-content [Initial=initialContentAlignment, Converter=ContentAlignmentData]
</span><span class="cx"> -webkit-align-content = align-content
</span><span class="cx"> align-items [Initial=initialSelfAlignment, Converter=SelfOrDefaultAlignmentData]
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssSVGCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -160,10 +160,6 @@
</span><span class="cx"> if (!svgStyle.maskerResource().isEmpty())
</span><span class="cx"> return CSSPrimitiveValue::create(svgStyle.maskerResource(), CSSPrimitiveValue::CSS_URI);
</span><span class="cx"> return CSSPrimitiveValue::createIdentifier(CSSValueNone);
</span><del>- case CSSPropertyFilter:
- if (!svgStyle.filterResource().isEmpty())
- return CSSPrimitiveValue::create(svgStyle.filterResource(), CSSPrimitiveValue::CSS_URI);
- return CSSPrimitiveValue::createIdentifier(CSSValueNone);
</del><span class="cx"> case CSSPropertyFloodColor:
</span><span class="cx"> return currentColorOrValidColor(style, svgStyle.floodColor());
</span><span class="cx"> case CSSPropertyLightingColor:
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> PropertyWrapperAcceleratedFilter()
</span><del>- : PropertyWrapper<const FilterOperations&>(CSSPropertyWebkitFilter, &RenderStyle::filter, &RenderStyle::setFilter)
</del><ins>+ : PropertyWrapper<const FilterOperations&>(CSSPropertyFilter, &RenderStyle::filter, &RenderStyle::setFilter)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/page/animation/KeyframeAnimation.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/page/animation/KeyframeAnimation.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/page/animation/KeyframeAnimation.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_filterFunctionListsMatch = false;
</span><span class="cx">
</span><del>- if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyWebkitFilter))
</del><ins>+ if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyFilter))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Empty filters match anything, so find the first non-empty entry as the reference
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -510,9 +510,9 @@
</span><span class="cx"> int GraphicsLayer::validateFilterOperations(const KeyframeValueList& valueList)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><del>- ASSERT(valueList.property() == AnimatedPropertyWebkitFilter || valueList.property() == AnimatedPropertyWebkitBackdropFilter);
</del><ins>+ ASSERT(valueList.property() == AnimatedPropertyFilter || valueList.property() == AnimatedPropertyWebkitBackdropFilter);
</ins><span class="cx"> #else
</span><del>- ASSERT(valueList.property() == AnimatedPropertyWebkitFilter);
</del><ins>+ ASSERT(valueList.property() == AnimatedPropertyFilter);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (valueList.size() < 2)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsGraphicsLayerClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsLayerClient.h (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> AnimatedPropertyTransform,
</span><span class="cx"> AnimatedPropertyOpacity,
</span><span class="cx"> AnimatedPropertyBackgroundColor,
</span><del>- AnimatedPropertyWebkitFilter
</del><ins>+ AnimatedPropertyFilter
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> , AnimatedPropertyWebkitBackdropFilter
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> return ASCIILiteral("opacity");
</span><span class="cx"> case AnimatedPropertyBackgroundColor:
</span><span class="cx"> return ASCIILiteral("backgroundColor");
</span><del>- case AnimatedPropertyWebkitFilter:
</del><ins>+ case AnimatedPropertyFilter:
</ins><span class="cx"> return ASCIILiteral("filters");
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case AnimatedPropertyWebkitBackdropFilter:
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> if (currAnimation.m_property == AnimatedPropertyTransform
</span><span class="cx"> || currAnimation.m_property == AnimatedPropertyOpacity
</span><span class="cx"> || currAnimation.m_property == AnimatedPropertyBackgroundColor
</span><del>- || currAnimation.m_property == AnimatedPropertyWebkitFilter)
</del><ins>+ || currAnimation.m_property == AnimatedPropertyFilter)
</ins><span class="cx"> moveOrCopyLayerAnimation(operation, animationIdentifier(currAnimation.m_name, currAnimation.m_property, currAnimation.m_index, currAnimation.m_subIndex), fromLayer, toLayer);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -894,7 +894,7 @@
</span><span class="cx"> bool createdAnimations = false;
</span><span class="cx"> if (valueList.property() == AnimatedPropertyTransform)
</span><span class="cx"> createdAnimations = createTransformAnimationsFromKeyframes(valueList, anim, animationName, timeOffset, boxSize);
</span><del>- else if (valueList.property() == AnimatedPropertyWebkitFilter) {
</del><ins>+ else if (valueList.property() == AnimatedPropertyFilter) {
</ins><span class="cx"> if (supportsAcceleratedFilterAnimations())
</span><span class="cx"> createdAnimations = createFilterAnimationsFromKeyframes(valueList, anim, animationName, timeOffset);
</span><span class="cx"> }
</span><span class="lines">@@ -2634,7 +2634,7 @@
</span><span class="cx">
</span><span class="cx"> bool GraphicsLayerCA::createAnimationFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset)
</span><span class="cx"> {
</span><del>- ASSERT(valueList.property() != AnimatedPropertyTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyWebkitFilter));
</del><ins>+ ASSERT(valueList.property() != AnimatedPropertyTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyFilter));
</ins><span class="cx">
</span><span class="cx"> bool isKeyframe = valueList.size() > 2;
</span><span class="cx"> bool valuesOK;
</span><span class="lines">@@ -2769,9 +2769,9 @@
</span><span class="cx"> bool GraphicsLayerCA::createFilterAnimationsFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><del>- ASSERT(valueList.property() == AnimatedPropertyWebkitFilter || valueList.property() == AnimatedPropertyWebkitBackdropFilter);
</del><ins>+ ASSERT(valueList.property() == AnimatedPropertyFilter || valueList.property() == AnimatedPropertyWebkitBackdropFilter);
</ins><span class="cx"> #else
</span><del>- ASSERT(valueList.property() == AnimatedPropertyWebkitFilter);
</del><ins>+ ASSERT(valueList.property() == AnimatedPropertyFilter);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> int listIndex = validateFilterOperations(valueList);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicstexmapTextureMapperAnimationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> case AnimatedPropertyTransform:
</span><span class="cx"> client->setAnimatedTransform(applyTransformAnimation(static_cast<const TransformAnimationValue&>(from).value(), static_cast<const TransformAnimationValue&>(to).value(), progress, m_boxSize, m_listsMatch));
</span><span class="cx"> return;
</span><del>- case AnimatedPropertyWebkitFilter:
</del><ins>+ case AnimatedPropertyFilter:
</ins><span class="cx"> client->setAnimatedFilters(applyFilterAnimation(static_cast<const FilterAnimationValue&>(from).value(), static_cast<const FilterAnimationValue&>(to).value(), progress, m_boxSize));
</span><span class="cx"> return;
</span><span class="cx"> default:
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -661,7 +661,7 @@
</span><span class="cx"> if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyOpacity))
</span><span class="cx"> m_currentOpacity = m_state.opacity;
</span><span class="cx">
</span><del>- if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitFilter))
</del><ins>+ if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyFilter))
</ins><span class="cx"> m_currentFilters = m_state.filters;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1161,7 +1161,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!keyframesName.isEmpty());
</span><span class="cx">
</span><del>- if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyTransform && valueList.property() != AnimatedPropertyOpacity && valueList.property() != AnimatedPropertyWebkitFilter))
</del><ins>+ if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyTransform && valueList.property() != AnimatedPropertyOpacity && valueList.property() != AnimatedPropertyFilter))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool listsMatch = false;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayer.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayer.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayer.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -6856,8 +6856,9 @@
</span><span class="cx"> FilterInfo::remove(*this);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- if (renderer().style().filter().hasReferenceFilter())
</del><ins>+ // Add the filter as a client to this renderer, unless we are a RenderLayer accommodating
+ // an SVG. In that case it takes care of its own resource management for filters.
+ if (renderer().style().filter().hasReferenceFilter() && !renderer().isSVGRoot())
</ins><span class="cx"> FilterInfo::get(*this).updateReferenceFilterClients(renderer().style().filter());
</span><span class="cx"> else if (FilterInfo* filterInfo = FilterInfo::getIfExists(*this))
</span><span class="cx"> filterInfo->removeReferenceFilterClients();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -2492,7 +2492,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool hasOpacity = keyframes.containsProperty(CSSPropertyOpacity);
</span><span class="cx"> bool hasTransform = renderer().isBox() && keyframes.containsProperty(CSSPropertyTransform);
</span><del>- bool hasFilter = keyframes.containsProperty(CSSPropertyWebkitFilter);
</del><ins>+ bool hasFilter = keyframes.containsProperty(CSSPropertyFilter);
</ins><span class="cx">
</span><span class="cx"> bool hasBackdropFilter = false;
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="lines">@@ -2504,7 +2504,7 @@
</span><span class="cx">
</span><span class="cx"> KeyframeValueList transformVector(AnimatedPropertyTransform);
</span><span class="cx"> KeyframeValueList opacityVector(AnimatedPropertyOpacity);
</span><del>- KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
</del><ins>+ KeyframeValueList filterVector(AnimatedPropertyFilter);
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> KeyframeValueList backdropFilterVector(AnimatedPropertyWebkitBackdropFilter);
</span><span class="cx"> #endif
</span><span class="lines">@@ -2527,7 +2527,7 @@
</span><span class="cx"> if ((hasOpacity && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyOpacity))
</span><span class="cx"> opacityVector.insert(std::make_unique<FloatAnimationValue>(key, keyframeStyle->opacity(), tf));
</span><span class="cx">
</span><del>- if ((hasFilter && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyWebkitFilter))
</del><ins>+ if ((hasFilter && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyFilter))
</ins><span class="cx"> filterVector.insert(std::make_unique<FilterAnimationValue>(key, keyframeStyle->filter(), tf));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="lines">@@ -2603,13 +2603,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (property == CSSPropertyWebkitFilter && m_owningLayer.hasFilter()) {
- const Animation* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
</del><ins>+ if (property == CSSPropertyFilter && m_owningLayer.hasFilter()) {
+ const Animation* filterAnim = toStyle->transitionForProperty(CSSPropertyFilter);
</ins><span class="cx"> if (filterAnim && !filterAnim->isEmptyOrZeroDuration()) {
</span><del>- KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
</del><ins>+ KeyframeValueList filterVector(AnimatedPropertyFilter);
</ins><span class="cx"> filterVector.insert(std::make_unique<FilterAnimationValue>(0, fromStyle->filter()));
</span><span class="cx"> filterVector.insert(std::make_unique<FilterAnimationValue>(1, toStyle->filter()));
</span><del>- if (m_graphicsLayer->addAnimation(filterVector, FloatSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitFilter), timeOffset)) {
</del><ins>+ if (m_graphicsLayer->addAnimation(filterVector, FloatSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyFilter), timeOffset)) {
</ins><span class="cx"> // To ensure that the correct filter is visible when the animation ends, also set the final filter.
</span><span class="cx"> updateFilters(*toStyle);
</span><span class="cx"> didAnimate = true;
</span><span class="lines">@@ -2717,8 +2717,8 @@
</span><span class="cx"> case AnimatedPropertyBackgroundColor:
</span><span class="cx"> cssProperty = CSSPropertyBackgroundColor;
</span><span class="cx"> break;
</span><del>- case AnimatedPropertyWebkitFilter:
- cssProperty = CSSPropertyWebkitFilter;
</del><ins>+ case AnimatedPropertyFilter:
+ cssProperty = CSSPropertyFilter;
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case AnimatedPropertyWebkitBackdropFilter:
</span><span class="lines">@@ -2740,8 +2740,8 @@
</span><span class="cx"> return AnimatedPropertyOpacity;
</span><span class="cx"> case CSSPropertyBackgroundColor:
</span><span class="cx"> return AnimatedPropertyBackgroundColor;
</span><del>- case CSSPropertyWebkitFilter:
- return AnimatedPropertyWebkitFilter;
</del><ins>+ case CSSPropertyFilter:
+ return AnimatedPropertyFilter;
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case CSSPropertyWebkitBackdropFilter:
</span><span class="cx"> return AnimatedPropertyWebkitBackdropFilter;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -2614,7 +2614,7 @@
</span><span class="cx"> AnimationController& animController = renderer.animation();
</span><span class="cx"> return (animController.isRunningAnimationOnRenderer(renderer, CSSPropertyOpacity, activeAnimationState)
</span><span class="cx"> && (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
</span><del>- || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitFilter, activeAnimationState)
</del><ins>+ || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyFilter, activeAnimationState)
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitBackdropFilter, activeAnimationState)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingstyleSVGRenderStyleh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyle.h (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyle.h 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyle.h 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -90,7 +90,6 @@
</span><span class="cx"> static Color initialLightingColor() { return Color(255, 255, 255); }
</span><span class="cx"> static ShadowData* initialShadow() { return 0; }
</span><span class="cx"> static String initialClipperResource() { return String(); }
</span><del>- static String initialFilterResource() { return String(); }
</del><span class="cx"> static String initialMaskerResource() { return String(); }
</span><span class="cx"> static String initialMarkerStartResource() { return String(); }
</span><span class="cx"> static String initialMarkerMidResource() { return String(); }
</span><span class="lines">@@ -295,12 +294,6 @@
</span><span class="cx"> resources.access()->clipper = obj;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setFilterResource(const String& obj)
- {
- if (!(resources->filter == obj))
- resources.access()->filter = obj;
- }
-
</del><span class="cx"> void setMaskerResource(const String& obj)
</span><span class="cx"> {
</span><span class="cx"> if (!(resources->masker == obj))
</span><span class="lines">@@ -372,7 +365,6 @@
</span><span class="cx"> const Length& x() const { return layout->x; }
</span><span class="cx"> const Length& y() const { return layout->y; }
</span><span class="cx"> String clipperResource() const { return resources->clipper; }
</span><del>- String filterResource() const { return resources->filter; }
</del><span class="cx"> String maskerResource() const { return resources->masker; }
</span><span class="cx"> String markerStartResource() const { return inheritedResources->markerStart; }
</span><span class="cx"> String markerMidResource() const { return inheritedResources->markerMid; }
</span><span class="lines">@@ -391,13 +383,12 @@
</span><span class="cx"> // convenience
</span><span class="cx"> bool hasClipper() const { return !clipperResource().isEmpty(); }
</span><span class="cx"> bool hasMasker() const { return !maskerResource().isEmpty(); }
</span><del>- bool hasFilter() const { return !filterResource().isEmpty(); }
</del><span class="cx"> bool hasMarkers() const { return !markerStartResource().isEmpty() || !markerMidResource().isEmpty() || !markerEndResource().isEmpty(); }
</span><span class="cx"> bool hasStroke() const { return strokePaintType() != SVGPaint::SVG_PAINTTYPE_NONE; }
</span><span class="cx"> bool hasVisibleStroke() const { return hasStroke() && !strokeWidth().isZero(); }
</span><span class="cx"> bool hasFill() const { return fillPaintType() != SVGPaint::SVG_PAINTTYPE_NONE; }
</span><span class="cx"> bool isVerticalWritingMode() const { return writingMode() == WM_TBRL || writingMode() == WM_TB; }
</span><del>- bool isolatesBlending() const { return hasMasker() || hasFilter() || shadow(); }
</del><ins>+ bool isolatesBlending() const { return hasMasker() || shadow(); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> // inherit
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingstyleSVGRenderStyleDefscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -225,7 +225,6 @@
</span><span class="cx">
</span><span class="cx"> StyleResourceData::StyleResourceData()
</span><span class="cx"> : clipper(SVGRenderStyle::initialClipperResource())
</span><del>- , filter(SVGRenderStyle::initialFilterResource())
</del><span class="cx"> , masker(SVGRenderStyle::initialMaskerResource())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -233,7 +232,6 @@
</span><span class="cx"> inline StyleResourceData::StyleResourceData(const StyleResourceData& other)
</span><span class="cx"> : RefCounted<StyleResourceData>()
</span><span class="cx"> , clipper(other.clipper)
</span><del>- , filter(other.filter)
</del><span class="cx"> , masker(other.masker)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -246,7 +244,6 @@
</span><span class="cx"> bool StyleResourceData::operator==(const StyleResourceData& other) const
</span><span class="cx"> {
</span><span class="cx"> return clipper == other.clipper
</span><del>- && filter == other.filter
</del><span class="cx"> && masker == other.masker;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingstyleSVGRenderStyleDefsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyleDefs.h (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyleDefs.h 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/SVGRenderStyleDefs.h 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -261,7 +261,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String clipper;
</span><del>- String filter;
</del><span class="cx"> String masker;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingstyleWillChangeDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> case CSSPropertyMixBlendMode:
</span><span class="cx"> case CSSPropertyIsolation:
</span><span class="cx"> #endif
</span><del>- case CSSPropertyWebkitFilter:
</del><ins>+ case CSSPropertyFilter:
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case CSSPropertyWebkitBackdropFilter:
</span><span class="cx"> #endif
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (property) {
</span><span class="cx"> case CSSPropertyOpacity:
</span><del>- case CSSPropertyWebkitFilter:
</del><ins>+ case CSSPropertyFilter:
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case CSSPropertyWebkitBackdropFilter:
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingsvgSVGRenderSupportcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> bool SVGRenderSupport::isolatesBlending(const RenderStyle& style)
</span><span class="cx"> {
</span><del>- return style.svgStyle().isolatesBlending() || style.hasBlendMode() || style.opacity() < 1.0f;
</del><ins>+ return style.svgStyle().isolatesBlending() || style.hasFilter() || style.hasBlendMode() || style.opacity() < 1.0f;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGRenderSupport::updateMaskedAncestorShouldIsolateBlending(const RenderElement& renderer)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -634,14 +634,22 @@
</span><span class="cx"> ts << " " << clipper->resourceBoundingBox(renderer) << "\n";
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (!svgStyle.filterResource().isEmpty()) {
- if (RenderSVGResourceFilter* filter = getRenderSVGResourceById<RenderSVGResourceFilter>(renderer.document(), svgStyle.filterResource())) {
- writeIndent(ts, indent);
- ts << " ";
- writeNameAndQuotedValue(ts, "filter", svgStyle.filterResource());
- ts << " ";
- writeStandardPrefix(ts, *filter, 0);
- ts << " " << filter->resourceBoundingBox(renderer) << "\n";
</del><ins>+ if (style.hasFilter()) {
+ const FilterOperations& filterOperations = style.filter();
+ if (filterOperations.size() == 1) {
+ const FilterOperation& filterOperation = *filterOperations.at(0);
+ if (filterOperation.type() == FilterOperation::REFERENCE) {
+ const auto& referenceFilterOperation = downcast<ReferenceFilterOperation>(filterOperation);
+ AtomicString id = SVGURIReference::fragmentIdentifierFromIRIString(referenceFilterOperation.url(), renderer.document());
+ if (RenderSVGResourceFilter* filter = getRenderSVGResourceById<RenderSVGResourceFilter>(renderer.document(), id)) {
+ writeIndent(ts, indent);
+ ts << " ";
+ writeNameAndQuotedValue(ts, "filter", id);
+ ts << " ";
+ writeStandardPrefix(ts, *filter, 0);
+ ts << " " << filter->resourceBoundingBox(renderer) << "\n";
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">
</span><span class="cx"> auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*m_renderer);
</span><span class="cx"> if (!resources) {
</span><del>- if (svgStyle.hasFilter())
</del><ins>+ if (style.hasFilter())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_renderingFlags |= RenderingPrepared;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingsvgSVGResourcescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResources.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResources.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResources.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SVGResources.h"
</span><span class="cx">
</span><ins>+#include "FilterOperation.h"
</ins><span class="cx"> #include "RenderSVGResourceClipper.h"
</span><span class="cx"> #include "RenderSVGResourceFilter.h"
</span><span class="cx"> #include "RenderSVGResourceMarker.h"
</span><span class="lines">@@ -177,7 +178,7 @@
</span><span class="cx"> extensions.addPendingResource(id, &element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGResources::buildCachedResources(const RenderElement& renderer, const SVGRenderStyle& svgStyle)
</del><ins>+bool SVGResources::buildCachedResources(const RenderElement& renderer, const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(renderer.element());
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(renderer.element()->isSVGElement());
</span><span class="lines">@@ -195,6 +196,8 @@
</span><span class="cx"> if (tagName.isNull())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ const SVGRenderStyle& svgStyle = style.svgStyle();
+
</ins><span class="cx"> bool foundResources = false;
</span><span class="cx"> if (clipperFilterMaskerTags().contains(tagName)) {
</span><span class="cx"> if (svgStyle.hasClipper()) {
</span><span class="lines">@@ -205,12 +208,19 @@
</span><span class="cx"> registerPendingResource(extensions, id, element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (svgStyle.hasFilter()) {
- AtomicString id(svgStyle.filterResource());
- if (setFilter(getRenderSVGResourceById<RenderSVGResourceFilter>(document, id)))
- foundResources = true;
- else
- registerPendingResource(extensions, id, element);
</del><ins>+ if (style.hasFilter()) {
+ const FilterOperations& filterOperations = style.filter();
+ if (filterOperations.size() == 1) {
+ const FilterOperation& filterOperation = *filterOperations.at(0);
+ if (filterOperation.type() == FilterOperation::REFERENCE) {
+ const auto& referenceFilterOperation = downcast<ReferenceFilterOperation>(filterOperation);
+ AtomicString id = SVGURIReference::fragmentIdentifierFromIRIString(referenceFilterOperation.url(), element.document());
+ if (setFilter(getRenderSVGResourceById<RenderSVGResourceFilter>(document, id)))
+ foundResources = true;
+ else
+ registerPendingResource(extensions, id, element);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (svgStyle.hasMasker()) {
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingsvgSVGResourcesh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResources.h (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResources.h 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResources.h 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> class Document;
</span><span class="cx"> class RenderElement;
</span><span class="cx"> class RenderObject;
</span><ins>+class RenderStyle;
</ins><span class="cx"> class RenderSVGResourceClipper;
</span><span class="cx"> class RenderSVGResourceContainer;
</span><span class="cx"> class RenderSVGResourceFilter;
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx"> public:
</span><span class="cx"> SVGResources();
</span><span class="cx">
</span><del>- bool buildCachedResources(const RenderElement&, const SVGRenderStyle&);
</del><ins>+ bool buildCachedResources(const RenderElement&, const RenderStyle&);
</ins><span class="cx">
</span><span class="cx"> // Ordinary resources
</span><span class="cx"> RenderSVGResourceClipper* clipper() const { return m_clipperFilterMaskerData ? m_clipperFilterMaskerData->clipper : 0; }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingsvgSVGResourcesCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -39,11 +39,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_cache.contains(&renderer));
</span><span class="cx">
</span><del>- const SVGRenderStyle& svgStyle = style.svgStyle();
-
</del><span class="cx"> // Build a list of all resources associated with the passed RenderObject
</span><span class="cx"> auto newResources = std::make_unique<SVGResources>();
</span><del>- if (!newResources->buildCachedResources(renderer, svgStyle))
</del><ins>+ if (!newResources->buildCachedResources(renderer, style))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Put object in cache.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-13 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r188647. rdar://problem/23432373
+
+ 2015-08-18 Dean Jackson <dino@apple.com>
+
+ Support CSS filters without webkit prefix
+ https://bugs.webkit.org/show_bug.cgi?id=148138
+ <rdar://problem/22331434>
+
+ Reviewed by Sam Weinig.
+
+ Rename WebkitFilter to Filter.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (IPC::ArgumentCoder<TextureMapperAnimation>::encode):
+ (IPC::ArgumentCoder<TextureMapperAnimation>::decode):
+
</ins><span class="cx"> 2015-11-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r190574. rdar://problem/22846841
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (192422 => 192423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2015-11-13 17:03:07 UTC (rev 192422)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2015-11-13 17:03:29 UTC (rev 192423)
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx"> case AnimatedPropertyTransform:
</span><span class="cx"> encoder << static_cast<const TransformAnimationValue&>(value).value();
</span><span class="cx"> break;
</span><del>- case AnimatedPropertyWebkitFilter:
</del><ins>+ case AnimatedPropertyFilter:
</ins><span class="cx"> encoder << static_cast<const FilterAnimationValue&>(value).value();
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx"> keyframes.insert(std::make_unique<TransformAnimationValue>(keyTime, transform, timingFunction.get()));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case AnimatedPropertyWebkitFilter: {
</del><ins>+ case AnimatedPropertyFilter: {
</ins><span class="cx"> FilterOperations filter;
</span><span class="cx"> if (!decoder.decode(filter))
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>