<!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>[162051] 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/162051">162051</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-14 22:50:13 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unnecessary WebkitCSSSVGDocumentValue
https://bugs.webkit.org/show_bug.cgi?id=126997
Reviewed by Andreas Kling.
Source/WebCore:
Removing redundant code path. WebkitCSSSVGDocumentValue
can be expressed by a CSSPrimitiveValue.
No new tests.
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.order:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSParser.cpp:
(WebCore::CSSParser::parseFilter):
* css/CSSValue.cpp:
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
* css/CSSValue.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::createFilterOperations):
* css/StyleResolver.h:
* css/WebKitCSSSVGDocumentValue.cpp: Removed.
* css/WebKitCSSSVGDocumentValue.h: Removed.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForFilter):
* css/WebKitCSSFilterValue.cpp:
(WebCore::WebKitCSSFilterValue::customCSSText):
LayoutTests:
Update results after use of CSSPrimitiveValue.
* css3/filters/filter-property-computed-style-expected.txt:
* css3/filters/filter-property-expected.txt:
* css3/filters/filter-property-parsing-expected.txt:
* css3/filters/script-tests/filter-property-computed-style.js:
* css3/filters/script-tests/filter-property-parsing.js:
* css3/filters/script-tests/filter-property.js:
* fast/filter-image/parse-filter-image-expected.txt:
* fast/filter-image/parse-filter-image.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3filtersfilterpropertycomputedstyleexpectedtxt">trunk/LayoutTests/css3/filters/filter-property-computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3filtersfilterpropertyexpectedtxt">trunk/LayoutTests/css3/filters/filter-property-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3filtersfilterpropertyparsingexpectedtxt">trunk/LayoutTests/css3/filters/filter-property-parsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3filtersscripttestsfilterpropertycomputedstylejs">trunk/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js</a></li>
<li><a href="#trunkLayoutTestscss3filtersscripttestsfilterpropertyparsingjs">trunk/LayoutTests/css3/filters/script-tests/filter-property-parsing.js</a></li>
<li><a href="#trunkLayoutTestscss3filtersscripttestsfilterpropertyjs">trunk/LayoutTests/css3/filters/script-tests/filter-property.js</a></li>
<li><a href="#trunkLayoutTestsfastfilterimageparsefilterimageexpectedtxt">trunk/LayoutTests/fast/filter-image/parse-filter-image-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastfilterimageparsefilterimagehtml">trunk/LayoutTests/fast/filter-image/parse-filter-image.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="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</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="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSFilterValuecpp">trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssWebKitCSSSVGDocumentValuecpp">trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSSVGDocumentValueh">trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/ChangeLog 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-14 Dirk Schulze <krit@webkit.org>
+
+ Remove unnecessary WebkitCSSSVGDocumentValue
+ https://bugs.webkit.org/show_bug.cgi?id=126997
+
+ Reviewed by Andreas Kling.
+
+ Update results after use of CSSPrimitiveValue.
+
+ * css3/filters/filter-property-computed-style-expected.txt:
+ * css3/filters/filter-property-expected.txt:
+ * css3/filters/filter-property-parsing-expected.txt:
+ * css3/filters/script-tests/filter-property-computed-style.js:
+ * css3/filters/script-tests/filter-property-parsing.js:
+ * css3/filters/script-tests/filter-property.js:
+ * fast/filter-image/parse-filter-image-expected.txt:
+ * fast/filter-image/parse-filter-image.html:
+
</ins><span class="cx"> 2014-01-14 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Incorrect repaint of fixed element with transformed parent
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersfilterpropertycomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/filters/filter-property-computed-style-expected.txt (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/filter-property-computed-style-expected.txt 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/css3/filters/filter-property-computed-style-expected.txt 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -7,26 +7,26 @@
</span><span class="cx"> Basic reference : url('#a')
</span><span class="cx"> PASS filterStyle.length is 1
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#a\')'
</del><ins>+PASS subRule.cssText is 'url(#a)'
</ins><span class="cx">
</span><span class="cx"> Bare unquoted reference converting to quoted form : url(#a)
</span><span class="cx"> PASS filterStyle.length is 1
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#a\')'
</del><ins>+PASS subRule.cssText is 'url(#a)'
</ins><span class="cx">
</span><span class="cx"> Multiple references : url('#a') url('#b')
</span><span class="cx"> PASS filterStyle.length is 2
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#a\')'
</del><ins>+PASS subRule.cssText is 'url(#a)'
</ins><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#b\')'
</del><ins>+PASS subRule.cssText is 'url(#b)'
</ins><span class="cx">
</span><span class="cx"> Reference as 2nd value : grayscale(1) url('#a')
</span><span class="cx"> PASS filterStyle.length is 2
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
</span><span class="cx"> PASS subRule.cssText is 'grayscale(1)'
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#a\')'
</del><ins>+PASS subRule.cssText is 'url(#a)'
</ins><span class="cx">
</span><span class="cx"> Integer value : grayscale(1)
</span><span class="cx"> PASS filterStyle.length is 1
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersfilterpropertyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/filters/filter-property-expected.txt (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/filter-property-expected.txt 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/css3/filters/filter-property-expected.txt 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'url(\'#a\') url(\'#b\')'
</del><ins>+PASS declaration.getPropertyValue('-webkit-filter') is 'url(#a) url(#b)'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersfilterpropertyparsingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/filters/filter-property-parsing-expected.txt (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/filter-property-parsing-expected.txt 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/css3/filters/filter-property-parsing-expected.txt 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -7,42 +7,42 @@
</span><span class="cx"> Basic reference : url('#a')
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'url(\'#a\')'
</del><ins>+PASS declaration.getPropertyValue('-webkit-filter') is 'url(#a)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="cx"> PASS filterRule.length is 1
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#a\')'
</del><ins>+PASS subRule.cssText is 'url(#a)'
</ins><span class="cx">
</span><span class="cx"> Bare unquoted reference converting to quoted form : url(#a)
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'url(\'#a\')'
</del><ins>+PASS declaration.getPropertyValue('-webkit-filter') is 'url(#a)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="cx"> PASS filterRule.length is 1
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#a\')'
</del><ins>+PASS subRule.cssText is 'url(#a)'
</ins><span class="cx">
</span><span class="cx"> Multiple references : url('#a') url('#b')
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'url(\'#a\') url(\'#b\')'
</del><ins>+PASS declaration.getPropertyValue('-webkit-filter') is 'url(#a) url(#b)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="cx"> PASS filterRule.length is 2
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#a\')'
</del><ins>+PASS subRule.cssText is 'url(#a)'
</ins><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#b\')'
</del><ins>+PASS subRule.cssText is 'url(#b)'
</ins><span class="cx">
</span><span class="cx"> Reference as 2nd value : grayscale(1) url('#a')
</span><span class="cx"> PASS cssRule.type is 1
</span><span class="cx"> PASS declaration.length is 1
</span><del>-PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(1) url(\'#a\')'
</del><ins>+PASS declaration.getPropertyValue('-webkit-filter') is 'grayscale(1) url(#a)'
</ins><span class="cx"> PASS jsWrapperClass(filterRule) is 'CSSValueList'
</span><span class="cx"> PASS jsWrapperClass(filterRule.__proto__) is 'CSSValueListPrototype'
</span><span class="cx"> PASS jsWrapperClass(filterRule.constructor) is 'CSSValueListConstructor'
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE
</span><span class="cx"> PASS subRule.cssText is 'grayscale(1)'
</span><span class="cx"> PASS subRule.operationType is WebKitCSSFilterValue.CSS_FILTER_REFERENCE
</span><del>-PASS subRule.cssText is 'url(\'#a\')'
</del><ins>+PASS subRule.cssText is 'url(#a)'
</ins><span class="cx">
</span><span class="cx"> Integer value : grayscale(1)
</span><span class="cx"> PASS cssRule.type is 1
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersscripttestsfilterpropertycomputedstylejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/css3/filters/script-tests/filter-property-computed-style.js 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -26,22 +26,22 @@
</span><span class="cx"> testComputedFilterRule("Basic reference",
</span><span class="cx"> "url('#a')", 1,
</span><span class="cx"> ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
</span><del>- ["url(\\'#a\\')"]);
</del><ins>+ ["url(#a)"]);
</ins><span class="cx">
</span><span class="cx"> testComputedFilterRule("Bare unquoted reference converting to quoted form",
</span><span class="cx"> "url(#a)", 1,
</span><span class="cx"> ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
</span><del>- ["url(\\'#a\\')"]);
</del><ins>+ ["url(#a)"]);
</ins><span class="cx">
</span><span class="cx"> testComputedFilterRule("Multiple references",
</span><span class="cx"> "url('#a') url('#b')", 2,
</span><span class="cx"> ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE", "WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
</span><del>- ["url(\\'#a\\')", "url(\\'#b\\')"]);
</del><ins>+ ["url(#a)", "url(#b)"]);
</ins><span class="cx">
</span><span class="cx"> testComputedFilterRule("Reference as 2nd value",
</span><span class="cx"> "grayscale(1) url('#a')", 2,
</span><span class="cx"> ["WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE", "WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
</span><del>- ["grayscale(1)", "url(\\'#a\\')"]);
</del><ins>+ ["grayscale(1)", "url(#a)"]);
</ins><span class="cx">
</span><span class="cx"> testComputedFilterRule("Integer value",
</span><span class="cx"> "grayscale(1)", 1,
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersscripttestsfilterpropertyparsingjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/filters/script-tests/filter-property-parsing.js (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/script-tests/filter-property-parsing.js 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/css3/filters/script-tests/filter-property-parsing.js 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -54,24 +54,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> testFilterRule("Basic reference",
</span><del>- "url('#a')", 1, "url(\\'#a\\')",
</del><ins>+ "url('#a')", 1, "url(#a)",
</ins><span class="cx"> ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
</span><del>- ["url(\\'#a\\')"]);
</del><ins>+ ["url(#a)"]);
</ins><span class="cx">
</span><span class="cx"> testFilterRule("Bare unquoted reference converting to quoted form",
</span><del>- "url(#a)", 1, "url(\\'#a\\')",
</del><ins>+ "url(#a)", 1, "url(#a)",
</ins><span class="cx"> ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
</span><del>- ["url(\\'#a\\')"]);
</del><ins>+ ["url(#a)"]);
</ins><span class="cx">
</span><span class="cx"> testFilterRule("Multiple references",
</span><del>- "url('#a') url('#b')", 2, "url(\\'#a\\') url(\\'#b\\')",
</del><ins>+ "url('#a') url('#b')", 2, "url(#a) url(#b)",
</ins><span class="cx"> ["WebKitCSSFilterValue.CSS_FILTER_REFERENCE", "WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
</span><del>- ["url(\\'#a\\')", "url(\\'#b\\')"]);
</del><ins>+ ["url(#a)", "url(#b)"]);
</ins><span class="cx">
</span><span class="cx"> testFilterRule("Reference as 2nd value",
</span><del>- "grayscale(1) url('#a')", 2, "grayscale(1) url(\\'#a\\')",
</del><ins>+ "grayscale(1) url('#a')", 2, "grayscale(1) url(#a)",
</ins><span class="cx"> ["WebKitCSSFilterValue.CSS_FILTER_GRAYSCALE", "WebKitCSSFilterValue.CSS_FILTER_REFERENCE"],
</span><del>- ["grayscale(1)", "url(\\'#a\\')"]);
</del><ins>+ ["grayscale(1)", "url(#a)"]);
</ins><span class="cx">
</span><span class="cx"> testFilterRule("Integer value",
</span><span class="cx"> "grayscale(1)", 1, "grayscale(1)",
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersscripttestsfilterpropertyjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/filters/script-tests/filter-property.js (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/script-tests/filter-property.js 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/css3/filters/script-tests/filter-property.js 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -13,6 +13,6 @@
</span><span class="cx">
</span><span class="cx"> var declaration = cssRule.style;
</span><span class="cx"> shouldBe("declaration.length", "1");
</span><del>-shouldBe("declaration.getPropertyValue('-webkit-filter')", "'url(\\'#a\\') url(\\'#b\\')'");
</del><ins>+shouldBe("declaration.getPropertyValue('-webkit-filter')", "'url(#a) url(#b)'");
</ins><span class="cx">
</span><span class="cx"> successfullyParsed = true;
</span></span></pre></div>
<a id="trunkLayoutTestsfastfilterimageparsefilterimageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/filter-image/parse-filter-image-expected.txt (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/filter-image/parse-filter-image-expected.txt 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/fast/filter-image/parse-filter-image-expected.txt 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS innerStyle("background-image", "-webkit-filter(none, blur(3px))") is "-webkit-filter(none, blur(3px))"
</span><del>-PASS innerStyle("background-image", "-webkit-filter(none, url('#a'))") is "-webkit-filter(none, url('#a'))"
-PASS innerStyle("background-image", "-webkit-filter(none, url(#a))") is "-webkit-filter(none, url('#a'))"
-PASS innerStyle("background-image", "-webkit-filter(none, url('#a') url('#b'))") is "-webkit-filter(none, url('#a') url('#b'))"
-PASS innerStyle("background-image", "-webkit-filter(none, grayscale(1) url('#a'))") is "-webkit-filter(none, grayscale(1) url('#a'))"
</del><ins>+PASS innerStyle("background-image", "-webkit-filter(none, url(#a))") is "-webkit-filter(none, url(#a))"
+PASS innerStyle("background-image", "-webkit-filter(none, url(#a))") is "-webkit-filter(none, url(#a))"
+PASS innerStyle("background-image", "-webkit-filter(none, url(#a) url(#b))") is "-webkit-filter(none, url(#a) url(#b))"
+PASS innerStyle("background-image", "-webkit-filter(none, grayscale(1) url(#a))") is "-webkit-filter(none, grayscale(1) url(#a))"
</ins><span class="cx"> PASS innerStyle("background-image", "-webkit-filter(none, grayscale(1))") is "-webkit-filter(none, grayscale(1))"
</span><span class="cx"> PASS innerStyle("background-image", "-webkit-filter(none, grayscale(50%))") is "-webkit-filter(none, grayscale(50%))"
</span><span class="cx"> PASS innerStyle("background-image", "-webkit-filter(none, grayscale(1.0))") is "-webkit-filter(none, grayscale(1))"
</span></span></pre></div>
<a id="trunkLayoutTestsfastfilterimageparsefilterimagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/filter-image/parse-filter-image.html (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/filter-image/parse-filter-image.html 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/LayoutTests/fast/filter-image/parse-filter-image.html 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -48,20 +48,20 @@
</span><span class="cx"> "-webkit-filter(none, blur(3px))");
</span><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, url('#a'))",
- "-webkit-filter(none, url('#a'))");
</del><ins>+ "-webkit-filter(none, url(#a))",
+ "-webkit-filter(none, url(#a))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><span class="cx"> "-webkit-filter(none, url(#a))",
</span><del>- "-webkit-filter(none, url('#a'))");
</del><ins>+ "-webkit-filter(none, url(#a))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, url('#a') url('#b'))",
- "-webkit-filter(none, url('#a') url('#b'))");
</del><ins>+ "-webkit-filter(none, url(#a) url(#b))",
+ "-webkit-filter(none, url(#a) url(#b))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><del>- "-webkit-filter(none, grayscale(1) url('#a'))",
- "-webkit-filter(none, grayscale(1) url('#a'))");
</del><ins>+ "-webkit-filter(none, grayscale(1) url(#a))",
+ "-webkit-filter(none, grayscale(1) url(#a))");
</ins><span class="cx"> testInner(
</span><span class="cx"> "background-image",
</span><span class="cx"> "-webkit-filter(none, grayscale(1))",
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -1118,7 +1118,6 @@
</span><span class="cx"> css/WebKitCSSMatrix.cpp
</span><span class="cx"> css/WebKitCSSMixFunctionValue.cpp
</span><span class="cx"> css/WebKitCSSRegionRule.cpp
</span><del>- css/WebKitCSSSVGDocumentValue.cpp
</del><span class="cx"> css/WebKitCSSShaderValue.cpp
</span><span class="cx"> css/WebKitCSSTransformValue.cpp
</span><span class="cx"> css/WebKitCSSViewportRule.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/ChangeLog 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-01-14 Dirk Schulze <krit@webkit.org>
+
+ Remove unnecessary WebkitCSSSVGDocumentValue
+ https://bugs.webkit.org/show_bug.cgi?id=126997
+
+ Reviewed by Andreas Kling.
+
+ Removing redundant code path. WebkitCSSSVGDocumentValue
+ can be expressed by a CSSPrimitiveValue.
+
+ No new tests.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.order:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseFilter):
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::equals):
+ (WebCore::CSSValue::cssText):
+ (WebCore::CSSValue::destroy):
+ * css/CSSValue.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::createFilterOperations):
+ * css/StyleResolver.h:
+ * css/WebKitCSSSVGDocumentValue.cpp: Removed.
+ * css/WebKitCSSSVGDocumentValue.h: Removed.
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::valueForFilter):
+ * css/WebKitCSSFilterValue.cpp:
+ (WebCore::WebKitCSSFilterValue::customCSSText):
+
</ins><span class="cx"> 2014-01-14 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Incorrect repaint of fixed element with transformed parent
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -4815,8 +4815,6 @@
</span><span class="cx"> Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp \
</span><span class="cx"> Source/WebCore/css/SVGCSSParser.cpp \
</span><span class="cx"> Source/WebCore/css/SVGCSSStyleSelector.cpp \
</span><del>- Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp \
- Source/WebCore/css/WebKitCSSSVGDocumentValue.h \
</del><span class="cx"> Source/WebCore/loader/cache/CachedSVGDocument.cpp \
</span><span class="cx"> Source/WebCore/loader/cache/CachedSVGDocument.h \
</span><span class="cx"> Source/WebCore/loader/cache/CachedSVGDocumentClient.h \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/WebCore.order 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -26357,7 +26357,6 @@
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore20StyleFlexibleBoxDataEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore30StyleDeprecatedFlexibleBoxDataEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore18StyleScopeResolverEEE
</span><del>-__ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore25WebKitCSSSVGDocumentValueEEE
</del><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore15FilterOperationEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore12CSSStyleRuleEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore16MediaQueryResultEEE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -9567,7 +9567,6 @@
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSMixFunctionValue.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSRegionRule.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSShaderValue.cpp" />
</span><del>- <ClCompile Include="..\css\WebKitCSSSVGDocumentValue.cpp" />
</del><span class="cx"> <ClCompile Include="..\css\WebKitCSSTransformValue.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSViewportRule.cpp" />
</span><span class="cx"> <ClCompile Include="..\cssjit\SelectorCompiler.cpp" />
</span><span class="lines">@@ -19882,7 +19881,6 @@
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSMixFunctionValue.h" />
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSRegionRule.h" />
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSShaderValue.h" />
</span><del>- <ClInclude Include="..\css\WebKitCSSSVGDocumentValue.h" />
</del><span class="cx"> <ClInclude Include="..\css\WebKitCSSTransformValue.h" />
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSViewportRule.h" />
</span><span class="cx"> <ClInclude Include="..\cssjit\FunctionCall.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -2367,9 +2367,6 @@
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSShaderValue.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\css\WebKitCSSSVGDocumentValue.cpp">
- <Filter>css</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\css\WebKitCSSTransformValue.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -9299,9 +9296,6 @@
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSShaderValue.h">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\css\WebKitCSSSVGDocumentValue.h">
- <Filter>css</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\css\WebKitCSSTransformValue.h">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -64,8 +64,6 @@
</span><span class="cx"> 01D3CF8614BD0A3000FE9970 /* WebGLSharedObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01D3CF8014BD0A3000FE9970 /* WebGLSharedObject.cpp */; };
</span><span class="cx"> 01D3CF8714BD0A3000FE9970 /* WebGLSharedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 01D3CF8114BD0A3000FE9970 /* WebGLSharedObject.h */; };
</span><span class="cx"> 01E6C2E41194B2820050821C /* SpellingDot@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01E6C2E31194B2820050821C /* SpellingDot@2x.png */; };
</span><del>- 0562F9461573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0562F9441573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.cpp */; };
- 0562F9471573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 0562F9451573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.h */; };
</del><span class="cx"> 0562F9611573F88F0031CA16 /* PlatformLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0562F9601573F88F0031CA16 /* PlatformLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 05FD69E012845D4300B2BEB3 /* DOMTimeStamp.h in Headers */ = {isa = PBXBuildFile; fileRef = 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 06027CAD0B1CBFC000884B2D /* ContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -6813,8 +6811,6 @@
</span><span class="cx"> 01D3CF8014BD0A3000FE9970 /* WebGLSharedObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLSharedObject.cpp; path = canvas/WebGLSharedObject.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 01D3CF8114BD0A3000FE9970 /* WebGLSharedObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLSharedObject.h; path = canvas/WebGLSharedObject.h; sourceTree = "<group>"; };
</span><span class="cx"> 01E6C2E31194B2820050821C /* SpellingDot@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SpellingDot@2x.png"; sourceTree = "<group>"; };
</span><del>- 0562F9441573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSSVGDocumentValue.cpp; sourceTree = "<group>"; };
- 0562F9451573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSSVGDocumentValue.h; sourceTree = "<group>"; };
</del><span class="cx"> 0562F9601573F88F0031CA16 /* PlatformLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformLayer.h; sourceTree = "<group>"; };
</span><span class="cx"> 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTimeStamp.h; sourceTree = "<group>"; };
</span><span class="cx"> 06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenuItem.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -21745,8 +21741,6 @@
</span><span class="cx"> 8AD0A55614C87425000D83C5 /* WebKitCSSRegionRule.idl */,
</span><span class="cx"> 5038BC0614711CDB0095E0D1 /* WebKitCSSShaderValue.cpp */,
</span><span class="cx"> 50B42157146976960087E604 /* WebKitCSSShaderValue.h */,
</span><del>- 0562F9441573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.cpp */,
- 0562F9451573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.h */,
</del><span class="cx"> BC9ADD7F0CC4092200098C4C /* WebKitCSSTransformValue.cpp */,
</span><span class="cx"> BC9ADD220CC4032600098C4C /* WebKitCSSTransformValue.h */,
</span><span class="cx"> 31611E540E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl */,
</span><span class="lines">@@ -26052,7 +26046,6 @@
</span><span class="cx"> A24BF77B15CC3BAF003191F2 /* WebKitCSSMixFunctionValue.h in Headers */,
</span><span class="cx"> 8AA61D00144D595B00F37350 /* WebKitCSSRegionRule.h in Headers */,
</span><span class="cx"> 29CD61DE146D02890068E82A /* WebKitCSSShaderValue.h in Headers */,
</span><del>- 0562F9471573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.h in Headers */,
</del><span class="cx"> 078E094217D16E1C00420AA1 /* RTCPeerConnectionHandlerClient.h in Headers */,
</span><span class="cx"> BC9ADD230CC4032600098C4C /* WebKitCSSTransformValue.h in Headers */,
</span><span class="cx"> 3FFFF9A9159D9A550020BBD5 /* WebKitCSSViewportRule.h in Headers */,
</span><span class="lines">@@ -29281,7 +29274,6 @@
</span><span class="cx"> A24BF77C15CC3BAF003191F2 /* WebKitCSSMixFunctionValue.cpp in Sources */,
</span><span class="cx"> 8AA61CFF144D595B00F37350 /* WebKitCSSRegionRule.cpp in Sources */,
</span><span class="cx"> 5038BC0714711CDB0095E0D1 /* WebKitCSSShaderValue.cpp in Sources */,
</span><del>- 0562F9461573ECEB0031CA16 /* WebKitCSSSVGDocumentValue.cpp in Sources */,
</del><span class="cx"> BC9ADD800CC4092200098C4C /* WebKitCSSTransformValue.cpp in Sources */,
</span><span class="cx"> 3FFFF9A8159D9A550020BBD5 /* WebKitCSSViewportRule.cpp in Sources */,
</span><span class="cx"> 1A1414B513A0F0500019996C /* WebKitFontFamilyNames.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx"> case FilterOperation::REFERENCE: {
</span><span class="cx"> ReferenceFilterOperation* referenceOperation = static_cast<ReferenceFilterOperation*>(filterOperation);
</span><span class="cx"> filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::ReferenceFilterOperation);
</span><del>- filterValue->append(cssValuePool().createValue(referenceOperation->url(), CSSPrimitiveValue::CSS_STRING));
</del><ins>+ filterValue->append(cssValuePool().createValue(referenceOperation->url(), CSSPrimitiveValue::CSS_URI));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::GRAYSCALE: {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -99,10 +99,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> #include "WebKitCSSFilterValue.h"
</span><del>-#if ENABLE(SVG)
-#include "WebKitCSSSVGDocumentValue.h"
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHADERS)
</span><span class="cx"> #include "WebKitCSSArrayFunctionValue.h"
</span><span class="lines">@@ -9826,7 +9823,7 @@
</span><span class="cx"> if (value->unit == CSSPrimitiveValue::CSS_URI) {
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> RefPtr<WebKitCSSFilterValue> referenceFilterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::ReferenceFilterOperation);
</span><del>- referenceFilterValue->append(WebKitCSSSVGDocumentValue::create(value->string));
</del><ins>+ referenceFilterValue->append(CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_URI));
</ins><span class="cx"> list->append(referenceFilterValue.release());
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.cpp 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -61,10 +61,6 @@
</span><span class="cx"> #include "WebKitCSSShaderValue.h"
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="cx">
</span><del>-#if ENABLE(SVG)
-#include "WebKitCSSSVGDocumentValue.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct SameSizeAsCSSValue : public RefCounted<SameSizeAsCSSValue> {
</span><span class="lines">@@ -242,8 +238,6 @@
</span><span class="cx"> return compareCSSValues<SVGColor>(*this, other);
</span><span class="cx"> case SVGPaintClass:
</span><span class="cx"> return compareCSSValues<SVGPaint>(*this, other);
</span><del>- case WebKitCSSSVGDocumentClass:
- return compareCSSValues<WebKitCSSSVGDocumentValue>(*this, other);
</del><span class="cx"> #endif
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -342,8 +336,6 @@
</span><span class="cx"> return toSVGColor(this)->customCSSText();
</span><span class="cx"> case SVGPaintClass:
</span><span class="cx"> return toSVGPaint(this)->customCSSText();
</span><del>- case WebKitCSSSVGDocumentClass:
- return toWebKitCSSSVGDocumentValue(this)->customCSSText();
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -469,9 +461,6 @@
</span><span class="cx"> case SVGPaintClass:
</span><span class="cx"> delete toSVGPaint(this);
</span><span class="cx"> return;
</span><del>- case WebKitCSSSVGDocumentClass:
- delete toWebKitCSSSVGDocumentValue(this);
- return;
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.h 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/CSSValue.h 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> bool isSVGColor() const { return m_classType == SVGColorClass || m_classType == SVGPaintClass; }
</span><span class="cx"> bool isSVGPaint() const { return m_classType == SVGPaintClass; }
</span><del>- bool isWebKitCSSSVGDocumentValue() const { return m_classType == WebKitCSSSVGDocumentClass; }
</del><span class="cx"> #endif
</span><span class="cx"> bool isUnicodeRangeValue() const { return m_classType == UnicodeRangeClass; }
</span><span class="cx">
</span><span class="lines">@@ -175,7 +174,6 @@
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> SVGColorClass,
</span><span class="cx"> SVGPaintClass,
</span><del>- WebKitCSSSVGDocumentClass,
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // List class types must appear after ValueListClass.
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -177,7 +177,6 @@
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGNames.h"
</span><span class="cx"> #include "SVGURIReference.h"
</span><del>-#include "WebKitCSSSVGDocumentValue.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="lines">@@ -3819,14 +3818,15 @@
</span><span class="cx"> continue;
</span><span class="cx"> CSSValue* argument = filterValue->itemWithoutBoundsCheck(0);
</span><span class="cx">
</span><del>- if (!argument->isWebKitCSSSVGDocumentValue())
</del><ins>+ if (!argument->isPrimitiveValue())
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- WebKitCSSSVGDocumentValue* svgDocumentValue = toWebKitCSSSVGDocumentValue(argument);
- URL url = m_state.document().completeURL(svgDocumentValue->url());
</del><ins>+ CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(*argument);
+ String cssUrl = primitiveValue.getStringValue();
+ URL url = m_state.document().completeURL(cssUrl);
</ins><span class="cx">
</span><del>- RefPtr<ReferenceFilterOperation> operation = ReferenceFilterOperation::create(svgDocumentValue->url(), url.fragmentIdentifier(), operationType);
- if (SVGURIReference::isExternalURIReference(svgDocumentValue->url(), m_state.document()))
</del><ins>+ RefPtr<ReferenceFilterOperation> operation = ReferenceFilterOperation::create(cssUrl, url.fragmentIdentifier(), operationType);
+ if (SVGURIReference::isExternalURIReference(cssUrl, m_state.document()))
</ins><span class="cx"> m_state.pendingSVGDocuments().add(operation->createCachedSVGDocumentReference());
</span><span class="cx"> operations.operations().append(operation);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/StyleResolver.h 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx"> #include "StyleInheritedData.h"
</span><span class="cx"> #include "StyleScopeResolver.h"
</span><span class="cx"> #include "ViewportStyleResolver.h"
</span><del>-#if ENABLE(CSS_FILTERS) && ENABLE(SVG)
-#include "WebKitCSSSVGDocumentValue.h"
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHADERS)
</span><span class="cx"> #include "CustomFilterConstants.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -107,7 +104,6 @@
</span><span class="cx"> class ViewportStyleResolver;
</span><span class="cx"> class WebKitCSSFilterValue;
</span><span class="cx"> class WebKitCSSShaderValue;
</span><del>-class WebKitCSSSVGDocumentValue;
</del><span class="cx">
</span><span class="cx"> class MediaQueryResult {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(MediaQueryResult); WTF_MAKE_FAST_ALLOCATED;
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSFilterValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -58,8 +58,7 @@
</span><span class="cx"> result = "";
</span><span class="cx"> break;
</span><span class="cx"> case ReferenceFilterOperation:
</span><del>- result = "url(";
- break;
</del><ins>+ return CSSValueList::customCSSText();
</ins><span class="cx"> case GrayscaleFilterOperation:
</span><span class="cx"> result = "grayscale(";
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSSVGDocumentValuecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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 COMPUTER, 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 COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * 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.
- */
-
-#include "config.h"
-
-#if ENABLE(SVG)
-#include "WebKitCSSSVGDocumentValue.h"
-
-#include "CSSParser.h"
-#include "CachedResourceLoader.h"
-#include "CachedResourceRequest.h"
-#include "CachedResourceRequestInitiators.h"
-#include "CachedSVGDocument.h"
-#include "Document.h"
-
-namespace WebCore {
-
-WebKitCSSSVGDocumentValue::WebKitCSSSVGDocumentValue(const String& url)
- : CSSValue(WebKitCSSSVGDocumentClass)
- , m_url(url)
- , m_loadRequested(false)
-{
-}
-
-WebKitCSSSVGDocumentValue::~WebKitCSSSVGDocumentValue()
-{
-}
-
-CachedSVGDocument* WebKitCSSSVGDocumentValue::load(CachedResourceLoader* loader)
-{
- ASSERT(loader);
-
- if (!m_loadRequested) {
- m_loadRequested = true;
-
- CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url)));
- request.setInitiator(cachedResourceRequestInitiators().css);
- m_document = loader->requestSVGDocument(request);
- }
-
- return m_document.get();
-}
-
-String WebKitCSSSVGDocumentValue::customCSSText() const
-{
- return quoteCSSStringIfNeeded(m_url);
-}
-
-bool WebKitCSSSVGDocumentValue::equals(const WebKitCSSSVGDocumentValue& other) const
-{
- return m_url == other.m_url;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SVG)
</del></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSSVGDocumentValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h (162050 => 162051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h 2014-01-15 06:43:39 UTC (rev 162050)
+++ trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h 2014-01-15 06:50:13 UTC (rev 162051)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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 COMPUTER, 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 COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * 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.
- */
-
-#ifndef WebKitCSSSVGDocumentValue_h
-#define WebKitCSSSVGDocumentValue_h
-
-#include "CSSValue.h"
-#include "CachedResourceHandle.h"
-
-namespace WebCore {
-
-class CachedResourceLoader;
-class CachedSVGDocument;
-
-class WebKitCSSSVGDocumentValue : public CSSValue {
-public:
- static PassRef<WebKitCSSSVGDocumentValue> create(const String& url)
- {
- return adoptRef(*new WebKitCSSSVGDocumentValue(url));
- }
- ~WebKitCSSSVGDocumentValue();
-
- CachedSVGDocument* cachedSVGDocument() const { return m_document.get(); }
- CachedSVGDocument* load(CachedResourceLoader*);
-
- String customCSSText() const;
- const String& url() const { return m_url; }
- bool loadRequested() const { return m_loadRequested; }
- bool equals(const WebKitCSSSVGDocumentValue&) const;
-
-private:
- WebKitCSSSVGDocumentValue(const String& url);
-
- String m_url;
- CachedResourceHandle<CachedSVGDocument> m_document;
- bool m_loadRequested;
-};
-
-CSS_VALUE_TYPE_CASTS(WebKitCSSSVGDocumentValue, isWebKitCSSSVGDocumentValue())
-
-} // namespace WebCore
-
-#endif // WebKitCSSSVGDocumentValue_h
</del></span></pre>
</div>
</div>
</body>
</html>