<!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>[209777] trunk</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/209777">209777</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-13 14:15:13 -0800 (Tue, 13 Dec 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CSS Parser] Eliminate SVGPaint and SVGColor
https://bugs.webkit.org/show_bug.cgi?id=165819

Reviewed by Dean Jackson.

Source/WebCore:

Remove SVGColor and SVGPaint CSS values from the tree. The new parser
already stopped making these values when parsing, so all that's left
is to make sure computed style doesn't use these values either.

We are the only browser engine to support these CSS values, they see no use
on the Web, and they're already gone at the parsing level, so it's time
to remove these interfaces from our tree.

* CMakeLists.txt:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSCSSValueCustom.cpp:
(WebCore::toJSNewlyCreated):
* css/CSSComputedStyleDeclaration.h:
* css/CSSValue.cpp:
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
(WebCore::CSSValue::cloneForCSSOM):
* css/CSSValue.h:
(WebCore::CSSValue::isSubtypeExposedToCSSOM):
(WebCore::CSSValue::isSVGColor): Deleted.
(WebCore::CSSValue::isSVGPaint): Deleted.
* css/SVGCSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::adjustSVGPaintForCurrentColor):
(WebCore::ComputedStyleExtractor::svgPropertyValue):
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertSVGColor):
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueFill):
(WebCore::StyleBuilderCustom::applyValueStroke):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::PropertyWrapperSVGPaint::PropertyWrapperSVGPaint):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::fillPaintType):
(WebCore::RenderStyle::setFillPaintColor):
(WebCore::RenderStyle::strokePaintType):
(WebCore::RenderStyle::setStrokePaintColor):
* rendering/style/SVGRenderStyle.h:
(WebCore::SVGRenderStyle::initialFillPaintType):
(WebCore::SVGRenderStyle::initialStrokePaintType):
(WebCore::SVGRenderStyle::setFillPaint):
(WebCore::SVGRenderStyle::setStrokePaint):
(WebCore::SVGRenderStyle::fillPaintType):
(WebCore::SVGRenderStyle::strokePaintType):
(WebCore::SVGRenderStyle::visitedLinkFillPaintType):
(WebCore::SVGRenderStyle::visitedLinkStrokePaintType):
(WebCore::SVGRenderStyle::hasStroke):
(WebCore::SVGRenderStyle::hasFill):
* rendering/style/SVGRenderStyleDefs.h:
* rendering/svg/RenderSVGResource.cpp:
(WebCore::requestPaintingResource):
* rendering/svg/SVGResources.cpp:
(WebCore::paintingResourceFromSVGPaint):
* svg/SVGAllInOne.cpp:
* svg/SVGAnimatedColor.cpp:
(WebCore::SVGAnimatedColorAnimator::constructFromString):
(WebCore::parseColorFromString):
(WebCore::SVGAnimatedColorAnimator::calculateDistance):
* svg/SVGAnimatedType.cpp:
(WebCore::SVGAnimatedType::setValueAsString):
* svg/SVGAnimatedType.h:
* svg/SVGColor.cpp: Removed.
* svg/SVGColor.h: Removed.
* svg/SVGColor.idl: Removed.
* svg/SVGFEDiffuseLightingElement.cpp:
* svg/SVGFESpecularLightingElement.cpp:
* svg/SVGPaint.cpp: Removed.
* svg/SVGPaint.h: Removed.
* svg/SVGPaint.idl: Removed.

LayoutTests:

* fast/dom/Window/resources/window-properties.js:
* platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
* platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt:
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
* svg/animations/additive-type-by-animation-expected.txt:
* svg/animations/animate-color-calcMode-discrete-expected.txt:
* svg/animations/animate-color-fill-currentColor-expected.txt:
* svg/animations/animate-color-fill-from-by-expected.txt:
* svg/animations/animate-color-transparent-expected.txt:
* svg/animations/animate-currentColor-expected.txt:
* svg/animations/animate-dynamic-update-attributeName-expected.txt:
* svg/animations/animate-elem-03-t-drt-expected.txt:
* svg/animations/animate-inherit-css-property-expected.txt:
* svg/animations/attributeTypes-expected.txt:
* svg/animations/resources/SVGAnimationTestCase.js:
(expectColor):
* svg/animations/script-tests/animate-color-fill-currentColor.js:
(sample1):
(sample2):
(sample3):
* svg/animations/script-tests/animate-color-fill-from-by.js:
(sample1):
(sample2):
(sample3):
* svg/css/getComputedStyle-basic-expected.txt:
* svg/css/rect-system-color-expected.txt:
* svg/css/rect-system-color.xhtml:
* svg/custom/global-constructors-expected.txt:
* svg/custom/js-svg-constructors-expected.txt:
* svg/custom/js-svg-constructors.svg:
* svg/custom/script-tests/global-constructors.js:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowresourceswindowpropertiesjs">trunk/LayoutTests/fast/dom/Window/resources/window-properties.js</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastdomWindowwindowlookupprecedenceexpectedtxt">trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsadditivetypebyanimationexpectedtxt">trunk/LayoutTests/svg/animations/additive-type-by-animation-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsanimatecolorcalcModediscreteexpectedtxt">trunk/LayoutTests/svg/animations/animate-color-calcMode-discrete-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsanimatecolorfillcurrentColorexpectedtxt">trunk/LayoutTests/svg/animations/animate-color-fill-currentColor-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsanimatecolorfillfrombyexpectedtxt">trunk/LayoutTests/svg/animations/animate-color-fill-from-by-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsanimatecolortransparentexpectedtxt">trunk/LayoutTests/svg/animations/animate-color-transparent-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsanimatecurrentColorexpectedtxt">trunk/LayoutTests/svg/animations/animate-currentColor-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsanimatedynamicupdateattributeNameexpectedtxt">trunk/LayoutTests/svg/animations/animate-dynamic-update-attributeName-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsanimateelem03tdrtexpectedtxt">trunk/LayoutTests/svg/animations/animate-elem-03-t-drt-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsanimateinheritcsspropertyexpectedtxt">trunk/LayoutTests/svg/animations/animate-inherit-css-property-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsattributeTypesexpectedtxt">trunk/LayoutTests/svg/animations/attributeTypes-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvganimationsresourcesSVGAnimationTestCasejs">trunk/LayoutTests/svg/animations/resources/SVGAnimationTestCase.js</a></li>
<li><a href="#trunkLayoutTestssvganimationsscripttestsanimatecolorfillcurrentColorjs">trunk/LayoutTests/svg/animations/script-tests/animate-color-fill-currentColor.js</a></li>
<li><a href="#trunkLayoutTestssvganimationsscripttestsanimatecolorfillfrombyjs">trunk/LayoutTests/svg/animations/script-tests/animate-color-fill-from-by.js</a></li>
<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcssrectsystemcolorexpectedtxt">trunk/LayoutTests/svg/css/rect-system-color-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcssrectsystemcolorxhtml">trunk/LayoutTests/svg/css/rect-system-color.xhtml</a></li>
<li><a href="#trunkLayoutTestssvgcustomglobalconstructorsexpectedtxt">trunk/LayoutTests/svg/custom/global-constructors-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomjssvgconstructorsexpectedtxt">trunk/LayoutTests/svg/custom/js-svg-constructors-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomjssvgconstructorssvg">trunk/LayoutTests/svg/custom/js-svg-constructors.svg</a></li>
<li><a href="#trunkLayoutTestssvgcustomscripttestsglobalconstructorsjs">trunk/LayoutTests/svg/custom/script-tests/global-constructors.js</a></li>
<li><a href="#trunkLayoutTeststransitionssvgtransitionsexpectedtxt">trunk/LayoutTests/transitions/svg-transitions-expected.txt</a></li>
<li><a href="#trunkLayoutTeststransitionssvgtransitionshtml">trunk/LayoutTests/transitions/svg-transitions.html</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSValueCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationh">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/css/CSSValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#trunkSourceWebCorecssSVGCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleSVGRenderStyleh">trunk/Source/WebCore/rendering/style/SVGRenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleSVGRenderStyleDefsh">trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcecpp">trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcescpp">trunk/Source/WebCore/rendering/svg/SVGResources.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAllInOnecpp">trunk/Source/WebCore/svg/SVGAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedColorcpp">trunk/Source/WebCore/svg/SVGAnimatedColor.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedTypecpp">trunk/Source/WebCore/svg/SVGAnimatedType.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedTypeh">trunk/Source/WebCore/svg/SVGAnimatedType.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEDiffuseLightingElementcpp">trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFESpecularLightingElementcpp">trunk/Source/WebCore/svg/SVGFESpecularLightingElement.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoresvgSVGColorcpp">trunk/Source/WebCore/svg/SVGColor.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGColorh">trunk/Source/WebCore/svg/SVGColor.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGColoridl">trunk/Source/WebCore/svg/SVGColor.idl</a></li>
<li><a href="#trunkSourceWebCoresvgSVGPaintcpp">trunk/Source/WebCore/svg/SVGPaint.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGPainth">trunk/Source/WebCore/svg/SVGPaint.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGPaintidl">trunk/Source/WebCore/svg/SVGPaint.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/ChangeLog        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-12-13  Dave Hyatt  &lt;hyatt@apple.com&gt;
+
+        [CSS Parser] Eliminate SVGPaint and SVGColor
+        https://bugs.webkit.org/show_bug.cgi?id=165819
+
+        Reviewed by Dean Jackson.
+
+        * fast/dom/Window/resources/window-properties.js:
+        * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt:
+        * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+        * svg/animations/additive-type-by-animation-expected.txt:
+        * svg/animations/animate-color-calcMode-discrete-expected.txt:
+        * svg/animations/animate-color-fill-currentColor-expected.txt:
+        * svg/animations/animate-color-fill-from-by-expected.txt:
+        * svg/animations/animate-color-transparent-expected.txt:
+        * svg/animations/animate-currentColor-expected.txt:
+        * svg/animations/animate-dynamic-update-attributeName-expected.txt:
+        * svg/animations/animate-elem-03-t-drt-expected.txt:
+        * svg/animations/animate-inherit-css-property-expected.txt:
+        * svg/animations/attributeTypes-expected.txt:
+        * svg/animations/resources/SVGAnimationTestCase.js:
+        (expectColor):
+        * svg/animations/script-tests/animate-color-fill-currentColor.js:
+        (sample1):
+        (sample2):
+        (sample3):
+        * svg/animations/script-tests/animate-color-fill-from-by.js:
+        (sample1):
+        (sample2):
+        (sample3):
+        * svg/css/getComputedStyle-basic-expected.txt:
+        * svg/css/rect-system-color-expected.txt:
+        * svg/css/rect-system-color.xhtml:
+        * svg/custom/global-constructors-expected.txt:
+        * svg/custom/js-svg-constructors-expected.txt:
+        * svg/custom/js-svg-constructors.svg:
+        * svg/custom/script-tests/global-constructors.js:
+
</ins><span class="cx"> 2016-12-13  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rebaseline js/dom/global-constructors-attributes.html after r209760.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowresourceswindowpropertiesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/Window/resources/window-properties.js (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/resources/window-properties.js        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/fast/dom/Window/resources/window-properties.js        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -127,12 +127,10 @@
</span><span class="cx">     [&quot;Range&quot;, &quot;object&quot;],
</span><span class="cx">     [&quot;Rect&quot;, &quot;object&quot;],
</span><span class="cx">     [&quot;SVGAngle&quot;, &quot;object&quot;],
</span><del>-    [&quot;SVGColor&quot;, &quot;object&quot;],
</del><span class="cx">     [&quot;SVGException&quot;, &quot;object&quot;],
</span><span class="cx">     [&quot;SVGGradientElement&quot;, &quot;object&quot;],
</span><span class="cx">     [&quot;SVGLength&quot;, &quot;object&quot;],
</span><span class="cx">     [&quot;SVGMarkerElement&quot;, &quot;object&quot;],
</span><del>-    [&quot;SVGPaint&quot;, &quot;object&quot;],
</del><span class="cx">     [&quot;SVGPathSeg&quot;, &quot;object&quot;],
</span><span class="cx">     [&quot;SVGPreserveAspectRatio&quot;, &quot;object&quot;],
</span><span class="cx">     [&quot;SVGRenderingIntent&quot;, &quot;object&quot;],
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastdomWindowwindowlookupprecedenceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -256,8 +256,6 @@
</span><span class="cx"> PASS 'function Rect() {    [native code]}' is 'function Rect() {    [native code]}'
</span><span class="cx"> PASS 'function SVGAngle() {    [native code]}' is 'function SVGAngle() {    [native code]}'
</span><span class="cx"> PASS 'function SVGAngle() {    [native code]}' is 'function SVGAngle() {    [native code]}'
</span><del>-PASS 'function SVGColor() {    [native code]}' is 'function SVGColor() {    [native code]}'
-PASS 'function SVGColor() {    [native code]}' is 'function SVGColor() {    [native code]}'
</del><span class="cx"> PASS 'function SVGException() {    [native code]}' is 'function SVGException() {    [native code]}'
</span><span class="cx"> PASS 'function SVGException() {    [native code]}' is 'function SVGException() {    [native code]}'
</span><span class="cx"> PASS 'function SVGGradientElement() {    [native code]}' is 'function SVGGradientElement() {    [native code]}'
</span><span class="lines">@@ -266,8 +264,6 @@
</span><span class="cx"> PASS 'function SVGLength() {    [native code]}' is 'function SVGLength() {    [native code]}'
</span><span class="cx"> PASS 'function SVGMarkerElement() {    [native code]}' is 'function SVGMarkerElement() {    [native code]}'
</span><span class="cx"> PASS 'function SVGMarkerElement() {    [native code]}' is 'function SVGMarkerElement() {    [native code]}'
</span><del>-PASS 'function SVGPaint() {    [native code]}' is 'function SVGPaint() {    [native code]}'
-PASS 'function SVGPaint() {    [native code]}' is 'function SVGPaint() {    [native code]}'
</del><span class="cx"> PASS 'function SVGPathSeg() {    [native code]}' is 'function SVGPathSeg() {    [native code]}'
</span><span class="cx"> PASS 'function SVGPathSeg() {    [native code]}' is 'function SVGPathSeg() {    [native code]}'
</span><span class="cx"> PASS 'function SVGPreserveAspectRatio() {    [native code]}' is 'function SVGPreserveAspectRatio() {    [native code]}'
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1453,11 +1453,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGClipPathElement').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGClipPathElement').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGClipPathElement').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').value is SVGColor
-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').configurable is true
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGComponentTransferFunctionElement').value is SVGComponentTransferFunctionElement
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGComponentTransferFunctionElement').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGComponentTransferFunctionElement').hasOwnProperty('set') is false
</span><span class="lines">@@ -1758,11 +1753,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGNumberList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGNumberList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGNumberList').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').value is SVGPaint
-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').configurable is true
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGPathElement').value is SVGPathElement
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGPathElement').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGPathElement').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1448,11 +1448,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGClipPathElement').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGClipPathElement').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGClipPathElement').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').value is SVGColor
-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGColor').configurable is true
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGComponentTransferFunctionElement').value is SVGComponentTransferFunctionElement
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGComponentTransferFunctionElement').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGComponentTransferFunctionElement').hasOwnProperty('set') is false
</span><span class="lines">@@ -1753,11 +1748,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGNumberList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGNumberList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGNumberList').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').value is SVGPaint
-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'SVGPaint').configurable is true
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGPathElement').value is SVGPathElement
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGPathElement').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'SVGPathElement').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsadditivetypebyanimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/additive-type-by-animation-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/additive-type-by-animation-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/additive-type-by-animation-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx"> PASS path.transform.animVal.getItem(0).angle is 45
</span><span class="cx"> PASS path.transform.animVal.getItem(1).type is SVGTransform.SVG_TRANSFORM_ROTATE
</span><span class="cx"> PASS path.transform.animVal.getItem(1).angle is 0
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS marker.orientAngle.baseVal.value is -45
</span><span class="cx"> PASS feConvolveMatrix.divisor.baseVal is 37.5
</span><span class="cx"> PASS feConvolveMatrix.orderX.baseVal is 6
</span><span class="lines">@@ -130,9 +130,9 @@
</span><span class="cx"> PASS path.transform.animVal.getItem(0).angle is 45
</span><span class="cx"> PASS path.transform.animVal.getItem(1).type is SVGTransform.SVG_TRANSFORM_ROTATE
</span><span class="cx"> PASS path.transform.animVal.getItem(1).angle is -22.5
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 63
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 63
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS marker.orientAngle.baseVal.value is -45
</span><span class="cx"> PASS feConvolveMatrix.divisor.baseVal is 37.5
</span><span class="cx"> PASS feConvolveMatrix.orderX.baseVal is 6
</span><span class="lines">@@ -213,9 +213,9 @@
</span><span class="cx"> PASS path.transform.animVal.getItem(0).angle is 45
</span><span class="cx"> PASS path.transform.animVal.getItem(1).type is SVGTransform.SVG_TRANSFORM_ROTATE
</span><span class="cx"> PASS path.transform.animVal.getItem(1).angle is -45
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS marker.orientAngle.baseVal.value is -45
</span><span class="cx"> PASS feConvolveMatrix.divisor.baseVal is 37.5
</span><span class="cx"> PASS feConvolveMatrix.orderX.baseVal is 6
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsanimatecolorcalcModediscreteexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/animate-color-calcMode-discrete-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/animate-color-calcMode-discrete-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/animate-color-calcMode-discrete-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -5,24 +5,24 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
</del><ins>+PASS colorComponents[1] is 128
+PASS colorComponents[2] is 255
+PASS colorComponents[3] is 255
+PASS colorComponents[1] is 255
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
+PASS colorComponents[1] is 255
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 255
+PASS colorComponents[3] is 255
+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 255
+PASS colorComponents[3] is 255
+PASS colorComponents[1] is 128
+PASS colorComponents[2] is 255
+PASS colorComponents[3] is 255
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsanimatecolorfillcurrentColorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/animate-color-fill-currentColor-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/animate-color-fill-currentColor-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/animate-color-fill-currentColor-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -7,28 +7,19 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> Initial condition:
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS fillPaint.uri is &quot;&quot;
-PASS fillPaint.paintType is SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR
-PASS fillPaint.colorType is SVGColor.SVG_COLORTYPE_CURRENTCOLOR
</del><ins>+PASS colorComponents[1] is 255
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
</ins><span class="cx"> 
</span><span class="cx"> Half-time condition:
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 64
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS fillPaint.uri is &quot;&quot;
-PASS fillPaint.paintType is SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR
-PASS fillPaint.colorType is SVGColor.SVG_COLORTYPE_CURRENTCOLOR
</del><ins>+PASS colorComponents[1] is 128
+PASS colorComponents[2] is 64
+PASS colorComponents[3] is 0
</ins><span class="cx"> 
</span><span class="cx"> End condition:
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS fillPaint.uri is &quot;&quot;
-PASS fillPaint.paintType is SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR
-PASS fillPaint.colorType is SVGColor.SVG_COLORTYPE_CURRENTCOLOR
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsanimatecolorfillfrombyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/animate-color-fill-from-by-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/animate-color-fill-from-by-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/animate-color-fill-from-by-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -7,28 +7,19 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> Initial condition:
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 208
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS fillPaint.uri is &quot;&quot;
-PASS fillPaint.paintType is SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR
-PASS fillPaint.colorType is SVGColor.SVG_COLORTYPE_CURRENTCOLOR
</del><ins>+PASS colorComponents[1] is 208
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
</ins><span class="cx"> 
</span><span class="cx"> Half-time condition:
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 208
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 104
-PASS fillPaint.uri is &quot;&quot;
-PASS fillPaint.paintType is SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR
-PASS fillPaint.colorType is SVGColor.SVG_COLORTYPE_CURRENTCOLOR
</del><ins>+PASS colorComponents[1] is 208
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 104
</ins><span class="cx"> 
</span><span class="cx"> End condition:
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 208
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 208
-PASS fillPaint.uri is &quot;&quot;
-PASS fillPaint.paintType is SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR
-PASS fillPaint.colorType is SVGColor.SVG_COLORTYPE_CURRENTCOLOR
</del><ins>+PASS colorComponents[1] is 208
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 208
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsanimatecolortransparentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/animate-color-transparent-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/animate-color-transparent-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/animate-color-transparent-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -5,12 +5,12 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 127
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 255
+PASS colorComponents[3] is 0
+PASS colorComponents[1] is 127
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsanimatecurrentColorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/animate-currentColor-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/animate-currentColor-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/animate-currentColor-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -5,15 +5,15 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 64
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 255
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
+PASS colorComponents[1] is 128
+PASS colorComponents[2] is 64
+PASS colorComponents[3] is 0
+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsanimatedynamicupdateattributeNameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/animate-dynamic-update-attributeName-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/animate-dynamic-update-attributeName-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/animate-dynamic-update-attributeName-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -5,17 +5,17 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 255
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect.style.color is &quot;&quot;
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect.style.color is &quot;&quot;
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect.style.color is &quot;&quot;
</span><span class="cx"> PASS rect.style.fill is &quot;&quot;
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsanimateelem03tdrtexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/animate-elem-03-t-drt-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/animate-elem-03-t-drt-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/animate-elem-03-t-drt-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -7,21 +7,21 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> PASS parseFontSizeFromString() is 40
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 255
</ins><span class="cx"> PASS parseFontSizeFromString() is 60
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 59
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 59
+PASS colorComponents[3] is 128
</ins><span class="cx"> PASS parseFontSizeFromString() is 80
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 119
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 119
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS parseFontSizeFromString() is 80
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 119
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 119
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsanimateinheritcsspropertyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/animate-inherit-css-property-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/animate-inherit-css-property-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/animate-inherit-css-property-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -5,17 +5,17 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 255
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect.style.fill is &quot;&quot;
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 64
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 128
+PASS colorComponents[2] is 64
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect.style.fill is &quot;&quot;
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect.style.fill is &quot;&quot;
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsattributeTypesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/attributeTypes-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/attributeTypes-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/attributeTypes-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -8,91 +8,91 @@
</span><span class="cx"> 
</span><span class="cx"> PASS rect1.width.animVal.value is 10
</span><span class="cx"> PASS rect1.width.baseVal.value is 10
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect2.width.animVal.value is 10
</span><span class="cx"> PASS rect2.width.baseVal.value is 10
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect3.width.animVal.value is 100
</span><span class="cx"> PASS rect3.width.baseVal.value is 100
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 255
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect3.getAttribute('fill') is &quot;red&quot;
</span><span class="cx"> PASS rect4.width.animVal.value is 100
</span><span class="cx"> PASS rect4.width.baseVal.value is 100
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 255
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 255
+PASS colorComponents[2] is 0
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect4.getAttribute('fill') is &quot;red&quot;
</span><span class="cx"> PASS rect1.width.animVal.value is 55
</span><span class="cx"> PASS rect1.width.baseVal.value is 10
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect2.width.animVal.value is 55
</span><span class="cx"> PASS rect2.width.baseVal.value is 10
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect3.width.animVal.value is 100
</span><span class="cx"> PASS rect3.width.baseVal.value is 100
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 64
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 128
+PASS colorComponents[2] is 64
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect3.getAttribute('fill') is &quot;red&quot;
</span><span class="cx"> PASS rect4.width.animVal.value is 100
</span><span class="cx"> PASS rect4.width.baseVal.value is 100
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 64
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 128
+PASS colorComponents[2] is 64
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect4.getAttribute('fill') is &quot;red&quot;
</span><span class="cx"> PASS rect1.width.animVal.value is 100
</span><span class="cx"> PASS rect1.width.baseVal.value is 10
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect2.width.animVal.value is 100
</span><span class="cx"> PASS rect2.width.baseVal.value is 10
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect3.width.animVal.value is 100
</span><span class="cx"> PASS rect3.width.baseVal.value is 100
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect3.getAttribute('fill') is &quot;red&quot;
</span><span class="cx"> PASS rect4.width.animVal.value is 100
</span><span class="cx"> PASS rect4.width.baseVal.value is 100
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect4.getAttribute('fill') is &quot;red&quot;
</span><span class="cx"> PASS rect1.width.animVal.value is 100
</span><span class="cx"> PASS rect1.width.baseVal.value is 10
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect2.width.animVal.value is 100
</span><span class="cx"> PASS rect2.width.baseVal.value is 10
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect3.width.animVal.value is 100
</span><span class="cx"> PASS rect3.width.baseVal.value is 100
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect3.getAttribute('fill') is &quot;red&quot;
</span><span class="cx"> PASS rect4.width.animVal.value is 100
</span><span class="cx"> PASS rect4.width.baseVal.value is 100
</span><del>-PASS color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
-PASS color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 128
-PASS color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0
</del><ins>+PASS colorComponents[1] is 0
+PASS colorComponents[2] is 128
+PASS colorComponents[3] is 0
</ins><span class="cx"> PASS rect4.getAttribute('fill') is &quot;red&quot;
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsresourcesSVGAnimationTestCasejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/resources/SVGAnimationTestCase.js (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/resources/SVGAnimationTestCase.js        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/resources/SVGAnimationTestCase.js        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -46,16 +46,17 @@
</span><span class="cx"> 
</span><span class="cx"> function expectColor(element, red, green, blue, property) {
</span><span class="cx">     if (typeof property != &quot;string&quot;)
</span><del>-        color = getComputedStyle(element).getPropertyCSSValue(&quot;color&quot;).getRGBColorValue();
-    else {
-        fillPaint = getComputedStyle(element).getPropertyCSSValue(property);
-        color = getComputedStyle(element).getPropertyCSSValue(property).rgbColor;
-    }
-
</del><ins>+        color = getComputedStyle(element).getPropertyValue(&quot;color&quot;);
+    else
+        color = getComputedStyle(element).getPropertyValue(property);
+    
+    var re = new RegExp(&quot;rgba?\\(([^, ]*), ([^, ]*), ([^, ]*)(?:, )?([^, ]*)\\)&quot;);
+    colorComponents = re.exec(color);
+    
</ins><span class="cx">     // Allow a tolerance of 1 for color values, as they are integers.
</span><del>-    shouldBeCloseEnough(&quot;color.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;&quot; + red, 1);
-    shouldBeCloseEnough(&quot;color.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;&quot; + green, 1);
-    shouldBeCloseEnough(&quot;color.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;&quot; + blue, 1);
</del><ins>+    shouldBeCloseEnough(&quot;colorComponents[1]&quot;, &quot;&quot; + red, 1);
+    shouldBeCloseEnough(&quot;colorComponents[2]&quot;, &quot;&quot; + green, 1);
+    shouldBeCloseEnough(&quot;colorComponents[3]&quot;, &quot;&quot; + blue, 1);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function expectFillColor(element, red, green, blue) {
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsscripttestsanimatecolorfillcurrentColorjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/script-tests/animate-color-fill-currentColor.js (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/script-tests/animate-color-fill-currentColor.js        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/script-tests/animate-color-fill-currentColor.js        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -27,9 +27,6 @@
</span><span class="cx">     debug(&quot;Initial condition:&quot;);
</span><span class="cx"> 
</span><span class="cx">     expectFillColor(rect, 255, 0, 0);
</span><del>-    shouldBeEqualToString(&quot;fillPaint.uri&quot;, &quot;&quot;);
-    shouldBe(&quot;fillPaint.paintType&quot;, &quot;SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR&quot;);
-    shouldBe(&quot;fillPaint.colorType&quot;, &quot;SVGColor.SVG_COLORTYPE_CURRENTCOLOR&quot;);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function sample2() {
</span><span class="lines">@@ -37,9 +34,6 @@
</span><span class="cx">     debug(&quot;Half-time condition:&quot;);
</span><span class="cx"> 
</span><span class="cx">     expectFillColor(rect, 128, 64, 0);
</span><del>-    shouldBeEqualToString(&quot;fillPaint.uri&quot;, &quot;&quot;);
-    shouldBe(&quot;fillPaint.paintType&quot;, &quot;SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR&quot;);
-    shouldBe(&quot;fillPaint.colorType&quot;, &quot;SVGColor.SVG_COLORTYPE_CURRENTCOLOR&quot;);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function sample3() {
</span><span class="lines">@@ -47,9 +41,6 @@
</span><span class="cx">     debug(&quot;End condition:&quot;);
</span><span class="cx"> 
</span><span class="cx">     expectFillColor(rect, 0, 128, 0);
</span><del>-    shouldBeEqualToString(&quot;fillPaint.uri&quot;, &quot;&quot;);
-    shouldBe(&quot;fillPaint.paintType&quot;, &quot;SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR&quot;);
-    shouldBe(&quot;fillPaint.colorType&quot;, &quot;SVGColor.SVG_COLORTYPE_CURRENTCOLOR&quot;);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function executeTest() {
</span></span></pre></div>
<a id="trunkLayoutTestssvganimationsscripttestsanimatecolorfillfrombyjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/animations/script-tests/animate-color-fill-from-by.js (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/animations/script-tests/animate-color-fill-from-by.js        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/animations/script-tests/animate-color-fill-from-by.js        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -27,9 +27,6 @@
</span><span class="cx">     debug(&quot;Initial condition:&quot;);
</span><span class="cx"> 
</span><span class="cx">     expectFillColor(rect, 208, 0, 0);
</span><del>-    shouldBeEqualToString(&quot;fillPaint.uri&quot;, &quot;&quot;);
-    shouldBe(&quot;fillPaint.paintType&quot;, &quot;SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR&quot;);
-    shouldBe(&quot;fillPaint.colorType&quot;, &quot;SVGColor.SVG_COLORTYPE_CURRENTCOLOR&quot;);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function sample2() {
</span><span class="lines">@@ -37,9 +34,6 @@
</span><span class="cx">     debug(&quot;Half-time condition:&quot;);
</span><span class="cx"> 
</span><span class="cx">     expectFillColor(rect, 208, 0, 104);
</span><del>-    shouldBeEqualToString(&quot;fillPaint.uri&quot;, &quot;&quot;);
-    shouldBe(&quot;fillPaint.paintType&quot;, &quot;SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR&quot;);
-    shouldBe(&quot;fillPaint.colorType&quot;, &quot;SVGColor.SVG_COLORTYPE_CURRENTCOLOR&quot;);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function sample3() {
</span><span class="lines">@@ -47,9 +41,6 @@
</span><span class="cx">     debug(&quot;End condition:&quot;);
</span><span class="cx"> 
</span><span class="cx">     expectFillColor(rect, 208, 0, 208);
</span><del>-    shouldBeEqualToString(&quot;fillPaint.uri&quot;, &quot;&quot;);
-    shouldBe(&quot;fillPaint.paintType&quot;, &quot;SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR&quot;);
-    shouldBe(&quot;fillPaint.colorType&quot;, &quot;SVGColor.SVG_COLORTYPE_CURRENTCOLOR&quot;);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function executeTest() {
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> rect: style.getPropertyValue(color-rendering) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(color-rendering) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(fill) : rgb(0, 0, 255)
</span><del>-rect: style.getPropertyCSSValue(fill) : [object SVGPaint]
</del><ins>+rect: style.getPropertyCSSValue(fill) : [object CSSPrimitiveValue]
</ins><span class="cx"> rect: style.getPropertyValue(fill-opacity) : 1
</span><span class="cx"> rect: style.getPropertyCSSValue(fill-opacity) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(fill-rule) : nonzero
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> rect: style.getPropertyValue(shape-rendering) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(shape-rendering) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(stroke) : rgb(255, 165, 0)
</span><del>-rect: style.getPropertyCSSValue(stroke) : [object SVGPaint]
</del><ins>+rect: style.getPropertyCSSValue(stroke) : [object CSSPrimitiveValue]
</ins><span class="cx"> rect: style.getPropertyValue(stroke-dasharray) : none
</span><span class="cx"> rect: style.getPropertyCSSValue(stroke-dasharray) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(stroke-dashoffset) : 0px
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx"> g: style.getPropertyValue(color-rendering) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(color-rendering) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(fill) : rgb(0, 0, 0)
</span><del>-g: style.getPropertyCSSValue(fill) : [object SVGPaint]
</del><ins>+g: style.getPropertyCSSValue(fill) : [object CSSPrimitiveValue]
</ins><span class="cx"> g: style.getPropertyValue(fill-opacity) : 1
</span><span class="cx"> g: style.getPropertyCSSValue(fill-opacity) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(fill-rule) : nonzero
</span><span class="lines">@@ -979,7 +979,7 @@
</span><span class="cx"> g: style.getPropertyValue(shape-rendering) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(shape-rendering) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(stroke) : rgb(255, 165, 0)
</span><del>-g: style.getPropertyCSSValue(stroke) : [object SVGPaint]
</del><ins>+g: style.getPropertyCSSValue(stroke) : [object CSSPrimitiveValue]
</ins><span class="cx"> g: style.getPropertyValue(stroke-dasharray) : none
</span><span class="cx"> g: style.getPropertyCSSValue(stroke-dasharray) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(stroke-dashoffset) : 0px
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssrectsystemcolorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/rect-system-color-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/rect-system-color-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/css/rect-system-color-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -5,201 +5,89 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> Testing system colorActiveBorder
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorActiveCaption
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorAppWorkspace
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorBackground
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorButtonFace
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorButtonHighlight
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorButtonShadow
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorButtonText
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorCaptionText
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorGrayText
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorHighlight
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorHighlightText
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorInactiveBorder
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorInactiveCaption
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorInactiveCaptionText
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorInfoBackground
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorInfoText
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorMenu
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorMenuText
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorScrollbar
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorThreeDDarkShadow
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorThreeDFace
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorThreeDHighlight
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorThreeDLightShadow
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorThreeDShadow
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorWindow
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorWindowFrame
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> Testing system colorWindowText
</span><del>-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
-PASS color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorRed
-PASS color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorGreen
-PASS color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is systemColorBlue
</del><ins>+PASS computedStyleText.fill is computedStyleDiv.color
+PASS computedStyleText.stroke is computedStyleDiv.color
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssrectsystemcolorxhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/rect-system-color.xhtml (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/rect-system-color.xhtml        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/css/rect-system-color.xhtml        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -13,28 +13,13 @@
</span><span class="cx"> function checkSystemColor(id1, id2, systemColor)
</span><span class="cx"> {
</span><span class="cx">     var textElement = document.getElementById(id1);
</span><del>-    var computedStyleText = textElement.ownerDocument.defaultView.getComputedStyle(textElement);
</del><ins>+    computedStyleText = textElement.ownerDocument.defaultView.getComputedStyle(textElement);
</ins><span class="cx">     var divElement = document.getElementById(id2);
</span><del>-    var computedStyleDiv = divElement.ownerDocument.defaultView.getComputedStyle(divElement);
</del><ins>+    computedStyleDiv = divElement.ownerDocument.defaultView.getComputedStyle(divElement);
</ins><span class="cx"> 
</span><del>-    color1 = computedStyleText.getPropertyCSSValue('fill').rgbColor;
-    color2 = computedStyleDiv.getPropertyCSSValue('color').getRGBColorValue();
-
-    systemColorRed = color2.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER);
-    systemColorGreen = color2.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER);
-    systemColorBlue = color2.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER);
-
</del><span class="cx">     debug('Testing system color' + systemColor);
</span><del>-
-    shouldBe(&quot;color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;systemColorRed&quot;);
-    shouldBe(&quot;color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;systemColorGreen&quot;);
-    shouldBe(&quot;color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;systemColorBlue&quot;);
-
-    color1 = computedStyleText.getPropertyCSSValue('stroke').rgbColor;
-
-    shouldBe(&quot;color1.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;systemColorRed&quot;);
-    shouldBe(&quot;color1.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;systemColorGreen&quot;);
-    shouldBe(&quot;color1.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER)&quot;, &quot;systemColorBlue&quot;);
</del><ins>+    shouldBe(&quot;computedStyleText.fill&quot;, &quot;computedStyleDiv.color&quot;);
+    shouldBe(&quot;computedStyleText.stroke&quot;, &quot;computedStyleDiv.color&quot;);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> description('Test that fill and stroke properties accept system colors');
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomglobalconstructorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/global-constructors-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/global-constructors-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/custom/global-constructors-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> PASS SVGAnimatedLengthList.toString() is &quot;function SVGAnimatedLengthList() {\n    [native code]\n}&quot;
</span><span class="cx"> PASS SVGAngle.toString() is &quot;function SVGAngle() {\n    [native code]\n}&quot;
</span><span class="cx"> PASS SVGAnimatedAngle.toString() is &quot;function SVGAnimatedAngle() {\n    [native code]\n}&quot;
</span><del>-PASS SVGColor.toString() is &quot;function SVGColor() {\n    [native code]\n}&quot;
</del><span class="cx"> FAIL SVGICCColor.toString() should be function SVGICCColor() {
</span><span class="cx">     [native code]
</span><span class="cx"> }. Threw exception ReferenceError: Can't find variable: SVGICCColor
</span><span class="lines">@@ -110,7 +109,6 @@
</span><span class="cx"> PASS SVGAltGlyphDefElement.toString() is &quot;function SVGAltGlyphDefElement() {\n    [native code]\n}&quot;
</span><span class="cx"> PASS SVGAltGlyphItemElement.toString() is &quot;function SVGAltGlyphItemElement() {\n    [native code]\n}&quot;
</span><span class="cx"> PASS SVGGlyphRefElement.toString() is &quot;function SVGGlyphRefElement() {\n    [native code]\n}&quot;
</span><del>-PASS SVGPaint.toString() is &quot;function SVGPaint() {\n    [native code]\n}&quot;
</del><span class="cx"> PASS SVGMarkerElement.toString() is &quot;function SVGMarkerElement() {\n    [native code]\n}&quot;
</span><span class="cx"> FAIL SVGColorProfileElement.toString() should be function SVGColorProfileElement() {
</span><span class="cx">     [native code]
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomjssvgconstructorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/js-svg-constructors-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/js-svg-constructors-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/custom/js-svg-constructors-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -3,10 +3,6 @@
</span><span class="cx"> SVGAngle.SVG_ANGLETYPE_DEG PASSED
</span><span class="cx"> SVGAngle.SVG_ANGLETYPE_RAD PASSED
</span><span class="cx"> SVGAngle.SVG_ANGLETYPE_GRAD PASSED
</span><del>-SVGColor.SVG_COLORTYPE_UNKNOWN PASSED
-SVGColor.SVG_COLORTYPE_RGBCOLOR PASSED
-SVGColor.SVG_COLORTYPE_RGBCOLOR_ICCCOLOR PASSED
-SVGColor.SVG_COLORTYPE_CURRENTCOLOR PASSED
</del><span class="cx"> SVGComponentTransferFunctionElement.SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN PASSED
</span><span class="cx"> SVGComponentTransferFunctionElement.SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY PASSED
</span><span class="cx"> SVGComponentTransferFunctionElement.SVG_FECOMPONENTTRANSFER_TYPE_TABLE PASSED
</span><span class="lines">@@ -74,16 +70,6 @@
</span><span class="cx"> SVGMarkerElement.SVG_MARKER_ORIENT_UNKNOWN PASSED
</span><span class="cx"> SVGMarkerElement.SVG_MARKER_ORIENT_AUTO PASSED
</span><span class="cx"> SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE PASSED
</span><del>-SVGPaint.SVG_PAINTTYPE_UNKNOWN PASSED
-SVGPaint.SVG_PAINTTYPE_RGBCOLOR PASSED
-SVGPaint.SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR PASSED
-SVGPaint.SVG_PAINTTYPE_NONE PASSED
-SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR PASSED
-SVGPaint.SVG_PAINTTYPE_URI_NONE PASSED
-SVGPaint.SVG_PAINTTYPE_URI_CURRENTCOLOR PASSED
-SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR PASSED
-SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR PASSED
-SVGPaint.SVG_PAINTTYPE_URI PASSED
</del><span class="cx"> SVGPathSeg.PATHSEG_UNKNOWN PASSED
</span><span class="cx"> SVGPathSeg.PATHSEG_CLOSEPATH PASSED
</span><span class="cx"> SVGPathSeg.PATHSEG_MOVETO_ABS PASSED
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomjssvgconstructorssvg"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/js-svg-constructors.svg (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/js-svg-constructors.svg        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/custom/js-svg-constructors.svg        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -30,11 +30,6 @@
</span><span class="cx">       expect(&quot;SVGAngle.SVG_ANGLETYPE_RAD&quot;, 3);
</span><span class="cx">       expect(&quot;SVGAngle.SVG_ANGLETYPE_GRAD&quot;, 4)
</span><span class="cx"> 
</span><del>-      expect(&quot;SVGColor.SVG_COLORTYPE_UNKNOWN&quot;, 0);
-      expect(&quot;SVGColor.SVG_COLORTYPE_RGBCOLOR&quot;, 1);
-      expect(&quot;SVGColor.SVG_COLORTYPE_RGBCOLOR_ICCCOLOR&quot;, 2);
-      expect(&quot;SVGColor.SVG_COLORTYPE_CURRENTCOLOR&quot;, 3);
-
</del><span class="cx">       if (window.SVGComponentTransferFunctionElement) {
</span><span class="cx">           expect(&quot;SVGComponentTransferFunctionElement.SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN&quot;, 0);
</span><span class="cx">           expect(&quot;SVGComponentTransferFunctionElement.SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY&quot;, 1);
</span><span class="lines">@@ -131,17 +126,6 @@
</span><span class="cx">       expect(&quot;SVGMarkerElement.SVG_MARKER_ORIENT_AUTO&quot;, 1);
</span><span class="cx">       expect(&quot;SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE&quot;, 2);
</span><span class="cx"> 
</span><del>-      expect(&quot;SVGPaint.SVG_PAINTTYPE_UNKNOWN&quot;, 0);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_RGBCOLOR&quot;, 1);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR&quot;, 2);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_NONE&quot;, 101);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR&quot;, 102);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_URI_NONE&quot;, 103);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_URI_CURRENTCOLOR&quot;, 104);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR&quot;, 105);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR&quot;, 106);
-      expect(&quot;SVGPaint.SVG_PAINTTYPE_URI&quot;, 107);
-
</del><span class="cx">       expect(&quot;SVGPathSeg.PATHSEG_UNKNOWN&quot;, 0);
</span><span class="cx">       expect(&quot;SVGPathSeg.PATHSEG_CLOSEPATH&quot;, 1);
</span><span class="cx">       expect(&quot;SVGPathSeg.PATHSEG_MOVETO_ABS&quot;, 2);
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomscripttestsglobalconstructorsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/script-tests/global-constructors.js (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/script-tests/global-constructors.js        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/svg/custom/script-tests/global-constructors.js        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> shouldBeDefined(&quot;SVGAnimatedLengthList&quot;);
</span><span class="cx"> shouldBeDefined(&quot;SVGAngle&quot;);
</span><span class="cx"> shouldBeDefined(&quot;SVGAnimatedAngle&quot;);
</span><del>-shouldBeDefined(&quot;SVGColor&quot;);
</del><span class="cx"> shouldBeDefined(&quot;SVGICCColor&quot;);
</span><span class="cx"> shouldBeDefined(&quot;SVGRect&quot;);
</span><span class="cx"> shouldBeDefined(&quot;SVGAnimatedRect&quot;);
</span><span class="lines">@@ -93,7 +92,6 @@
</span><span class="cx"> shouldBeDefined(&quot;SVGAltGlyphDefElement&quot;);
</span><span class="cx"> shouldBeDefined(&quot;SVGAltGlyphItemElement&quot;);
</span><span class="cx"> shouldBeDefined(&quot;SVGGlyphRefElement&quot;);
</span><del>-shouldBeDefined(&quot;SVGPaint&quot;);
</del><span class="cx"> shouldBeDefined(&quot;SVGMarkerElement&quot;);
</span><span class="cx"> shouldBeDefined(&quot;SVGColorProfileElement&quot;);
</span><span class="cx"> shouldBeDefined(&quot;SVGColorProfileRule&quot;);
</span></span></pre></div>
<a id="trunkLayoutTeststransitionssvgtransitionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/transitions/svg-transitions-expected.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transitions/svg-transitions-expected.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/transitions/svg-transitions-expected.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-CONSOLE MESSAGE: line 293: Failed to pause 'fill' transition on element 'rect7'
</del><span class="cx"> Example
</span><span class="cx"> PASS - &quot;fill-opacity&quot; property for &quot;rect1&quot; element at 1s saw something close to: 0.6
</span><span class="cx"> PASS - &quot;stroke-width&quot; property for &quot;rect1&quot; element at 1s saw something close to: 3
</span><span class="lines">@@ -5,8 +4,6 @@
</span><span class="cx"> PASS - &quot;stroke-opacity&quot; property for &quot;rect1&quot; element at 1s saw something close to: 0.6
</span><span class="cx"> PASS - &quot;stroke-dasharray&quot; property for &quot;rect1&quot; element at 1s saw something close to: 15,15
</span><span class="cx"> PASS - &quot;stroke-dashoffset&quot; property for &quot;rect1&quot; element at 1s saw something close to: 5
</span><del>-PASS - &quot;fill&quot; property for &quot;rect2&quot; element at 1s saw something close to: 0,127,127
-PASS - &quot;stroke&quot; property for &quot;rect2&quot; element at 1s saw something close to: 127,0,0
</del><span class="cx"> PASS - &quot;stroke-dasharray&quot; property for &quot;rect2&quot; element at 1s saw something close to: 15,15
</span><span class="cx"> PASS - &quot;stroke-width&quot; property for &quot;rect4&quot; element at 1s saw something close to: 8
</span><span class="cx"> PASS - &quot;stroke-width&quot; property for &quot;rect5&quot; element at 1s saw something close to: 5
</span><span class="lines">@@ -13,7 +10,6 @@
</span><span class="cx"> PASS - &quot;stroke-dasharray&quot; property for &quot;rect5&quot; element at 1s saw something close to: 20
</span><span class="cx"> PASS - &quot;stroke-width&quot; property for &quot;rect6&quot; element at 1s saw something close to: 15
</span><span class="cx"> PASS - &quot;stroke-dasharray&quot; property for &quot;rect6&quot; element at 1s saw something close to: 15,15,20,12.5,17.5,17.5
</span><del>-FAIL - &quot;fill&quot; property for &quot;rect7&quot; element at 1s expected: 0,0,127 but saw: url(#invalid) rgb(0, 0, 255)
</del><span class="cx"> PASS - &quot;stroke-dasharray&quot; property for &quot;rect7&quot; element at 1s saw something close to: none
</span><span class="cx"> PASS - &quot;stop-color&quot; property for &quot;stop1&quot; element at 1s saw something close to: 127,127,0
</span><span class="cx"> PASS - &quot;stop-opacity&quot; property for &quot;stop1&quot; element at 1s saw something close to: 0.75
</span></span></pre></div>
<a id="trunkLayoutTeststransitionssvgtransitionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/transitions/svg-transitions.html (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transitions/svg-transitions.html        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/LayoutTests/transitions/svg-transitions.html        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -135,8 +135,6 @@
</span><span class="cx">   [1, &quot;rect1&quot;, &quot;stroke-opacity&quot;, 0.6, 0.1], // 1 -&gt; 0.2
</span><span class="cx">   [1, &quot;rect1&quot;, &quot;stroke-dasharray&quot;, [15, 15], 1], // 10 -&gt; 20
</span><span class="cx">   [1, &quot;rect1&quot;, &quot;stroke-dashoffset&quot;, 5, 1], // 0 -&gt; 10
</span><del>-  [1, &quot;rect2&quot;, &quot;fill&quot;, [0, 127, 127], 20], // rgb(0, 0, 255) -&gt; rgb(0, 255, 0)
-  [1, &quot;rect2&quot;, &quot;stroke&quot;, [127, 0, 0], 20],  // rgb(255, 0, 0) -&gt; rgb(0, 0, 0)
</del><span class="cx">   [1, &quot;rect2&quot;, &quot;stroke-dasharray&quot;, [15, 15], 1], // 10 -&gt; 20
</span><span class="cx">   [1, &quot;rect4&quot;, &quot;stroke-width&quot;, 8, 1],  // 1px to 4mm
</span><span class="cx">   [1, &quot;rect5&quot;, &quot;stroke-width&quot;, 5, 1],  // 0 to 10px
</span><span class="lines">@@ -143,7 +141,6 @@
</span><span class="cx">   [1, &quot;rect5&quot;, &quot;stroke-dasharray&quot;, [20], 1], // 20 at half time
</span><span class="cx">   [1, &quot;rect6&quot;, &quot;stroke-width&quot;, 15, 2],  // 10% to 20%
</span><span class="cx">   [1, &quot;rect6&quot;, &quot;stroke-dasharray&quot;, [15, 15, 20, 12.5, 17.5, 17.5], 1], // 20 -&gt; 10, 15 -&gt; 15, 20 -&gt; 20, 15 -&gt; 10, 20 -&gt; 15, 15 -&gt; 20
</span><del>-  [1, &quot;rect7&quot;, &quot;fill&quot;, [0, 0, 127], 20],  // url(#invalid) black -&gt; url(#invalid) blue
</del><span class="cx">   [1, &quot;rect7&quot;, &quot;stroke-dasharray&quot;, &quot;none&quot;, 1], // none at half time
</span><span class="cx">   [1, &quot;stop1&quot;, &quot;stop-color&quot;, [127, 127, 0], 20], // rgb(255,0,0) -&gt; rgb(0, 255, 0)
</span><span class="cx">   [1, &quot;stop1&quot;, &quot;stop-opacity&quot;, 0.75, 0.1], // 1 -&gt; 0.5
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/CMakeLists.txt        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -664,7 +664,6 @@
</span><span class="cx">     svg/SVGAnimationElement.idl
</span><span class="cx">     svg/SVGCircleElement.idl
</span><span class="cx">     svg/SVGClipPathElement.idl
</span><del>-    svg/SVGColor.idl
</del><span class="cx">     svg/SVGComponentTransferFunctionElement.idl
</span><span class="cx">     svg/SVGCursorElement.idl
</span><span class="cx">     svg/SVGDefsElement.idl
</span><span class="lines">@@ -728,7 +727,6 @@
</span><span class="cx">     svg/SVGMissingGlyphElement.idl
</span><span class="cx">     svg/SVGNumber.idl
</span><span class="cx">     svg/SVGNumberList.idl
</span><del>-    svg/SVGPaint.idl
</del><span class="cx">     svg/SVGPathElement.idl
</span><span class="cx">     svg/SVGPathSeg.idl
</span><span class="cx">     svg/SVGPathSegArcAbs.idl
</span><span class="lines">@@ -2711,7 +2709,6 @@
</span><span class="cx">     svg/SVGAnimationElement.cpp
</span><span class="cx">     svg/SVGCircleElement.cpp
</span><span class="cx">     svg/SVGClipPathElement.cpp
</span><del>-    svg/SVGColor.cpp
</del><span class="cx">     svg/SVGComponentTransferFunctionElement.cpp
</span><span class="cx">     svg/SVGCursorElement.cpp
</span><span class="cx">     svg/SVGDefsElement.cpp
</span><span class="lines">@@ -2779,7 +2776,6 @@
</span><span class="cx">     svg/SVGMetadataElement.cpp
</span><span class="cx">     svg/SVGMissingGlyphElement.cpp
</span><span class="cx">     svg/SVGNumberListValues.cpp
</span><del>-    svg/SVGPaint.cpp
</del><span class="cx">     svg/SVGParserUtilities.cpp
</span><span class="cx">     svg/SVGPathBlender.cpp
</span><span class="cx">     svg/SVGPathBuilder.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/ChangeLog        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,3 +1,81 @@
</span><ins>+2016-12-13  Dave Hyatt  &lt;hyatt@apple.com&gt;
+
+        [CSS Parser] Eliminate SVGPaint and SVGColor
+        https://bugs.webkit.org/show_bug.cgi?id=165819
+
+        Reviewed by Dean Jackson.
+
+        Remove SVGColor and SVGPaint CSS values from the tree. The new parser
+        already stopped making these values when parsing, so all that's left
+        is to make sure computed style doesn't use these values either.
+
+        We are the only browser engine to support these CSS values, they see no use
+        on the Web, and they're already gone at the parsing level, so it's time
+        to remove these interfaces from our tree.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSCSSValueCustom.cpp:
+        (WebCore::toJSNewlyCreated):
+        * css/CSSComputedStyleDeclaration.h:
+        * css/CSSValue.cpp:
+        (WebCore::CSSValue::equals):
+        (WebCore::CSSValue::cssText):
+        (WebCore::CSSValue::destroy):
+        (WebCore::CSSValue::cloneForCSSOM):
+        * css/CSSValue.h:
+        (WebCore::CSSValue::isSubtypeExposedToCSSOM):
+        (WebCore::CSSValue::isSVGColor): Deleted.
+        (WebCore::CSSValue::isSVGPaint): Deleted.
+        * css/SVGCSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::adjustSVGPaintForCurrentColor):
+        (WebCore::ComputedStyleExtractor::svgPropertyValue):
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertSVGColor):
+        * css/StyleBuilderCustom.h:
+        (WebCore::StyleBuilderCustom::applyValueFill):
+        (WebCore::StyleBuilderCustom::applyValueStroke):
+        * page/animation/CSSPropertyAnimation.cpp:
+        (WebCore::PropertyWrapperSVGPaint::PropertyWrapperSVGPaint):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::fillPaintType):
+        (WebCore::RenderStyle::setFillPaintColor):
+        (WebCore::RenderStyle::strokePaintType):
+        (WebCore::RenderStyle::setStrokePaintColor):
+        * rendering/style/SVGRenderStyle.h:
+        (WebCore::SVGRenderStyle::initialFillPaintType):
+        (WebCore::SVGRenderStyle::initialStrokePaintType):
+        (WebCore::SVGRenderStyle::setFillPaint):
+        (WebCore::SVGRenderStyle::setStrokePaint):
+        (WebCore::SVGRenderStyle::fillPaintType):
+        (WebCore::SVGRenderStyle::strokePaintType):
+        (WebCore::SVGRenderStyle::visitedLinkFillPaintType):
+        (WebCore::SVGRenderStyle::visitedLinkStrokePaintType):
+        (WebCore::SVGRenderStyle::hasStroke):
+        (WebCore::SVGRenderStyle::hasFill):
+        * rendering/style/SVGRenderStyleDefs.h:
+        * rendering/svg/RenderSVGResource.cpp:
+        (WebCore::requestPaintingResource):
+        * rendering/svg/SVGResources.cpp:
+        (WebCore::paintingResourceFromSVGPaint):
+        * svg/SVGAllInOne.cpp:
+        * svg/SVGAnimatedColor.cpp:
+        (WebCore::SVGAnimatedColorAnimator::constructFromString):
+        (WebCore::parseColorFromString):
+        (WebCore::SVGAnimatedColorAnimator::calculateDistance):
+        * svg/SVGAnimatedType.cpp:
+        (WebCore::SVGAnimatedType::setValueAsString):
+        * svg/SVGAnimatedType.h:
+        * svg/SVGColor.cpp: Removed.
+        * svg/SVGColor.h: Removed.
+        * svg/SVGColor.idl: Removed.
+        * svg/SVGFEDiffuseLightingElement.cpp:
+        * svg/SVGFESpecularLightingElement.cpp:
+        * svg/SVGPaint.cpp: Removed.
+        * svg/SVGPaint.h: Removed.
+        * svg/SVGPaint.idl: Removed.
+
</ins><span class="cx"> 2016-12-13  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Restore NSURLRequest's default time interval to match behavior before NSURLSession adoption
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/DerivedSources.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -462,7 +462,6 @@
</span><span class="cx"> #include &quot;JSSVGAnimationElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGCircleElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGClipPathElement.cpp&quot;
</span><del>-#include &quot;JSSVGColor.cpp&quot;
</del><span class="cx"> #include &quot;JSSVGComponentTransferFunctionElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGCursorElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGDefsElement.cpp&quot;
</span><span class="lines">@@ -526,7 +525,6 @@
</span><span class="cx"> #include &quot;JSSVGMissingGlyphElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGNumber.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGNumberList.cpp&quot;
</span><del>-#include &quot;JSSVGPaint.cpp&quot;
</del><span class="cx"> #include &quot;JSSVGPathElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGPathSeg.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGPathSegArcAbs.cpp&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/DerivedSources.make        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -615,7 +615,6 @@
</span><span class="cx">     $(WebCore)/svg/SVGAnimationElement.idl \
</span><span class="cx">     $(WebCore)/svg/SVGCircleElement.idl \
</span><span class="cx">     $(WebCore)/svg/SVGClipPathElement.idl \
</span><del>-    $(WebCore)/svg/SVGColor.idl \
</del><span class="cx">     $(WebCore)/svg/SVGComponentTransferFunctionElement.idl \
</span><span class="cx">     $(WebCore)/svg/SVGCursorElement.idl \
</span><span class="cx">     $(WebCore)/svg/SVGDefsElement.idl \
</span><span class="lines">@@ -679,7 +678,6 @@
</span><span class="cx">     $(WebCore)/svg/SVGMissingGlyphElement.idl \
</span><span class="cx">     $(WebCore)/svg/SVGNumber.idl \
</span><span class="cx">     $(WebCore)/svg/SVGNumberList.idl \
</span><del>-    $(WebCore)/svg/SVGPaint.idl \
</del><span class="cx">     $(WebCore)/svg/SVGPathElement.idl \
</span><span class="cx">     $(WebCore)/svg/SVGPathSeg.idl \
</span><span class="cx">     $(WebCore)/svg/SVGPathSegArcAbs.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -4548,8 +4548,6 @@
</span><span class="cx">                 B222799C0D00BF220071B782 /* SVGCircleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278060D00BF1F0071B782 /* SVGCircleElement.h */; };
</span><span class="cx">                 B222799E0D00BF220071B782 /* SVGClipPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278080D00BF1F0071B782 /* SVGClipPathElement.cpp */; };
</span><span class="cx">                 B222799F0D00BF220071B782 /* SVGClipPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278090D00BF1F0071B782 /* SVGClipPathElement.h */; };
</span><del>-                B22279A10D00BF220071B782 /* SVGColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222780B0D00BF1F0071B782 /* SVGColor.cpp */; };
-                B22279A20D00BF220071B782 /* SVGColor.h in Headers */ = {isa = PBXBuildFile; fileRef = B222780C0D00BF1F0071B782 /* SVGColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx">                 B22279A40D00BF220071B782 /* SVGComponentTransferFunctionElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222780E0D00BF1F0071B782 /* SVGComponentTransferFunctionElement.cpp */; };
</span><span class="cx">                 B22279A50D00BF220071B782 /* SVGComponentTransferFunctionElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222780F0D00BF1F0071B782 /* SVGComponentTransferFunctionElement.h */; };
</span><span class="cx">                 B22279A70D00BF220071B782 /* SVGCursorElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278110D00BF1F0071B782 /* SVGCursorElement.cpp */; };
</span><span class="lines">@@ -4655,8 +4653,6 @@
</span><span class="cx">                 B2227A4D0D00BF220071B782 /* SVGMPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278B70D00BF200071B782 /* SVGMPathElement.cpp */; };
</span><span class="cx">                 B2227A4E0D00BF220071B782 /* SVGMPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278B80D00BF200071B782 /* SVGMPathElement.h */; };
</span><span class="cx">                 B2227A510D00BF220071B782 /* SVGNumberList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278BB0D00BF200071B782 /* SVGNumberList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-                B2227A530D00BF220071B782 /* SVGPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278BD0D00BF200071B782 /* SVGPaint.cpp */; };
-                B2227A540D00BF220071B782 /* SVGPaint.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278BE0D00BF200071B782 /* SVGPaint.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx">                 B2227A560D00BF220071B782 /* SVGParserUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278C00D00BF200071B782 /* SVGParserUtilities.cpp */; };
</span><span class="cx">                 B2227A570D00BF220071B782 /* SVGParserUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278C10D00BF200071B782 /* SVGParserUtilities.h */; };
</span><span class="cx">                 B2227A580D00BF220071B782 /* SVGPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278C20D00BF200071B782 /* SVGPathElement.cpp */; };
</span><span class="lines">@@ -4907,8 +4903,6 @@
</span><span class="cx">                 B2FA3D590AB75A6F000E5AC4 /* JSSVGCircleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3C710AB75A6E000E5AC4 /* JSSVGCircleElement.h */; };
</span><span class="cx">                 B2FA3D5A0AB75A6F000E5AC4 /* JSSVGClipPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3C720AB75A6E000E5AC4 /* JSSVGClipPathElement.cpp */; };
</span><span class="cx">                 B2FA3D5B0AB75A6F000E5AC4 /* JSSVGClipPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3C730AB75A6E000E5AC4 /* JSSVGClipPathElement.h */; };
</span><del>-                B2FA3D5C0AB75A6F000E5AC4 /* JSSVGColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3C740AB75A6E000E5AC4 /* JSSVGColor.cpp */; };
-                B2FA3D5D0AB75A6F000E5AC4 /* JSSVGColor.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3C750AB75A6E000E5AC4 /* JSSVGColor.h */; };
</del><span class="cx">                 B2FA3D5E0AB75A6F000E5AC4 /* JSSVGComponentTransferFunctionElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3C760AB75A6E000E5AC4 /* JSSVGComponentTransferFunctionElement.cpp */; };
</span><span class="cx">                 B2FA3D5F0AB75A6F000E5AC4 /* JSSVGComponentTransferFunctionElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3C770AB75A6E000E5AC4 /* JSSVGComponentTransferFunctionElement.h */; };
</span><span class="cx">                 B2FA3D600AB75A6F000E5AC4 /* JSSVGCursorElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3C780AB75A6E000E5AC4 /* JSSVGCursorElement.cpp */; };
</span><span class="lines">@@ -4993,8 +4987,6 @@
</span><span class="cx">                 B2FA3DAF0AB75A6F000E5AC4 /* JSSVGMetadataElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CC70AB75A6E000E5AC4 /* JSSVGMetadataElement.h */; };
</span><span class="cx">                 B2FA3DB00AB75A6F000E5AC4 /* JSSVGNumberList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CC80AB75A6E000E5AC4 /* JSSVGNumberList.cpp */; };
</span><span class="cx">                 B2FA3DB10AB75A6F000E5AC4 /* JSSVGNumberList.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CC90AB75A6E000E5AC4 /* JSSVGNumberList.h */; };
</span><del>-                B2FA3DB20AB75A6F000E5AC4 /* JSSVGPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CCA0AB75A6E000E5AC4 /* JSSVGPaint.cpp */; };
-                B2FA3DB30AB75A6F000E5AC4 /* JSSVGPaint.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CCB0AB75A6E000E5AC4 /* JSSVGPaint.h */; };
</del><span class="cx">                 B2FA3DB40AB75A6F000E5AC4 /* JSSVGPathElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CCC0AB75A6E000E5AC4 /* JSSVGPathElement.cpp */; };
</span><span class="cx">                 B2FA3DB50AB75A6F000E5AC4 /* JSSVGPathElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CCD0AB75A6E000E5AC4 /* JSSVGPathElement.h */; };
</span><span class="cx">                 B2FA3DB60AB75A6F000E5AC4 /* JSSVGPathSeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CCE0AB75A6E000E5AC4 /* JSSVGPathSeg.cpp */; };
</span><span class="lines">@@ -12278,9 +12270,6 @@
</span><span class="cx">                 B22278080D00BF1F0071B782 /* SVGClipPathElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGClipPathElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B22278090D00BF1F0071B782 /* SVGClipPathElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGClipPathElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B222780A0D00BF1F0071B782 /* SVGClipPathElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGClipPathElement.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                B222780B0D00BF1F0071B782 /* SVGColor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGColor.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                B222780C0D00BF1F0071B782 /* SVGColor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGColor.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                B222780D0D00BF1F0071B782 /* SVGColor.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGColor.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 B222780E0D00BF1F0071B782 /* SVGComponentTransferFunctionElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGComponentTransferFunctionElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B222780F0D00BF1F0071B782 /* SVGComponentTransferFunctionElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGComponentTransferFunctionElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B22278100D00BF1F0071B782 /* SVGComponentTransferFunctionElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGComponentTransferFunctionElement.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -12439,9 +12428,6 @@
</span><span class="cx">                 B22278B90D00BF200071B782 /* SVGNumber.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGNumber.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B22278BB0D00BF200071B782 /* SVGNumberList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGNumberList.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B22278BC0D00BF200071B782 /* SVGNumberList.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGNumberList.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                B22278BD0D00BF200071B782 /* SVGPaint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPaint.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                B22278BE0D00BF200071B782 /* SVGPaint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGPaint.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                B22278BF0D00BF200071B782 /* SVGPaint.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGPaint.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 B22278C00D00BF200071B782 /* SVGParserUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGParserUtilities.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B22278C10D00BF200071B782 /* SVGParserUtilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGParserUtilities.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B22278C20D00BF200071B782 /* SVGPathElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -12758,8 +12744,6 @@
</span><span class="cx">                 B2FA3C710AB75A6E000E5AC4 /* JSSVGCircleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGCircleElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B2FA3C720AB75A6E000E5AC4 /* JSSVGClipPathElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGClipPathElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B2FA3C730AB75A6E000E5AC4 /* JSSVGClipPathElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGClipPathElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                B2FA3C740AB75A6E000E5AC4 /* JSSVGColor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGColor.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                B2FA3C750AB75A6E000E5AC4 /* JSSVGColor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGColor.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 B2FA3C760AB75A6E000E5AC4 /* JSSVGComponentTransferFunctionElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGComponentTransferFunctionElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B2FA3C770AB75A6E000E5AC4 /* JSSVGComponentTransferFunctionElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGComponentTransferFunctionElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B2FA3C780AB75A6E000E5AC4 /* JSSVGCursorElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGCursorElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -12844,8 +12828,6 @@
</span><span class="cx">                 B2FA3CC70AB75A6E000E5AC4 /* JSSVGMetadataElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGMetadataElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B2FA3CC80AB75A6E000E5AC4 /* JSSVGNumberList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGNumberList.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B2FA3CC90AB75A6E000E5AC4 /* JSSVGNumberList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGNumberList.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                B2FA3CCA0AB75A6E000E5AC4 /* JSSVGPaint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGPaint.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                B2FA3CCB0AB75A6E000E5AC4 /* JSSVGPaint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGPaint.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 B2FA3CCC0AB75A6E000E5AC4 /* JSSVGPathElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGPathElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B2FA3CCD0AB75A6E000E5AC4 /* JSSVGPathElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGPathElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 B2FA3CCE0AB75A6E000E5AC4 /* JSSVGPathSeg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGPathSeg.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -20073,8 +20055,6 @@
</span><span class="cx">                                 B2FA3C710AB75A6E000E5AC4 /* JSSVGCircleElement.h */,
</span><span class="cx">                                 B2FA3C720AB75A6E000E5AC4 /* JSSVGClipPathElement.cpp */,
</span><span class="cx">                                 B2FA3C730AB75A6E000E5AC4 /* JSSVGClipPathElement.h */,
</span><del>-                                B2FA3C740AB75A6E000E5AC4 /* JSSVGColor.cpp */,
-                                B2FA3C750AB75A6E000E5AC4 /* JSSVGColor.h */,
</del><span class="cx">                                 B2FA3C760AB75A6E000E5AC4 /* JSSVGComponentTransferFunctionElement.cpp */,
</span><span class="cx">                                 B2FA3C770AB75A6E000E5AC4 /* JSSVGComponentTransferFunctionElement.h */,
</span><span class="cx">                                 B2FA3C780AB75A6E000E5AC4 /* JSSVGCursorElement.cpp */,
</span><span class="lines">@@ -20195,8 +20175,6 @@
</span><span class="cx">                                 8574D1F40ADE6122004CBA11 /* JSSVGNumber.h */,
</span><span class="cx">                                 B2FA3CC80AB75A6E000E5AC4 /* JSSVGNumberList.cpp */,
</span><span class="cx">                                 B2FA3CC90AB75A6E000E5AC4 /* JSSVGNumberList.h */,
</span><del>-                                B2FA3CCA0AB75A6E000E5AC4 /* JSSVGPaint.cpp */,
-                                B2FA3CCB0AB75A6E000E5AC4 /* JSSVGPaint.h */,
</del><span class="cx">                                 B2FA3CCC0AB75A6E000E5AC4 /* JSSVGPathElement.cpp */,
</span><span class="cx">                                 B2FA3CCD0AB75A6E000E5AC4 /* JSSVGPathElement.h */,
</span><span class="cx">                                 B2FA3CCE0AB75A6E000E5AC4 /* JSSVGPathSeg.cpp */,
</span><span class="lines">@@ -20976,9 +20954,6 @@
</span><span class="cx">                                 B22278080D00BF1F0071B782 /* SVGClipPathElement.cpp */,
</span><span class="cx">                                 B22278090D00BF1F0071B782 /* SVGClipPathElement.h */,
</span><span class="cx">                                 B222780A0D00BF1F0071B782 /* SVGClipPathElement.idl */,
</span><del>-                                B222780B0D00BF1F0071B782 /* SVGColor.cpp */,
-                                B222780C0D00BF1F0071B782 /* SVGColor.h */,
-                                B222780D0D00BF1F0071B782 /* SVGColor.idl */,
</del><span class="cx">                                 B222780E0D00BF1F0071B782 /* SVGComponentTransferFunctionElement.cpp */,
</span><span class="cx">                                 B222780F0D00BF1F0071B782 /* SVGComponentTransferFunctionElement.h */,
</span><span class="cx">                                 B22278100D00BF1F0071B782 /* SVGComponentTransferFunctionElement.idl */,
</span><span class="lines">@@ -21183,9 +21158,6 @@
</span><span class="cx">                                 B22278BC0D00BF200071B782 /* SVGNumberList.idl */,
</span><span class="cx">                                 7C39C3681DDB86D300FEFB29 /* SVGNumberListValues.cpp */,
</span><span class="cx">                                 7C39C3691DDB86D300FEFB29 /* SVGNumberListValues.h */,
</span><del>-                                B22278BD0D00BF200071B782 /* SVGPaint.cpp */,
-                                B22278BE0D00BF200071B782 /* SVGPaint.h */,
-                                B22278BF0D00BF200071B782 /* SVGPaint.idl */,
</del><span class="cx">                                 B22278C00D00BF200071B782 /* SVGParserUtilities.cpp */,
</span><span class="cx">                                 B22278C10D00BF200071B782 /* SVGParserUtilities.h */,
</span><span class="cx">                                 2D3A0E3513A7D76100E85AF0 /* SVGParsingError.h */,
</span><span class="lines">@@ -26414,7 +26386,6 @@
</span><span class="cx">                                 B2FA3D570AB75A6F000E5AC4 /* JSSVGAnimationElement.h in Headers */,
</span><span class="cx">                                 B2FA3D590AB75A6F000E5AC4 /* JSSVGCircleElement.h in Headers */,
</span><span class="cx">                                 B2FA3D5B0AB75A6F000E5AC4 /* JSSVGClipPathElement.h in Headers */,
</span><del>-                                B2FA3D5D0AB75A6F000E5AC4 /* JSSVGColor.h in Headers */,
</del><span class="cx">                                 B2FA3D5F0AB75A6F000E5AC4 /* JSSVGComponentTransferFunctionElement.h in Headers */,
</span><span class="cx">                                 B2FA3D610AB75A6F000E5AC4 /* JSSVGCursorElement.h in Headers */,
</span><span class="cx">                                 B2FA3D630AB75A6F000E5AC4 /* JSSVGDefsElement.h in Headers */,
</span><span class="lines">@@ -26476,7 +26447,6 @@
</span><span class="cx">                                 4496E3A0139813A5003EE32A /* JSSVGMPathElement.h in Headers */,
</span><span class="cx">                                 8542A7970AE5C94300DF58DF /* JSSVGNumber.h in Headers */,
</span><span class="cx">                                 B2FA3DB10AB75A6F000E5AC4 /* JSSVGNumberList.h in Headers */,
</span><del>-                                B2FA3DB30AB75A6F000E5AC4 /* JSSVGPaint.h in Headers */,
</del><span class="cx">                                 B2FA3DB50AB75A6F000E5AC4 /* JSSVGPathElement.h in Headers */,
</span><span class="cx">                                 B2FA3DB70AB75A6F000E5AC4 /* JSSVGPathSeg.h in Headers */,
</span><span class="cx">                                 B2FA3DB90AB75A6F000E5AC4 /* JSSVGPathSegArcAbs.h in Headers */,
</span><span class="lines">@@ -27696,7 +27666,6 @@
</span><span class="cx">                                 08FB3F8413BC754C0099FC18 /* SVGAttributeToPropertyMap.h in Headers */,
</span><span class="cx">                                 B222799C0D00BF220071B782 /* SVGCircleElement.h in Headers */,
</span><span class="cx">                                 B222799F0D00BF220071B782 /* SVGClipPathElement.h in Headers */,
</span><del>-                                B22279A20D00BF220071B782 /* SVGColor.h in Headers */,
</del><span class="cx">                                 B22279A50D00BF220071B782 /* SVGComponentTransferFunctionElement.h in Headers */,
</span><span class="cx">                                 B22279A80D00BF220071B782 /* SVGCursorElement.h in Headers */,
</span><span class="cx">                                 B22279AE0D00BF220071B782 /* SVGDefsElement.h in Headers */,
</span><span class="lines">@@ -27781,7 +27750,6 @@
</span><span class="cx">                                 B2A1F2B10CEF0ABF00442F6A /* SVGMissingGlyphElement.h in Headers */,
</span><span class="cx">                                 B2227A4E0D00BF220071B782 /* SVGMPathElement.h in Headers */,
</span><span class="cx">                                 B2227A510D00BF220071B782 /* SVGNumberList.h in Headers */,
</span><del>-                                B2227A540D00BF220071B782 /* SVGPaint.h in Headers */,
</del><span class="cx">                                 B2227A570D00BF220071B782 /* SVGParserUtilities.h in Headers */,
</span><span class="cx">                                 2D3A0E3613A7D76100E85AF0 /* SVGParsingError.h in Headers */,
</span><span class="cx">                                 84C6784D1214814700A92902 /* SVGPathBlender.h in Headers */,
</span><span class="lines">@@ -30202,7 +30170,6 @@
</span><span class="cx">                                 B2FA3D560AB75A6F000E5AC4 /* JSSVGAnimationElement.cpp in Sources */,
</span><span class="cx">                                 B2FA3D580AB75A6F000E5AC4 /* JSSVGCircleElement.cpp in Sources */,
</span><span class="cx">                                 B2FA3D5A0AB75A6F000E5AC4 /* JSSVGClipPathElement.cpp in Sources */,
</span><del>-                                B2FA3D5C0AB75A6F000E5AC4 /* JSSVGColor.cpp in Sources */,
</del><span class="cx">                                 B2FA3D5E0AB75A6F000E5AC4 /* JSSVGComponentTransferFunctionElement.cpp in Sources */,
</span><span class="cx">                                 B2FA3D600AB75A6F000E5AC4 /* JSSVGCursorElement.cpp in Sources */,
</span><span class="cx">                                 B2FA3D620AB75A6F000E5AC4 /* JSSVGDefsElement.cpp in Sources */,
</span><span class="lines">@@ -30266,7 +30233,6 @@
</span><span class="cx">                                 4496E3A2139813CB003EE32A /* JSSVGMPathElement.cpp in Sources */,
</span><span class="cx">                                 8542A7980AE5C94300DF58DF /* JSSVGNumber.cpp in Sources */,
</span><span class="cx">                                 B2FA3DB00AB75A6F000E5AC4 /* JSSVGNumberList.cpp in Sources */,
</span><del>-                                B2FA3DB20AB75A6F000E5AC4 /* JSSVGPaint.cpp in Sources */,
</del><span class="cx">                                 B2FA3DB40AB75A6F000E5AC4 /* JSSVGPathElement.cpp in Sources */,
</span><span class="cx">                                 B2FA3DB60AB75A6F000E5AC4 /* JSSVGPathSeg.cpp in Sources */,
</span><span class="cx">                                 B2FA3DB80AB75A6F000E5AC4 /* JSSVGPathSegArcAbs.cpp in Sources */,
</span><span class="lines">@@ -31305,7 +31271,6 @@
</span><span class="cx">                                 08FB17C113BC7E9100040086 /* SVGAttributeToPropertyMap.cpp in Sources */,
</span><span class="cx">                                 B222799B0D00BF220071B782 /* SVGCircleElement.cpp in Sources */,
</span><span class="cx">                                 B222799E0D00BF220071B782 /* SVGClipPathElement.cpp in Sources */,
</span><del>-                                B22279A10D00BF220071B782 /* SVGColor.cpp in Sources */,
</del><span class="cx">                                 B22279A40D00BF220071B782 /* SVGComponentTransferFunctionElement.cpp in Sources */,
</span><span class="cx">                                 B2227B050D00BFF10071B782 /* SVGCSSComputedStyleDeclaration.cpp in Sources */,
</span><span class="cx">                                 B22279A70D00BF220071B782 /* SVGCursorElement.cpp in Sources */,
</span><span class="lines">@@ -31379,7 +31344,6 @@
</span><span class="cx">                                 B2A1F2B00CEF0ABF00442F6A /* SVGMissingGlyphElement.cpp in Sources */,
</span><span class="cx">                                 B2227A4D0D00BF220071B782 /* SVGMPathElement.cpp in Sources */,
</span><span class="cx">                                 A833C7CA0A2CF06B00D57664 /* SVGNames.cpp in Sources */,
</span><del>-                                B2227A530D00BF220071B782 /* SVGPaint.cpp in Sources */,
</del><span class="cx">                                 B2227A560D00BF220071B782 /* SVGParserUtilities.cpp in Sources */,
</span><span class="cx">                                 84C6784C1214814700A92902 /* SVGPathBlender.cpp in Sources */,
</span><span class="cx">                                 8476C9EA11DF6A2900555B02 /* SVGPathBuilder.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSValueCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -31,11 +31,7 @@
</span><span class="cx"> #include &quot;JSCSSPrimitiveValue.h&quot;
</span><span class="cx"> #include &quot;JSCSSValueList.h&quot;
</span><span class="cx"> #include &quot;JSNode.h&quot;
</span><del>-#include &quot;JSSVGColor.h&quot;
-#include &quot;JSSVGPaint.h&quot;
</del><span class="cx"> #include &quot;JSWebKitCSSTransformValue.h&quot;
</span><del>-#include &quot;SVGColor.h&quot;
-#include &quot;SVGPaint.h&quot;
</del><span class="cx"> #include &quot;WebKitCSSTransformValue.h&quot;
</span><span class="cx"> 
</span><span class="cx"> using namespace JSC;
</span><span class="lines">@@ -68,10 +64,6 @@
</span><span class="cx">         return createWrapper&lt;WebKitCSSTransformValue&gt;(globalObject, WTFMove(value));
</span><span class="cx">     if (value-&gt;isValueList())
</span><span class="cx">         return createWrapper&lt;CSSValueList&gt;(globalObject, WTFMove(value));
</span><del>-    if (value-&gt;isSVGPaint())
-        return createWrapper&lt;SVGPaint&gt;(globalObject, WTFMove(value));
-    if (value-&gt;isSVGColor())
-        return createWrapper&lt;SVGColor&gt;(globalObject, WTFMove(value));
</del><span class="cx">     if (value-&gt;isPrimitiveValue())
</span><span class="cx">         return createWrapper&lt;CSSPrimitiveValue&gt;(globalObject, WTFMove(value));
</span><span class="cx">     return createWrapper&lt;CSSValue&gt;(globalObject, WTFMove(value));
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CSSStyleDeclaration.h&quot;
</span><span class="cx"> #include &quot;RenderStyleConstants.h&quot;
</span><ins>+#include &quot;SVGRenderStyleDefs.h&quot;
</ins><span class="cx"> #include &lt;wtf/RefPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -69,8 +70,7 @@
</span><span class="cx">     Element* styledElement();
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;CSSValue&gt; svgPropertyValue(CSSPropertyID, EUpdateLayout);
</span><del>-    RefPtr&lt;SVGPaint&gt; adjustSVGPaintForCurrentColor(RefPtr&lt;SVGPaint&gt;&amp;&amp;, const RenderStyle*) const;
-
</del><ins>+    RefPtr&lt;CSSValue&gt; adjustSVGPaintForCurrentColor(SVGPaintType, const String&amp; url, const Color&amp;, const Color&amp; currentColor) const;
</ins><span class="cx">     static Ref&lt;CSSValue&gt; valueForShadow(const ShadowData*, CSSPropertyID, const RenderStyle&amp;, AdjustPixelValuesForComputedStyle = AdjustPixelValues);
</span><span class="cx">     RefPtr&lt;CSSPrimitiveValue&gt; currentColorOrValidColor(const RenderStyle*, const Color&amp;) const;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/css/CSSValue.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -61,8 +61,6 @@
</span><span class="cx"> #include &quot;CSSUnsetValue.h&quot;
</span><span class="cx"> #include &quot;CSSValueList.h&quot;
</span><span class="cx"> #include &quot;CSSVariableReferenceValue.h&quot;
</span><del>-#include &quot;SVGColor.h&quot;
-#include &quot;SVGPaint.h&quot;
</del><span class="cx"> #include &quot;WebKitCSSTransformValue.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="lines">@@ -228,10 +226,6 @@
</span><span class="cx">             return compareCSSValues&lt;CSSCalcValue&gt;(*this, other);
</span><span class="cx">         case ImageSetClass:
</span><span class="cx">             return compareCSSValues&lt;CSSImageSetValue&gt;(*this, other);
</span><del>-        case SVGColorClass:
-            return compareCSSValues&lt;SVGColor&gt;(*this, other);
-        case SVGPaintClass:
-            return compareCSSValues&lt;SVGPaint&gt;(*this, other);
</del><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><span class="cx">         case AnimationTriggerScrollClass:
</span><span class="cx">             return compareCSSValues&lt;CSSAnimationTriggerScrollValue&gt;(*this, other);
</span><span class="lines">@@ -336,10 +330,6 @@
</span><span class="cx">         return downcast&lt;CSSCalcValue&gt;(*this).customCSSText();
</span><span class="cx">     case ImageSetClass:
</span><span class="cx">         return downcast&lt;CSSImageSetValue&gt;(*this).customCSSText();
</span><del>-    case SVGColorClass:
-        return downcast&lt;SVGColor&gt;(*this).customCSSText();
-    case SVGPaintClass:
-        return downcast&lt;SVGPaint&gt;(*this).customCSSText();
</del><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><span class="cx">     case AnimationTriggerScrollClass:
</span><span class="cx">         return downcast&lt;CSSAnimationTriggerScrollValue&gt;(*this).customCSSText();
</span><span class="lines">@@ -476,12 +466,6 @@
</span><span class="cx">     case FilterImageClass:
</span><span class="cx">         delete downcast&lt;CSSFilterImageValue&gt;(this);
</span><span class="cx">         return;
</span><del>-    case SVGColorClass:
-        delete downcast&lt;SVGColor&gt;(this);
-        return;
-    case SVGPaintClass:
-        delete downcast&lt;SVGPaint&gt;(this);
-        return;
</del><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><span class="cx">     case AnimationTriggerScrollClass:
</span><span class="cx">         delete downcast&lt;CSSAnimationTriggerScrollValue&gt;(this);
</span><span class="lines">@@ -520,10 +504,6 @@
</span><span class="cx">         return downcast&lt;WebKitCSSTransformValue&gt;(*this).cloneForCSSOM();
</span><span class="cx">     case ImageSetClass:
</span><span class="cx">         return downcast&lt;CSSImageSetValue&gt;(*this).cloneForCSSOM();
</span><del>-    case SVGColorClass:
-        return downcast&lt;SVGColor&gt;(*this).cloneForCSSOM();
-    case SVGPaintClass:
-        return downcast&lt;SVGPaint&gt;(*this).cloneForCSSOM();
</del><span class="cx">     default:
</span><span class="cx">         ASSERT(!isSubtypeExposedToCSSOM());
</span><span class="cx">         return TextCloneCSSValue::create(classType(), cssText());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/css/CSSValue.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -115,8 +115,6 @@
</span><span class="cx">     bool isGridTemplateAreasValue() const { return m_classType == GridTemplateAreasClass; }
</span><span class="cx">     bool isGridLineNamesValue() const { return m_classType == GridLineNamesClass; }
</span><span class="cx"> #endif
</span><del>-    bool isSVGColor() const { return m_classType == SVGColorClass || m_classType == SVGPaintClass; }
-    bool isSVGPaint() const { return m_classType == SVGPaintClass; }
</del><span class="cx">     bool isUnicodeRangeValue() const { return m_classType == UnicodeRangeClass; }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><span class="lines">@@ -132,9 +130,7 @@
</span><span class="cx">     bool isCSSOMSafe() const { return m_isCSSOMSafe; }
</span><span class="cx">     bool isSubtypeExposedToCSSOM() const
</span><span class="cx">     { 
</span><del>-        return isPrimitiveValue() 
-            || isSVGColor()
-            || isValueList();
</del><ins>+        return isPrimitiveValue() || isValueList();
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;CSSValue&gt; cloneForCSSOM() const;
</span><span class="lines">@@ -191,9 +187,6 @@
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx">         GridTemplateAreasClass,
</span><span class="cx"> #endif
</span><del>-        SVGColorClass,
-        SVGPaintClass,
-
</del><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><span class="cx">         AnimationTriggerScrollClass,
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssSVGCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include &quot;Document.h&quot;
</span><span class="cx"> #include &quot;Element.h&quot;
</span><span class="cx"> #include &quot;RenderStyle.h&quot;
</span><del>-#include &quot;SVGPaint.h&quot;
</del><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -93,11 +92,25 @@
</span><span class="cx">     return WTFMove(list);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RefPtr&lt;SVGPaint&gt; ComputedStyleExtractor::adjustSVGPaintForCurrentColor(RefPtr&lt;SVGPaint&gt;&amp;&amp; paint, const RenderStyle* style) const
</del><ins>+RefPtr&lt;CSSValue&gt; ComputedStyleExtractor::adjustSVGPaintForCurrentColor(SVGPaintType paintType, const String&amp; url, const Color&amp; color, const Color&amp; currentColor) const
</ins><span class="cx"> {
</span><del>-    if (paint-&gt;paintType() == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR || paint-&gt;paintType() == SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR)
-        paint-&gt;setColor(style-&gt;color());
-    return WTFMove(paint);
</del><ins>+    if (paintType &gt;= SVG_PAINTTYPE_URI_NONE) {
+        RefPtr&lt;CSSValueList&gt; values = CSSValueList::createSpaceSeparated();
+        values-&gt;append(CSSPrimitiveValue::create(url, CSSPrimitiveValue::UnitType::CSS_URI));
+        if (paintType == SVG_PAINTTYPE_URI_NONE)
+            values-&gt;append(CSSPrimitiveValue::createIdentifier(CSSValueNone));
+        else if (paintType == SVG_PAINTTYPE_URI_CURRENTCOLOR)
+            values-&gt;append(CSSPrimitiveValue::create(currentColor));
+        else if (paintType == SVG_PAINTTYPE_URI_RGBCOLOR)
+            values-&gt;append(CSSPrimitiveValue::create(color));
+        return values;
+    }
+    if (paintType == SVG_PAINTTYPE_NONE)
+        return CSSPrimitiveValue::createIdentifier(CSSValueNone);
+    if (paintType == SVG_PAINTTYPE_CURRENTCOLOR)
+        return CSSPrimitiveValue::create(currentColor);
+    
+    return CSSPrimitiveValue::create(color);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RefPtr&lt;CSSValue&gt; ComputedStyleExtractor::svgPropertyValue(CSSPropertyID propertyID, EUpdateLayout updateLayout)
</span><span class="lines">@@ -163,7 +176,7 @@
</span><span class="cx">         case CSSPropertyStopColor:
</span><span class="cx">             return currentColorOrValidColor(style, svgStyle.stopColor());
</span><span class="cx">         case CSSPropertyFill:
</span><del>-            return adjustSVGPaintForCurrentColor(SVGPaint::create(svgStyle.fillPaintType(), svgStyle.fillPaintUri(), svgStyle.fillPaintColor()), style);
</del><ins>+            return adjustSVGPaintForCurrentColor(svgStyle.fillPaintType(), svgStyle.fillPaintUri(), svgStyle.fillPaintColor(), style-&gt;color());
</ins><span class="cx">         case CSSPropertyKerning:
</span><span class="cx">             return SVGLengthValue::toCSSPrimitiveValue(svgStyle.kerning());
</span><span class="cx">         case CSSPropertyMarkerEnd:
</span><span class="lines">@@ -179,7 +192,7 @@
</span><span class="cx">                 return CSSPrimitiveValue::create(svgStyle.markerStartResource(), CSSPrimitiveValue::CSS_URI);
</span><span class="cx">             return CSSPrimitiveValue::createIdentifier(CSSValueNone);
</span><span class="cx">         case CSSPropertyStroke:
</span><del>-            return adjustSVGPaintForCurrentColor(SVGPaint::create(svgStyle.strokePaintType(), svgStyle.strokePaintUri(), svgStyle.strokePaintColor()), style);
</del><ins>+            return adjustSVGPaintForCurrentColor(svgStyle.strokePaintType(), svgStyle.strokePaintUri(), svgStyle.strokePaintColor(), style-&gt;color());
</ins><span class="cx">         case CSSPropertyStrokeDasharray:
</span><span class="cx">             return strokeDashArrayToCSSValueList(svgStyle.strokeDashArray());
</span><span class="cx">         case CSSPropertyBaselineShift: {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1325,13 +1325,7 @@
</span><span class="cx"> 
</span><span class="cx"> inline Color StyleBuilderConverter::convertSVGColor(StyleResolver&amp; styleResolver, const CSSValue&amp; value)
</span><span class="cx"> {
</span><del>-    // FIXME-NEWPARSER: Remove the code that assumes SVGColors.
-    // FIXME: What about visited link support?
-    if (is&lt;CSSPrimitiveValue&gt;(value))
-        return styleResolver.colorFromPrimitiveValue(downcast&lt;CSSPrimitiveValue&gt;(value));
-
-    auto&amp; svgColor = downcast&lt;SVGColor&gt;(value);
-    return svgColor.colorType() == SVGColor::SVG_COLORTYPE_CURRENTCOLOR ? styleResolver.style()-&gt;color() : svgColor.color();
</del><ins>+    return styleResolver.colorFromPrimitiveValue(downcast&lt;CSSPrimitiveValue&gt;(value));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> inline StyleSelfAlignmentData StyleBuilderConverter::convertSelfOrDefaultAlignmentData(StyleResolver&amp;, const CSSValue&amp; value)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1177,17 +1177,6 @@
</span><span class="cx"> inline void StyleBuilderCustom::applyValueFill(StyleResolver&amp; styleResolver, CSSValue&amp; value)
</span><span class="cx"> {
</span><span class="cx">     SVGRenderStyle&amp; svgStyle = styleResolver.style()-&gt;accessSVGStyle();
</span><del>-    
-    // FIXME-NEWPARSER: SVGPaint as a back-end CSSValue is bad, since it's bypassing
-    // the style resolver's colorFromPrimitiveValue code. It's also not necessary, since it's
-    // not even how we store things in the front end.
-    // Remove this block of code when the new parser is turned on.
-    if (value.isSVGPaint()) {
-        auto&amp; svgPaint = downcast&lt;SVGPaint&gt;(value);
-        svgStyle.setFillPaint(svgPaint.paintType(), StyleBuilderConverter::convertSVGColor(styleResolver, svgPaint), svgPaint.uri(), styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
-        return;
-    }
-    
</del><span class="cx">     const CSSPrimitiveValue* localValue = value.isPrimitiveValue() ? &amp;downcast&lt;CSSPrimitiveValue&gt;(value) : nullptr;
</span><span class="cx">     String url;
</span><span class="cx">     if (value.isValueList()) {
</span><span class="lines">@@ -1200,18 +1189,18 @@
</span><span class="cx">         return;
</span><span class="cx">     
</span><span class="cx">     Color color;
</span><del>-    SVGPaint::SVGPaintType paintType = SVGPaint::SVG_PAINTTYPE_RGBCOLOR;
</del><ins>+    SVGPaintType paintType = SVG_PAINTTYPE_RGBCOLOR;
</ins><span class="cx">     if (localValue-&gt;isURI()) {
</span><del>-        paintType = SVGPaint::SVG_PAINTTYPE_URI;
</del><ins>+        paintType = SVG_PAINTTYPE_URI;
</ins><span class="cx">         url = downcast&lt;CSSPrimitiveValue&gt;(localValue)-&gt;stringValue();
</span><span class="cx">     } else if (localValue-&gt;isValueID() &amp;&amp; localValue-&gt;valueID() == CSSValueNone)
</span><del>-        paintType = url.isEmpty() ? SVGPaint::SVG_PAINTTYPE_NONE : SVGPaint::SVG_PAINTTYPE_URI_NONE;
</del><ins>+        paintType = url.isEmpty() ? SVG_PAINTTYPE_NONE : SVG_PAINTTYPE_URI_NONE;
</ins><span class="cx">     else if (localValue-&gt;isValueID() &amp;&amp; localValue-&gt;valueID() == CSSValueCurrentcolor) {
</span><span class="cx">         color = styleResolver.style()-&gt;color();
</span><del>-        paintType = url.isEmpty() ? SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR :SVGPaint:: SVG_PAINTTYPE_URI_CURRENTCOLOR;
</del><ins>+        paintType = url.isEmpty() ? SVG_PAINTTYPE_CURRENTCOLOR : SVG_PAINTTYPE_URI_CURRENTCOLOR;
</ins><span class="cx">     } else {
</span><span class="cx">         color = styleResolver.colorFromPrimitiveValue(*localValue);
</span><del>-        paintType = url.isEmpty() ? SVGPaint::SVG_PAINTTYPE_RGBCOLOR : SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR;
</del><ins>+        paintType = url.isEmpty() ? SVG_PAINTTYPE_RGBCOLOR : SVG_PAINTTYPE_URI_RGBCOLOR;
</ins><span class="cx">     }
</span><span class="cx">     svgStyle.setFillPaint(paintType, color, url, styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
</span><span class="cx"> }
</span><span class="lines">@@ -1232,17 +1221,6 @@
</span><span class="cx"> inline void StyleBuilderCustom::applyValueStroke(StyleResolver&amp; styleResolver, CSSValue&amp; value)
</span><span class="cx"> {
</span><span class="cx">     SVGRenderStyle&amp; svgStyle = styleResolver.style()-&gt;accessSVGStyle();
</span><del>-    
-    // FIXME-NEWPARSER: SVGPaint as a back-end CSSValue is bad, since it's bypassing
-    // the style resolver's colorFromPrimitiveValue code. It's also not necessary, since it's
-    // not even how we store things in the front end.
-    // Remove this block of code when the new parser is turned on.
-    if (value.isSVGPaint()) {
-        auto&amp; svgPaint = downcast&lt;SVGPaint&gt;(value);
-        svgStyle.setStrokePaint(svgPaint.paintType(), StyleBuilderConverter::convertSVGColor(styleResolver, svgPaint), svgPaint.uri(), styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
-        return;
-    }
-    
</del><span class="cx">     const CSSPrimitiveValue* localValue = value.isPrimitiveValue() ? &amp;downcast&lt;CSSPrimitiveValue&gt;(value) : nullptr;
</span><span class="cx">     String url;
</span><span class="cx">     if (value.isValueList()) {
</span><span class="lines">@@ -1255,18 +1233,18 @@
</span><span class="cx">         return;
</span><span class="cx">     
</span><span class="cx">     Color color;
</span><del>-    SVGPaint::SVGPaintType paintType = SVGPaint::SVG_PAINTTYPE_RGBCOLOR;
</del><ins>+    SVGPaintType paintType = SVG_PAINTTYPE_RGBCOLOR;
</ins><span class="cx">     if (localValue-&gt;isURI()) {
</span><del>-        paintType = SVGPaint::SVG_PAINTTYPE_URI;
</del><ins>+        paintType = SVG_PAINTTYPE_URI;
</ins><span class="cx">         url = downcast&lt;CSSPrimitiveValue&gt;(localValue)-&gt;stringValue();
</span><span class="cx">     } else if (localValue-&gt;isValueID() &amp;&amp; localValue-&gt;valueID() == CSSValueNone)
</span><del>-        paintType = url.isEmpty() ? SVGPaint::SVG_PAINTTYPE_NONE : SVGPaint::SVG_PAINTTYPE_URI_NONE;
</del><ins>+        paintType = url.isEmpty() ? SVG_PAINTTYPE_NONE : SVG_PAINTTYPE_URI_NONE;
</ins><span class="cx">     else if (localValue-&gt;isValueID() &amp;&amp; localValue-&gt;valueID() == CSSValueCurrentcolor) {
</span><span class="cx">         color = styleResolver.style()-&gt;color();
</span><del>-        paintType = url.isEmpty() ? SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR :SVGPaint:: SVG_PAINTTYPE_URI_CURRENTCOLOR;
</del><ins>+        paintType = url.isEmpty() ? SVG_PAINTTYPE_CURRENTCOLOR : SVG_PAINTTYPE_URI_CURRENTCOLOR;
</ins><span class="cx">     } else {
</span><span class="cx">         color = styleResolver.colorFromPrimitiveValue(*localValue);
</span><del>-        paintType = url.isEmpty() ? SVGPaint::SVG_PAINTTYPE_RGBCOLOR : SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR;
</del><ins>+        paintType = url.isEmpty() ? SVG_PAINTTYPE_RGBCOLOR : SVG_PAINTTYPE_URI_RGBCOLOR;
</ins><span class="cx">     }
</span><span class="cx">     svgStyle.setStrokePaint(paintType, color, url, styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1212,7 +1212,7 @@
</span><span class="cx"> class PropertyWrapperSVGPaint : public AnimationPropertyWrapperBase {
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>-    PropertyWrapperSVGPaint(CSSPropertyID prop, const SVGPaint::SVGPaintType&amp; (RenderStyle::*paintTypeGetter)() const, Color (RenderStyle::*getter)() const, void (RenderStyle::*setter)(const Color&amp;))
</del><ins>+    PropertyWrapperSVGPaint(CSSPropertyID prop, const SVGPaintType&amp; (RenderStyle::*paintTypeGetter)() const, Color (RenderStyle::*getter)() const, void (RenderStyle::*setter)(const Color&amp;))
</ins><span class="cx">         : AnimationPropertyWrapperBase(prop)
</span><span class="cx">         , m_paintTypeGetter(paintTypeGetter)
</span><span class="cx">         , m_getter(getter)
</span><span class="lines">@@ -1233,7 +1233,7 @@
</span><span class="cx">         // We only support animations between SVGPaints that are pure Color values.
</span><span class="cx">         // For everything else we must return true for this method, otherwise
</span><span class="cx">         // we will try to animate between values forever.
</span><del>-        if ((a-&gt;*m_paintTypeGetter)() == SVGPaint::SVG_PAINTTYPE_RGBCOLOR) {
</del><ins>+        if ((a-&gt;*m_paintTypeGetter)() == SVG_PAINTTYPE_RGBCOLOR) {
</ins><span class="cx">             Color fromColor = (a-&gt;*m_getter)();
</span><span class="cx">             Color toColor = (b-&gt;*m_getter)();
</span><span class="cx"> 
</span><span class="lines">@@ -1252,8 +1252,8 @@
</span><span class="cx"> 
</span><span class="cx">     void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</span><span class="cx">     {
</span><del>-        if ((a-&gt;*m_paintTypeGetter)() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR
-            || (b-&gt;*m_paintTypeGetter)() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR)
</del><ins>+        if ((a-&gt;*m_paintTypeGetter)() != SVG_PAINTTYPE_RGBCOLOR
+            || (b-&gt;*m_paintTypeGetter)() != SVG_PAINTTYPE_RGBCOLOR)
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         Color fromColor = (a-&gt;*m_getter)();
</span><span class="lines">@@ -1278,7 +1278,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    const SVGPaint::SVGPaintType&amp; (RenderStyle::*m_paintTypeGetter)() const;
</del><ins>+    const SVGPaintType&amp; (RenderStyle::*m_paintTypeGetter)() const;
</ins><span class="cx">     Color (RenderStyle::*m_getter)() const;
</span><span class="cx">     void (RenderStyle::*m_setter)(const Color&amp;);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include &quot;Pagination.h&quot;
</span><span class="cx"> #include &quot;RenderStyleConstants.h&quot;
</span><span class="cx"> #include &quot;RoundedRect.h&quot;
</span><del>-#include &quot;SVGPaint.h&quot;
</del><span class="cx"> #include &quot;SVGRenderStyle.h&quot;
</span><span class="cx"> #include &quot;ShadowData.h&quot;
</span><span class="cx"> #include &quot;ShapeValue.h&quot;
</span><span class="lines">@@ -1733,15 +1732,15 @@
</span><span class="cx">     const SVGRenderStyle&amp; svgStyle() const { return *m_svgStyle; }
</span><span class="cx">     SVGRenderStyle&amp; accessSVGStyle() { return *m_svgStyle.access(); }
</span><span class="cx"> 
</span><del>-    const SVGPaint::SVGPaintType&amp; fillPaintType() const { return svgStyle().fillPaintType(); }
</del><ins>+    const SVGPaintType&amp; fillPaintType() const { return svgStyle().fillPaintType(); }
</ins><span class="cx">     Color fillPaintColor() const { return svgStyle().fillPaintColor(); }
</span><del>-    void setFillPaintColor(const Color&amp; c) { accessSVGStyle().setFillPaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, c, &quot;&quot;); }
</del><ins>+    void setFillPaintColor(const Color&amp; c) { accessSVGStyle().setFillPaint(SVG_PAINTTYPE_RGBCOLOR, c, &quot;&quot;); }
</ins><span class="cx">     float fillOpacity() const { return svgStyle().fillOpacity(); }
</span><span class="cx">     void setFillOpacity(float f) { accessSVGStyle().setFillOpacity(f); }
</span><span class="cx"> 
</span><del>-    const SVGPaint::SVGPaintType&amp; strokePaintType() const { return svgStyle().strokePaintType(); }
</del><ins>+    const SVGPaintType&amp; strokePaintType() const { return svgStyle().strokePaintType(); }
</ins><span class="cx">     Color strokePaintColor() const { return svgStyle().strokePaintColor(); }
</span><del>-    void setStrokePaintColor(const Color&amp; c) { accessSVGStyle().setStrokePaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, c, &quot;&quot;); }
</del><ins>+    void setStrokePaintColor(const Color&amp; c) { accessSVGStyle().setStrokePaint(SVG_PAINTTYPE_RGBCOLOR, c, &quot;&quot;); }
</ins><span class="cx">     float strokeOpacity() const { return svgStyle().strokeOpacity(); }
</span><span class="cx">     void setStrokeOpacity(float f) { accessSVGStyle().setStrokeOpacity(f); }
</span><span class="cx">     const Length&amp; strokeWidth() const { return svgStyle().strokeWidth(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyle.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyle.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyle.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include &quot;GraphicsTypes.h&quot;
</span><span class="cx"> #include &quot;Path.h&quot;
</span><span class="cx"> #include &quot;RenderStyleConstants.h&quot;
</span><del>-#include &quot;SVGPaint.h&quot;
</del><span class="cx"> #include &quot;SVGRenderStyleDefs.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -71,11 +70,11 @@
</span><span class="cx">     static EGlyphOrientation initialGlyphOrientationHorizontal() { return GO_0DEG; }
</span><span class="cx">     static EGlyphOrientation initialGlyphOrientationVertical() { return GO_AUTO; }
</span><span class="cx">     static float initialFillOpacity() { return 1; }
</span><del>-    static SVGPaint::SVGPaintType initialFillPaintType() { return SVGPaint::SVG_PAINTTYPE_RGBCOLOR; }
</del><ins>+    static SVGPaintType initialFillPaintType() { return SVG_PAINTTYPE_RGBCOLOR; }
</ins><span class="cx">     static Color initialFillPaintColor() { return Color::black; }
</span><span class="cx">     static String initialFillPaintUri() { return String(); }
</span><span class="cx">     static float initialStrokeOpacity() { return 1; }
</span><del>-    static SVGPaint::SVGPaintType initialStrokePaintType() { return SVGPaint::SVG_PAINTTYPE_NONE; }
</del><ins>+    static SVGPaintType initialStrokePaintType() { return SVG_PAINTTYPE_NONE; }
</ins><span class="cx">     static Color initialStrokePaintColor() { return Color(); }
</span><span class="cx">     static String initialStrokePaintUri() { return String(); }
</span><span class="cx">     static Vector&lt;SVGLengthValue&gt; initialStrokeDashArray() { return { }; }
</span><span class="lines">@@ -169,7 +168,7 @@
</span><span class="cx">             fill.access()-&gt;opacity = obj;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void setFillPaint(SVGPaint::SVGPaintType type, const Color&amp; color, const String&amp; uri, bool applyToRegularStyle = true, bool applyToVisitedLinkStyle = false)
</del><ins>+    void setFillPaint(SVGPaintType type, const Color&amp; color, const String&amp; uri, bool applyToRegularStyle = true, bool applyToVisitedLinkStyle = false)
</ins><span class="cx">     {
</span><span class="cx">         if (applyToRegularStyle) {
</span><span class="cx">             if (!(fill-&gt;paintType == type))
</span><span class="lines">@@ -195,7 +194,7 @@
</span><span class="cx">             stroke.access()-&gt;opacity = obj;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void setStrokePaint(SVGPaint::SVGPaintType type, const Color&amp; color, const String&amp; uri, bool applyToRegularStyle = true, bool applyToVisitedLinkStyle = false)
</del><ins>+    void setStrokePaint(SVGPaintType type, const Color&amp; color, const String&amp; uri, bool applyToRegularStyle = true, bool applyToVisitedLinkStyle = false)
</ins><span class="cx">     {
</span><span class="cx">         if (applyToRegularStyle) {
</span><span class="cx">             if (!(stroke-&gt;paintType == type))
</span><span class="lines">@@ -333,11 +332,11 @@
</span><span class="cx">     EGlyphOrientation glyphOrientationHorizontal() const { return (EGlyphOrientation) svg_inherited_flags._glyphOrientationHorizontal; }
</span><span class="cx">     EGlyphOrientation glyphOrientationVertical() const { return (EGlyphOrientation) svg_inherited_flags._glyphOrientationVertical; }
</span><span class="cx">     float fillOpacity() const { return fill-&gt;opacity; }
</span><del>-    const SVGPaint::SVGPaintType&amp; fillPaintType() const { return fill-&gt;paintType; }
</del><ins>+    const SVGPaintType&amp; fillPaintType() const { return fill-&gt;paintType; }
</ins><span class="cx">     const Color&amp; fillPaintColor() const { return fill-&gt;paintColor; }
</span><span class="cx">     const String&amp; fillPaintUri() const { return fill-&gt;paintUri; }    
</span><span class="cx">     float strokeOpacity() const { return stroke-&gt;opacity; }
</span><del>-    const SVGPaint::SVGPaintType&amp; strokePaintType() const { return stroke-&gt;paintType; }
</del><ins>+    const SVGPaintType&amp; strokePaintType() const { return stroke-&gt;paintType; }
</ins><span class="cx">     const Color&amp; strokePaintColor() const { return stroke-&gt;paintColor; }
</span><span class="cx">     const String&amp; strokePaintUri() const { return stroke-&gt;paintUri; }
</span><span class="cx">     Vector&lt;SVGLengthValue&gt; strokeDashArray() const { return stroke-&gt;dashArray; }
</span><span class="lines">@@ -368,10 +367,10 @@
</span><span class="cx">     PaintOrder paintOrder() const { return (PaintOrder) svg_inherited_flags.paintOrder; }
</span><span class="cx">     Vector&lt;PaintType, 3&gt; paintTypesForPaintOrder() const;
</span><span class="cx"> 
</span><del>-    const SVGPaint::SVGPaintType&amp; visitedLinkFillPaintType() const { return fill-&gt;visitedLinkPaintType; }
</del><ins>+    const SVGPaintType&amp; visitedLinkFillPaintType() const { return fill-&gt;visitedLinkPaintType; }
</ins><span class="cx">     const Color&amp; visitedLinkFillPaintColor() const { return fill-&gt;visitedLinkPaintColor; }
</span><span class="cx">     const String&amp; visitedLinkFillPaintUri() const { return fill-&gt;visitedLinkPaintUri; }
</span><del>-    const SVGPaint::SVGPaintType&amp; visitedLinkStrokePaintType() const { return stroke-&gt;visitedLinkPaintType; }
</del><ins>+    const SVGPaintType&amp; visitedLinkStrokePaintType() const { return stroke-&gt;visitedLinkPaintType; }
</ins><span class="cx">     const Color&amp; visitedLinkStrokePaintColor() const { return stroke-&gt;visitedLinkPaintColor; }
</span><span class="cx">     const String&amp; visitedLinkStrokePaintUri() const { return stroke-&gt;visitedLinkPaintUri; }
</span><span class="cx"> 
</span><span class="lines">@@ -379,9 +378,9 @@
</span><span class="cx">     bool hasClipper() const { return !clipperResource().isEmpty(); }
</span><span class="cx">     bool hasMasker() const { return !maskerResource().isEmpty(); }
</span><span class="cx">     bool hasMarkers() const { return !markerStartResource().isEmpty() || !markerMidResource().isEmpty() || !markerEndResource().isEmpty(); }
</span><del>-    bool hasStroke() const { return strokePaintType() != SVGPaint::SVG_PAINTTYPE_NONE; }
</del><ins>+    bool hasStroke() const { return strokePaintType() != SVG_PAINTTYPE_NONE; }
</ins><span class="cx">     bool hasVisibleStroke() const { return hasStroke() &amp;&amp; !strokeWidth().isZero(); }
</span><del>-    bool hasFill() const { return fillPaintType() != SVGPaint::SVG_PAINTTYPE_NONE; }
</del><ins>+    bool hasFill() const { return fillPaintType() != SVG_PAINTTYPE_NONE; }
</ins><span class="cx">     bool isolatesBlending() const { return hasMasker() || shadow(); }
</span><span class="cx"> 
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStyleDefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -30,12 +30,20 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Length.h&quot;
</span><span class="cx"> #include &quot;SVGLengthValue.h&quot;
</span><del>-#include &quot;SVGPaint.h&quot;
</del><span class="cx"> #include &quot;ShadowData.h&quot;
</span><span class="cx"> #include &lt;wtf/RefCounted.h&gt;
</span><span class="cx"> #include &lt;wtf/RefPtr.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><ins>+    enum SVGPaintType {
+        SVG_PAINTTYPE_RGBCOLOR,
+        SVG_PAINTTYPE_NONE,
+        SVG_PAINTTYPE_CURRENTCOLOR,
+        SVG_PAINTTYPE_URI_NONE,
+        SVG_PAINTTYPE_URI_CURRENTCOLOR,
+        SVG_PAINTTYPE_URI_RGBCOLOR,
+        SVG_PAINTTYPE_URI
+    };
</ins><span class="cx"> 
</span><span class="cx">     enum EBaselineShift {
</span><span class="cx">         BS_BASELINE, BS_SUB, BS_SUPER, BS_LENGTH
</span><span class="lines">@@ -122,10 +130,10 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         float opacity;
</span><del>-        SVGPaint::SVGPaintType paintType;
</del><ins>+        SVGPaintType paintType;
</ins><span class="cx">         Color paintColor;
</span><span class="cx">         String paintUri;
</span><del>-        SVGPaint::SVGPaintType visitedLinkPaintType;
</del><ins>+        SVGPaintType visitedLinkPaintType;
</ins><span class="cx">         Color visitedLinkPaintColor;
</span><span class="cx">         String visitedLinkPaintUri;
</span><span class="cx"> 
</span><span class="lines">@@ -152,10 +160,10 @@
</span><span class="cx">         Length dashOffset;
</span><span class="cx">         Vector&lt;SVGLengthValue&gt; dashArray;
</span><span class="cx"> 
</span><del>-        SVGPaint::SVGPaintType paintType;
</del><ins>+        SVGPaintType paintType;
</ins><span class="cx">         Color paintColor;
</span><span class="cx">         String paintUri;
</span><del>-        SVGPaint::SVGPaintType visitedLinkPaintType;
</del><ins>+        SVGPaintType visitedLinkPaintType;
</ins><span class="cx">         Color visitedLinkPaintColor;
</span><span class="cx">         String visitedLinkPaintUri;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -70,18 +70,16 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     bool applyToFill = mode == ApplyToFillMode;
</span><del>-    SVGPaint::SVGPaintType paintType = applyToFill ? svgStyle.fillPaintType() : svgStyle.strokePaintType();
-    if (paintType == SVGPaint::SVG_PAINTTYPE_NONE)
</del><ins>+    SVGPaintType paintType = applyToFill ? svgStyle.fillPaintType() : svgStyle.strokePaintType();
+    if (paintType == SVG_PAINTTYPE_NONE)
</ins><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="cx">     Color color;
</span><span class="cx">     switch (paintType) {
</span><del>-    case SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR:
-    case SVGPaint::SVG_PAINTTYPE_RGBCOLOR:
-    case SVGPaint::SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR:
-    case SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR:
-    case SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR:
-    case SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR:
</del><ins>+    case SVG_PAINTTYPE_CURRENTCOLOR:
+    case SVG_PAINTTYPE_RGBCOLOR:
+    case SVG_PAINTTYPE_URI_CURRENTCOLOR:
+    case SVG_PAINTTYPE_URI_RGBCOLOR:
</ins><span class="cx">         color = applyToFill ? svgStyle.fillPaintColor() : svgStyle.strokePaintColor();
</span><span class="cx">         break;
</span><span class="cx">     default:
</span><span class="lines">@@ -90,10 +88,10 @@
</span><span class="cx"> 
</span><span class="cx">     if (style.insideLink() == InsideVisitedLink) {
</span><span class="cx">         // FIXME: This code doesn't support the uri component of the visited link paint, https://bugs.webkit.org/show_bug.cgi?id=70006
</span><del>-        SVGPaint::SVGPaintType visitedPaintType = applyToFill ? svgStyle.visitedLinkFillPaintType() : svgStyle.visitedLinkStrokePaintType();
</del><ins>+        SVGPaintType visitedPaintType = applyToFill ? svgStyle.visitedLinkFillPaintType() : svgStyle.visitedLinkStrokePaintType();
</ins><span class="cx"> 
</span><span class="cx">         // For SVG_PAINTTYPE_CURRENTCOLOR, 'color' already contains the 'visitedColor'.
</span><del>-        if (visitedPaintType &lt; SVGPaint::SVG_PAINTTYPE_URI_NONE &amp;&amp; visitedPaintType != SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR) {
</del><ins>+        if (visitedPaintType &lt; SVG_PAINTTYPE_URI_NONE &amp;&amp; visitedPaintType != SVG_PAINTTYPE_CURRENTCOLOR) {
</ins><span class="cx">             const Color&amp; visitedColor = applyToFill ? svgStyle.visitedLinkFillPaintColor() : svgStyle.visitedLinkStrokePaintColor();
</span><span class="cx">             if (visitedColor.isValid())
</span><span class="cx">                 color = visitedColor.colorWithAlpha(color.alphaAsFloat());
</span><span class="lines">@@ -102,7 +100,7 @@
</span><span class="cx"> 
</span><span class="cx">     // If the primary resource is just a color, return immediately.
</span><span class="cx">     RenderSVGResourceSolidColor* colorResource = RenderSVGResource::sharedSolidPaintingResource();
</span><del>-    if (paintType &lt; SVGPaint::SVG_PAINTTYPE_URI_NONE) {
</del><ins>+    if (paintType &lt; SVG_PAINTTYPE_URI_NONE) {
</ins><span class="cx">         if (!inheritColorFromParentStyleIfNeeded(renderer, applyToFill, color))
</span><span class="cx">             return nullptr;
</span><span class="cx"> 
</span><span class="lines">@@ -113,7 +111,7 @@
</span><span class="cx">     // If no resources are associated with the given renderer, return the color resource.
</span><span class="cx">     auto* resources = SVGResourcesCache::cachedResourcesForRenderer(renderer);
</span><span class="cx">     if (!resources) {
</span><del>-        if (paintType == SVGPaint::SVG_PAINTTYPE_URI_NONE || !inheritColorFromParentStyleIfNeeded(renderer, applyToFill, color))
</del><ins>+        if (paintType == SVG_PAINTTYPE_URI_NONE || !inheritColorFromParentStyleIfNeeded(renderer, applyToFill, color))
</ins><span class="cx">             return nullptr;
</span><span class="cx"> 
</span><span class="cx">         colorResource-&gt;setColor(color);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResources.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResources.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include &quot;RenderSVGRoot.h&quot;
</span><span class="cx"> #include &quot;SVGGradientElement.h&quot;
</span><span class="cx"> #include &quot;SVGNames.h&quot;
</span><del>-#include &quot;SVGPaint.h&quot;
</del><span class="cx"> #include &quot;SVGPatternElement.h&quot;
</span><span class="cx"> #include &quot;SVGRenderStyle.h&quot;
</span><span class="cx"> #include &quot;SVGURIReference.h&quot;
</span><span class="lines">@@ -155,9 +154,9 @@
</span><span class="cx">     return SVGURIReference::fragmentIdentifierFromIRIString(target, element.document());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static inline RenderSVGResourceContainer* paintingResourceFromSVGPaint(Document&amp; document, const SVGPaint::SVGPaintType&amp; paintType, const String&amp; paintUri, AtomicString&amp; id, bool&amp; hasPendingResource)
</del><ins>+static inline RenderSVGResourceContainer* paintingResourceFromSVGPaint(Document&amp; document, const SVGPaintType&amp; paintType, const String&amp; paintUri, AtomicString&amp; id, bool&amp; hasPendingResource)
</ins><span class="cx"> {
</span><del>-    if (paintType != SVGPaint::SVG_PAINTTYPE_URI &amp;&amp; paintType != SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR &amp;&amp; paintType != SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR)
</del><ins>+    if (paintType != SVG_PAINTTYPE_URI &amp;&amp; paintType != SVG_PAINTTYPE_URI_RGBCOLOR &amp;&amp; paintType != SVG_PAINTTYPE_URI_CURRENTCOLOR)
</ins><span class="cx">         return 0;
</span><span class="cx"> 
</span><span class="cx">     id = SVGURIReference::fragmentIdentifierFromIRIString(paintUri, document);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAllInOne.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAllInOne.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGAllInOne.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> #include &quot;SVGAnimationElement.cpp&quot;
</span><span class="cx"> #include &quot;SVGCircleElement.cpp&quot;
</span><span class="cx"> #include &quot;SVGClipPathElement.cpp&quot;
</span><del>-#include &quot;SVGColor.cpp&quot;
</del><span class="cx"> #include &quot;SVGComponentTransferFunctionElement.cpp&quot;
</span><span class="cx"> #include &quot;SVGCursorElement.cpp&quot;
</span><span class="cx"> #include &quot;SVGDefsElement.cpp&quot;
</span><span class="lines">@@ -123,7 +122,6 @@
</span><span class="cx"> #include &quot;SVGMetadataElement.cpp&quot;
</span><span class="cx"> #include &quot;SVGMissingGlyphElement.cpp&quot;
</span><span class="cx"> #include &quot;SVGNumberListValues.cpp&quot;
</span><del>-#include &quot;SVGPaint.cpp&quot;
</del><span class="cx"> #include &quot;SVGParserUtilities.cpp&quot;
</span><span class="cx"> #include &quot;SVGPathBlender.cpp&quot;
</span><span class="cx"> #include &quot;SVGPathBuilder.cpp&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedColor.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedColor.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGAnimatedColor.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;SVGAnimatedColor.h&quot;
</span><span class="cx"> 
</span><ins>+#include &quot;CSSParser.h&quot;
</ins><span class="cx"> #include &quot;RenderElement.h&quot;
</span><span class="cx"> #include &quot;SVGAnimateElementBase.h&quot;
</span><del>-#include &quot;SVGColor.h&quot;
</del><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> 
</span><span class="cx"> std::unique_ptr&lt;SVGAnimatedType&gt; SVGAnimatedColorAnimator::constructFromString(const String&amp; string)
</span><span class="cx"> {
</span><del>-    return SVGAnimatedType::createColor(std::make_unique&lt;Color&gt;(SVGColor::colorFromRGBColorString(string)));
</del><ins>+    return SVGAnimatedType::createColor(std::make_unique&lt;Color&gt;(CSSParser::parseColor(string.stripWhiteSpace())));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SVGAnimatedColorAnimator::addAnimatedTypes(SVGAnimatedType* from, SVGAnimatedType* to)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> 
</span><span class="cx"> static Color parseColorFromString(SVGAnimationElement*, const String&amp; string)
</span><span class="cx"> {
</span><del>-    return SVGColor::colorFromRGBColorString(string);
</del><ins>+    return CSSParser::parseColor(string.stripWhiteSpace());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SVGAnimatedColorAnimator::calculateAnimatedValue(float percentage, unsigned repeatCount, SVGAnimatedType* from, SVGAnimatedType* to, SVGAnimatedType* toAtEndOfDuration, SVGAnimatedType* animated)
</span><span class="lines">@@ -104,10 +104,10 @@
</span><span class="cx"> 
</span><span class="cx"> float SVGAnimatedColorAnimator::calculateDistance(const String&amp; fromString, const String&amp; toString)
</span><span class="cx"> {
</span><del>-    Color from = SVGColor::colorFromRGBColorString(fromString);
</del><ins>+    Color from = CSSParser::parseColor(fromString.stripWhiteSpace());
</ins><span class="cx">     if (!from.isValid())
</span><span class="cx">         return -1;
</span><del>-    Color to = SVGColor::colorFromRGBColorString(toString);
</del><ins>+    Color to = CSSParser::parseColor(toString.stripWhiteSpace());
</ins><span class="cx">     if (!to.isValid())
</span><span class="cx">         return -1;
</span><span class="cx">     float red = from.red() - to.red();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedType.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedType.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGAnimatedType.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;SVGAnimatedType.h&quot;
</span><span class="cx"> 
</span><ins>+#include &quot;CSSParser.h&quot;
</ins><span class="cx"> #include &quot;SVGParserUtilities.h&quot;
</span><span class="cx"> #include &quot;SVGPathByteStream.h&quot;
</span><span class="cx"> 
</span><span class="lines">@@ -275,7 +276,7 @@
</span><span class="cx">     switch (m_type) {
</span><span class="cx">     case AnimatedColor:
</span><span class="cx">         ASSERT(m_data.color);
</span><del>-        *m_data.color = SVGColor::colorFromRGBColorString(value);
</del><ins>+        *m_data.color = CSSParser::parseColor(value.stripWhiteSpace());
</ins><span class="cx">         return true;
</span><span class="cx">     case AnimatedLength:
</span><span class="cx">         ASSERT(m_data.length);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedType.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedType.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGAnimatedType.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -19,9 +19,9 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include &quot;Color.h&quot;
</ins><span class="cx"> #include &quot;FloatRect.h&quot;
</span><span class="cx"> #include &quot;SVGAngleValue.h&quot;
</span><del>-#include &quot;SVGColor.h&quot;
</del><span class="cx"> #include &quot;SVGLengthListValues.h&quot;
</span><span class="cx"> #include &quot;SVGLengthValue.h&quot;
</span><span class="cx"> #include &quot;SVGNumberListValues.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGColorcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/svg/SVGColor.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGColor.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGColor.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,111 +0,0 @@
</span><del>-/*
- * Copyright (C) 2004, 2005 Nikolas Zimmermann &lt;zimmermann@kde.org&gt;
- * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis &lt;buis@kde.org&gt;
- * Copyright (C) Research In Motion Limited 2011. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include &quot;config.h&quot;
-#include &quot;SVGColor.h&quot;
-
-#include &quot;CSSParser.h&quot;
-#include &quot;ExceptionCode.h&quot;
-#include &quot;RGBColor.h&quot;
-#include &quot;SVGException.h&quot;
-
-namespace WebCore {
-
-SVGColor::SVGColor(SVGColorType colorType)
-    : CSSValue(SVGColorClass)
-    , m_colorType(colorType)
-{
-}
-
-SVGColor::SVGColor(ClassType classType, SVGColorType colorType)
-    : CSSValue(classType)
-    , m_colorType(colorType)
-{
-}
-
-Ref&lt;RGBColor&gt; SVGColor::rgbColor() const
-{
-    return RGBColor::create(m_color.rgb());
-}
-
-Color SVGColor::colorFromRGBColorString(const String&amp; colorString)
-{
-    // FIXME: Rename to parseSVGColor? There's already a parseSVGColor in the CSS parser. How is it different?
-    // FIXME: Rework CSS parser so it exactly matches what the SVG specification requires?
-    // FIXME: Move this out of the SVGColor class?
-    // FIXME: Is it really OK to do stripWhitespace here instead of stripLeadingAndTrailingHTMLSpaces?
-    return CSSParser::parseColor(colorString.stripWhiteSpace());
-}
-
-ExceptionOr&lt;void&gt; SVGColor::setRGBColor(const String&amp;)
-{
-    // The whole SVGColor interface is deprecated in SVG 1.1 (2nd edition).
-    // Since the setters are the most problematic part, we removed the support for those first.
-    return Exception { NO_MODIFICATION_ALLOWED_ERR };
-}
-
-ExceptionOr&lt;void&gt; SVGColor::setRGBColorICCColor(const String&amp;, const String&amp;)
-{
-    return Exception { NO_MODIFICATION_ALLOWED_ERR };
-}
-
-ExceptionOr&lt;void&gt; SVGColor::setColor(unsigned short, const String&amp;, const String&amp;)
-{
-    return Exception { NO_MODIFICATION_ALLOWED_ERR };
-}
-
-String SVGColor::customCSSText() const
-{
-    switch (m_colorType) {
-    case SVG_COLORTYPE_UNKNOWN:
-        return String();
-    case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR:
-    case SVG_COLORTYPE_RGBCOLOR:
-        // FIXME: No ICC color support.
-        return m_color.cssText();
-    case SVG_COLORTYPE_CURRENTCOLOR:
-        if (m_color.isValid())
-            return m_color.cssText();
-        return ASCIILiteral(&quot;currentColor&quot;);
-    }
-
-    ASSERT_NOT_REACHED();
-    return String();
-}
-
-SVGColor::SVGColor(ClassType classType, const SVGColor&amp; cloneFrom)
-    : CSSValue(classType, /*isCSSOMSafe*/ true)
-    , m_color(cloneFrom.m_color)
-    , m_colorType(cloneFrom.m_colorType)
-{
-}
-
-Ref&lt;SVGColor&gt; SVGColor::cloneForCSSOM() const
-{
-    return adoptRef(*new SVGColor(SVGColorClass, *this));
-}
-
-bool SVGColor::equals(const SVGColor&amp; other) const
-{
-    return m_colorType == other.m_colorType &amp;&amp; m_color == other.m_color;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGColorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/svg/SVGColor.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGColor.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGColor.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * Copyright (C) 2004, 2005 Nikolas Zimmermann &lt;zimmermann@kde.org&gt;
- * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis &lt;buis@kde.org&gt;
- * Copyright (C) Research In Motion Limited 2011. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#include &quot;CSSValue.h&quot;
-#include &quot;Color.h&quot;
-
-namespace WebCore {
-
-class RGBColor;
-
-class SVGColor : public CSSValue {
-public:
-    enum SVGColorType {
-        SVG_COLORTYPE_UNKNOWN = 0,
-        SVG_COLORTYPE_RGBCOLOR = 1,
-        SVG_COLORTYPE_RGBCOLOR_ICCCOLOR = 2,
-        SVG_COLORTYPE_CURRENTCOLOR = 3
-    };
-
-    static Ref&lt;SVGColor&gt; createFromString(const String&amp; rgbColor)
-    {
-        auto color = adoptRef(*new SVGColor(SVG_COLORTYPE_RGBCOLOR));
-        color.get().setColor(colorFromRGBColorString(rgbColor));
-        return color;
-    }
-
-    static Ref&lt;SVGColor&gt; createFromColor(const Color&amp; rgbColor)
-    {
-        auto color = adoptRef(*new SVGColor(SVG_COLORTYPE_RGBCOLOR));
-        color.get().setColor(rgbColor);
-        return color;
-    }
-
-    static Ref&lt;SVGColor&gt; createCurrentColor()
-    {
-        return adoptRef(*new SVGColor(SVG_COLORTYPE_CURRENTCOLOR));
-    }
-
-    const Color&amp; color() const { return m_color; }
-    const SVGColorType&amp; colorType() const { return m_colorType; }
-    Ref&lt;RGBColor&gt; rgbColor() const;
-
-    static Color colorFromRGBColorString(const String&amp;);
-
-    ExceptionOr&lt;void&gt; setRGBColor(const String&amp;);
-    ExceptionOr&lt;void&gt; setRGBColorICCColor(const String&amp; rgbColor, const String&amp; iccColor);
-    ExceptionOr&lt;void&gt; setColor(unsigned short colorType, const String&amp; rgbColor, const String&amp; iccColor);
-
-    String customCSSText() const;
-
-    Ref&lt;SVGColor&gt; cloneForCSSOM() const;
-
-    bool equals(const SVGColor&amp;) const;
-
-protected:
-    friend class CSSComputedStyleDeclaration;
-
-    SVGColor(ClassType, SVGColorType);
-    SVGColor(ClassType, const SVGColor&amp; cloneFrom);
-
-    void setColor(const Color&amp; color) { m_color = color; }
-    void setColorType(const SVGColorType&amp; type) { m_colorType = type; }
-
-private:
-    explicit SVGColor(SVGColorType);
-
-    Color m_color;
-    SVGColorType m_colorType;
-};
-
-} // namespace WebCore
-
-SPECIALIZE_TYPE_TRAITS_CSS_VALUE(SVGColor, isSVGColor())
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGColoridl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/svg/SVGColor.idl (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGColor.idl        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGColor.idl        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2004, 2005 Nikolas Zimmermann &lt;zimmermann@kde.org&gt;
- * Copyright (C) 2004, 2005 Rob Buis &lt;buis@kde.org&gt;
- * Copyright (C) 2006 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-[
-    ImplementationLacksVTable,
-] interface SVGColor : CSSValue {
-    const unsigned short SVG_COLORTYPE_UNKNOWN = 0;
-    const unsigned short SVG_COLORTYPE_RGBCOLOR = 1;
-    const unsigned short SVG_COLORTYPE_RGBCOLOR_ICCCOLOR = 2;
-    const unsigned short SVG_COLORTYPE_CURRENTCOLOR = 3;
-
-    readonly attribute unsigned short colorType;
-    readonly attribute RGBColor rgbColor;
-    // FIXME: readonly attribute SVGICCColor iccColor;
-
-    [MayThrowException] void setRGBColor(DOMString rgbColor);
-    [MayThrowException] void setRGBColorICCColor(DOMString rgbColor, DOMString iccColor);
-    [MayThrowException] void setColor(unsigned short colorType, DOMString rgbColor, DOMString iccColor);
-};
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEDiffuseLightingElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include &quot;FEDiffuseLighting.h&quot;
</span><span class="cx"> #include &quot;FilterEffect.h&quot;
</span><span class="cx"> #include &quot;RenderStyle.h&quot;
</span><del>-#include &quot;SVGColor.h&quot;
</del><span class="cx"> #include &quot;SVGFELightElement.h&quot;
</span><span class="cx"> #include &quot;SVGFilterBuilder.h&quot;
</span><span class="cx"> #include &quot;SVGNames.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFESpecularLightingElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFESpecularLightingElement.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFESpecularLightingElement.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGFESpecularLightingElement.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;FilterEffect.h&quot;
</span><span class="cx"> #include &quot;RenderStyle.h&quot;
</span><del>-#include &quot;SVGColor.h&quot;
</del><span class="cx"> #include &quot;SVGFELightElement.h&quot;
</span><span class="cx"> #include &quot;SVGFilterBuilder.h&quot;
</span><span class="cx"> #include &quot;SVGNames.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGPaintcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/svg/SVGPaint.cpp (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGPaint.cpp        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGPaint.cpp        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,118 +0,0 @@
</span><del>-/*
- * Copyright (C) 2004, 2005 Nikolas Zimmermann &lt;zimmermann@kde.org&gt;
- * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis &lt;buis@kde.org&gt;
- * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include &quot;config.h&quot;
-#include &quot;SVGPaint.h&quot;
-
-#include &quot;ExceptionCode.h&quot;
-#include &quot;SVGException.h&quot;
-#include &quot;SVGURIReference.h&quot;
-#include &lt;wtf/text/WTFString.h&gt;
-
-namespace WebCore {
-
-static inline SVGColor::SVGColorType colorTypeForPaintType(const SVGPaint::SVGPaintType&amp; paintType)
-{
-    switch (paintType) {
-    case SVGPaint::SVG_PAINTTYPE_NONE:
-    case SVGPaint::SVG_PAINTTYPE_UNKNOWN:
-    case SVGPaint::SVG_PAINTTYPE_URI:
-    case SVGPaint::SVG_PAINTTYPE_URI_NONE:
-        return SVGColor::SVG_COLORTYPE_UNKNOWN;
-    case SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR:
-    case SVGPaint::SVG_PAINTTYPE_RGBCOLOR:
-        return SVGColor::SVG_COLORTYPE_RGBCOLOR;
-    case SVGPaint::SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR:
-    case SVGPaint::SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR:
-        return SVGColor::SVG_COLORTYPE_RGBCOLOR_ICCCOLOR;
-    case SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR:
-    case SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR:
-        return SVGColor::SVG_COLORTYPE_CURRENTCOLOR;
-    }
-
-    ASSERT_NOT_REACHED();
-    return SVGColor::SVG_COLORTYPE_UNKNOWN;
-}
-
-SVGPaint::SVGPaint(const SVGPaintType&amp; paintType, const String&amp; uri)
-    : SVGColor(SVGPaintClass, colorTypeForPaintType(paintType))
-    , m_paintType(paintType)
-    , m_uri(uri)
-{
-}
-
-void SVGPaint::setUri(const String&amp;)
-{
-    // The whole SVGPaint interface is deprecated in SVG 1.1 (2nd edition).
-    // The setters are the most problematic part so we remove the support for those first.
-}
-
-ExceptionOr&lt;void&gt; SVGPaint::setPaint(unsigned short, const String&amp;, const String&amp;, const String&amp;)
-{
-    return Exception { NO_MODIFICATION_ALLOWED_ERR };
-}
-
-String SVGPaint::customCSSText() const
-{
-    switch (m_paintType) {
-    case SVG_PAINTTYPE_UNKNOWN:
-    case SVG_PAINTTYPE_RGBCOLOR:
-    case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR:
-    case SVG_PAINTTYPE_CURRENTCOLOR:
-        return SVGColor::customCSSText();
-    case SVG_PAINTTYPE_NONE:
-        return &quot;none&quot;;
-    case SVG_PAINTTYPE_URI_NONE:
-        return m_uri + &quot; none&quot;;
-    case SVG_PAINTTYPE_URI_CURRENTCOLOR:
-    case SVG_PAINTTYPE_URI_RGBCOLOR:
-    case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: {
-        String color = SVGColor::customCSSText();
-        if (color.isEmpty())
-            return m_uri;
-        return &quot;url(&quot; + m_uri + &quot;) &quot; + color;
-    }
-    case SVG_PAINTTYPE_URI:
-        return &quot;url(&quot; + m_uri + ')';
-    };
-
-    ASSERT_NOT_REACHED();
-    return String();
-}
-
-SVGPaint::SVGPaint(const SVGPaint&amp; cloneFrom)
-    : SVGColor(SVGPaintClass, cloneFrom)
-    , m_paintType(cloneFrom.m_paintType)
-    , m_uri(cloneFrom.m_uri)
-{
-}
-
-Ref&lt;SVGPaint&gt; SVGPaint::cloneForCSSOM() const
-{
-    return adoptRef(*new SVGPaint(*this));
-}
-
-bool SVGPaint::equals(const SVGPaint&amp; other) const
-{
-    return m_paintType == other.m_paintType &amp;&amp; m_uri == other.m_uri &amp;&amp; SVGColor::equals(other);
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGPainth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/svg/SVGPaint.h (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGPaint.h        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGPaint.h        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,110 +0,0 @@
</span><del>-/*
- * Copyright (C) 2004, 2005 Nikolas Zimmermann &lt;zimmermann@kde.org&gt;
- * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis &lt;buis@kde.org&gt;
- * Copyright (C) 2006 Samuel Weinig &lt;sam.weinig@gmial.com&gt;
- * Copyright (C) Research In Motion Limited 2011. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#include &quot;SVGColor.h&quot;
-
-namespace WebCore {
-
-class SVGPaint final : public SVGColor {
-public:
-    enum SVGPaintType {
-        SVG_PAINTTYPE_UNKNOWN = 0,
-        SVG_PAINTTYPE_RGBCOLOR = 1,
-        SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR = 2,
-        SVG_PAINTTYPE_NONE = 101,
-        SVG_PAINTTYPE_CURRENTCOLOR = 102,
-        SVG_PAINTTYPE_URI_NONE = 103,
-        SVG_PAINTTYPE_URI_CURRENTCOLOR = 104,
-        SVG_PAINTTYPE_URI_RGBCOLOR = 105,
-        SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR = 106,
-        SVG_PAINTTYPE_URI = 107
-    };
-
-    static Ref&lt;SVGPaint&gt; createNone()
-    {
-        return adoptRef(*new SVGPaint(SVG_PAINTTYPE_NONE));
-    }
-
-    static Ref&lt;SVGPaint&gt; createCurrentColor()
-    {
-        return adoptRef(*new SVGPaint(SVG_PAINTTYPE_CURRENTCOLOR));
-    }
-
-    static Ref&lt;SVGPaint&gt; createColor(const Color&amp; color)
-    {
-        auto paint = adoptRef(*new SVGPaint(SVG_PAINTTYPE_RGBCOLOR));
-        paint.get().setColor(color);
-        return paint;
-    }
-
-    static Ref&lt;SVGPaint&gt; createURI(const String&amp; uri)
-    {
-        return adoptRef(*new SVGPaint(SVG_PAINTTYPE_URI, uri));
-    }
-
-    static Ref&lt;SVGPaint&gt; createURIAndColor(const String&amp; uri, const Color&amp; color)
-    {
-        auto paint = adoptRef(*new SVGPaint(SVG_PAINTTYPE_URI_RGBCOLOR, uri));
-        paint.get().setColor(color);
-        return paint;
-    }
-
-    static Ref&lt;SVGPaint&gt; createURIAndNone(const String&amp; uri)
-    {
-        return adoptRef(*new SVGPaint(SVG_PAINTTYPE_URI_NONE, uri));
-    }
-
-    const SVGPaintType&amp; paintType() const { return m_paintType; }
-    String uri() const { return m_uri; }
-
-    void setUri(const String&amp;);
-    ExceptionOr&lt;void&gt; setPaint(unsigned short paintType, const String&amp; uri, const String&amp; rgbColor, const String&amp; iccColor);
-
-    String customCSSText() const;
-
-    Ref&lt;SVGPaint&gt; cloneForCSSOM() const;
-
-    bool equals(const SVGPaint&amp;) const;
-
-private:
-    friend class ComputedStyleExtractor;
-
-    static Ref&lt;SVGPaint&gt; create(const SVGPaintType&amp; type, const String&amp; uri, const Color&amp; color)
-    {
-        auto paint = adoptRef(*new SVGPaint(type, uri));
-        paint.get().setColor(color);
-        return paint;
-    }
-
-private:
-    SVGPaint(const SVGPaintType&amp;, const String&amp; uri = String());
-    SVGPaint(const SVGPaint&amp; cloneFrom);
-
-    SVGPaintType m_paintType;
-    String m_uri;
-};
-
-} // namespace WebCore
-
-SPECIALIZE_TYPE_TRAITS_CSS_VALUE(SVGPaint, isSVGPaint())
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGPaintidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/svg/SVGPaint.idl (209776 => 209777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGPaint.idl        2016-12-13 22:11:19 UTC (rev 209776)
+++ trunk/Source/WebCore/svg/SVGPaint.idl        2016-12-13 22:15:13 UTC (rev 209777)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-[
-    ImplementationLacksVTable,
-] interface SVGPaint : SVGColor {
-    const unsigned short SVG_PAINTTYPE_UNKNOWN = 0;
-    const unsigned short SVG_PAINTTYPE_RGBCOLOR = 1;
-    const unsigned short SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR = 2;
-    const unsigned short SVG_PAINTTYPE_NONE = 101;
-    const unsigned short SVG_PAINTTYPE_CURRENTCOLOR = 102;
-    const unsigned short SVG_PAINTTYPE_URI_NONE = 103;
-    const unsigned short SVG_PAINTTYPE_URI_CURRENTCOLOR = 104;
-    const unsigned short SVG_PAINTTYPE_URI_RGBCOLOR = 105;
-    const unsigned short SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR = 106;
-    const unsigned short SVG_PAINTTYPE_URI = 107;
-
-    readonly attribute unsigned short paintType;
-    readonly attribute DOMString uri;
-
-    void setUri(DOMString uri);
-    [MayThrowException] void setPaint(unsigned short paintType, DOMString uri, DOMString rgbColor, DOMString iccColor);
-};
</del></span></pre>
</div>
</div>

</body>
</html>