<!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>[199884] 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/199884">199884</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-04-22 11:27:23 -0700 (Fri, 22 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Source/WebCore:
-webkit-image-set doesn't work inside CSS variables
https://bugs.webkit.org/show_bug.cgi?id=156915
<rdar://problem/25473972>
Reviewed by Zalan Bujtas.
Added new tests in fast/hidpi.
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::equals):
(WebCore::CSSPrimitiveValue::buildParserValue):
LayoutTests:
-webkit-image-set doesn't work inside CSS variables
https://bugs.webkit.org/show_bug.cgi?id=156915
<rdar://problem/25473972>
Reviewed by Zalan Bujtas.
* fast/hidpi/image-srcset-simple-in-variable-1x-expected.txt: Added.
* fast/hidpi/image-srcset-simple-in-variable-1x.html: Added.
* fast/hidpi/image-srcset-simple-in-variable-2x-expected.txt: Added.
* fast/hidpi/image-srcset-simple-in-variable-2x.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthidpiimagesrcsetsimpleinvariable1xexpectedtxt">trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-1x-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthidpiimagesrcsetsimpleinvariable1xhtml">trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-1x.html</a></li>
<li><a href="#trunkLayoutTestsfasthidpiimagesrcsetsimpleinvariable2xexpectedtxt">trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-2x-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthidpiimagesrcsetsimpleinvariable2xhtml">trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-2x.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199883 => 199884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-22 18:17:32 UTC (rev 199883)
+++ trunk/LayoutTests/ChangeLog 2016-04-22 18:27:23 UTC (rev 199884)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-22 Dave Hyatt <hyatt@apple.com>
+
+ -webkit-image-set doesn't work inside CSS variables
+ https://bugs.webkit.org/show_bug.cgi?id=156915
+ <rdar://problem/25473972>
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/hidpi/image-srcset-simple-in-variable-1x-expected.txt: Added.
+ * fast/hidpi/image-srcset-simple-in-variable-1x.html: Added.
+ * fast/hidpi/image-srcset-simple-in-variable-2x-expected.txt: Added.
+ * fast/hidpi/image-srcset-simple-in-variable-2x.html: Added.
+
</ins><span class="cx"> 2016-04-22 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r199877.
</span></span></pre></div>
<a id="trunkLayoutTestsfasthidpiimagesrcsetsimpleinvariable1xexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-1x-expected.txt (0 => 199884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-1x-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-1x-expected.txt 2016-04-22 18:27:23 UTC (rev 199884)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS document.getElementById("foo").clientWidth==400 is true
+This test passes if the image below says 1x with a reddish background when the deviceScaleFactor is 1, and if says 2x with a greenish background when the deviceScaleFactor is 2.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthidpiimagesrcsetsimpleinvariable1xhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-1x.html (0 => 199884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-1x.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-1x.html 2016-04-22 18:27:23 UTC (rev 199884)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<html>
+<head>
+<script>
+ window.targetScaleFactor = 1;
+</script>
+<script src="../../resources/srcset-helper.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function runTest()
+ {
+ shouldBeTrue('document.getElementById("foo").clientWidth==400');
+ }
+</script>
+<style>
+ #foo { --image-set: -webkit-image-set(url(resources/image-set-1x.png) 1x, url(resources/deleteButton.png) 3x, url(resources/image-set-2x.png) 2x); }
+</style>
+</head>
+
+<body id="body">
+ <div>This test passes if the image below says 1x with a reddish background when the deviceScaleFactor is 1, and if says 2x with a greenish background when the deviceScaleFactor is 2.</div>
+ <img id="foo" src="" style="content:var(--image-set)">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthidpiimagesrcsetsimpleinvariable2xexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-2x-expected.txt (0 => 199884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-2x-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-2x-expected.txt 2016-04-22 18:27:23 UTC (rev 199884)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS document.getElementById("foo").clientWidth==200 is true
+This test passes if the image below says 1x with a reddish background when the deviceScaleFactor is 1, and if says 2x with a greenish background when the deviceScaleFactor is 2.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthidpiimagesrcsetsimpleinvariable2xhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-2x.html (0 => 199884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-2x.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/image-srcset-simple-in-variable-2x.html 2016-04-22 18:27:23 UTC (rev 199884)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<html>
+<head>
+<script>
+ window.targetScaleFactor = 2;
+</script>
+<script src="../../resources/srcset-helper.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+ function runTest()
+ {
+ shouldBeTrue('document.getElementById("foo").clientWidth==200');
+ }
+</script>
+<style>
+ #foo { --image-set: -webkit-image-set(url(resources/blue-100-px-square.png) 1x, url(resources/deleteButton.png) 3x, url(resources/green-400-px-square.png) 2x); }
+</style>
+</head>
+
+<body id="body">
+ <div>This test passes if the image below says 1x with a reddish background when the deviceScaleFactor is 1, and if says 2x with a greenish background when the deviceScaleFactor is 2.</div>
+ <img id="foo" src="" style="content:var(--image-set)">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199883 => 199884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-22 18:17:32 UTC (rev 199883)
+++ trunk/Source/WebCore/ChangeLog 2016-04-22 18:27:23 UTC (rev 199884)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-22 Dave Hyatt <hyatt@apple.com>
+
+ -webkit-image-set doesn't work inside CSS variables
+ https://bugs.webkit.org/show_bug.cgi?id=156915
+ <rdar://problem/25473972>
+
+ Reviewed by Zalan Bujtas.
+
+ Added new tests in fast/hidpi.
+
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::equals):
+ (WebCore::CSSPrimitiveValue::buildParserValue):
+
</ins><span class="cx"> 2016-04-22 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r199877.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (199883 => 199884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-04-22 18:17:32 UTC (rev 199883)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-04-22 18:27:23 UTC (rev 199884)
</span><span class="lines">@@ -1329,13 +1329,13 @@
</span><span class="cx"> case CSS_VW:
</span><span class="cx"> case CSS_VH:
</span><span class="cx"> case CSS_VMIN:
</span><del>- case CSS_DIMENSION:
</del><span class="cx"> case CSS_FR:
</span><span class="cx"> return m_value.num == other.m_value.num;
</span><span class="cx"> case CSS_PROPERTY_ID:
</span><span class="cx"> return propertyName(m_value.propertyID) == propertyName(other.m_value.propertyID);
</span><span class="cx"> case CSS_VALUE_ID:
</span><span class="cx"> return valueName(m_value.valueID) == valueName(other.m_value.valueID);
</span><ins>+ case CSS_DIMENSION:
</ins><span class="cx"> case CSS_STRING:
</span><span class="cx"> case CSS_URI:
</span><span class="cx"> case CSS_ATTR:
</span><span class="lines">@@ -1414,7 +1414,6 @@
</span><span class="cx"> case CSS_VW:
</span><span class="cx"> case CSS_VH:
</span><span class="cx"> case CSS_VMIN:
</span><del>- case CSS_DIMENSION:
</del><span class="cx"> case CSS_FR:
</span><span class="cx"> result->fValue = m_value.num;
</span><span class="cx"> result->unit = m_primitiveUnitType;
</span><span class="lines">@@ -1428,6 +1427,7 @@
</span><span class="cx"> result->iValue = m_value.parserOperator;
</span><span class="cx"> result->unit = CSSParserValue::Operator;
</span><span class="cx"> break;
</span><ins>+ case CSS_DIMENSION:
</ins><span class="cx"> case CSS_STRING:
</span><span class="cx"> case CSS_URI:
</span><span class="cx"> case CSS_ATTR:
</span></span></pre>
</div>
</div>
</body>
</html>