<!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>[169248] 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/169248">169248</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 22:18:23 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make viewport units work in CSS gradients
https://bugs.webkit.org/show_bug.cgi?id=133204
<rdar://problem/17012259>
Source/WebCore:
Reviewed by Tim Horton.
Make viewport percentage lengths work in gradients.
Test: fast/gradients/viewport-units-gradient.html
* css/CSSGradientValue.cpp:
(WebCore::CSSGradientValue::addStops):
(WebCore::CSSLinearGradientValue::createGradient):
(WebCore::CSSRadialGradientValue::createGradient):
* css/CSSGradientValue.h:
LayoutTests:
Reviewed by Tim Horton.
Make viewport percentage lengths work in gradients.
* fast/gradients/viewport-units-gradient-expected.html: Added.
* fast/gradients/viewport-units-gradient.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="#trunkSourceWebCorecssCSSGradientValuecpp">trunk/Source/WebCore/css/CSSGradientValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSGradientValueh">trunk/Source/WebCore/css/CSSGradientValue.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastgradientsviewportunitsgradientexpectedhtml">trunk/LayoutTests/fast/gradients/viewport-units-gradient-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastgradientsviewportunitsgradienthtml">trunk/LayoutTests/fast/gradients/viewport-units-gradient.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169247 => 169248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-23 04:34:32 UTC (rev 169247)
+++ trunk/LayoutTests/ChangeLog 2014-05-23 05:18:23 UTC (rev 169248)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-22 Simon Fraser <simon.fraser@apple.com>
+
+ Make viewport units work in CSS gradients
+ https://bugs.webkit.org/show_bug.cgi?id=133204
+ <rdar://problem/17012259>
+
+ Reviewed by Tim Horton.
+
+ Make viewport percentage lengths work in gradients.
+
+ * fast/gradients/viewport-units-gradient-expected.html: Added.
+ * fast/gradients/viewport-units-gradient.html: Added.
+
</ins><span class="cx"> 2014-05-22 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Can't type in status in facebook.com on iOS Safari because keyboard disappears
</span></span></pre></div>
<a id="trunkLayoutTestsfastgradientsviewportunitsgradientexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/gradients/viewport-units-gradient-expected.html (0 => 169248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/gradients/viewport-units-gradient-expected.html (rev 0)
+++ trunk/LayoutTests/fast/gradients/viewport-units-gradient-expected.html 2014-05-23 05:18:23 UTC (rev 169248)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ background-image: linear-gradient(white, white 300px, black 300px, black 600px);
+ }
+
+ body {
+ height: 600px;
+ }
+ </style>
+</head>
+<body>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastgradientsviewportunitsgradienthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/gradients/viewport-units-gradient.html (0 => 169248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/gradients/viewport-units-gradient.html (rev 0)
+++ trunk/LayoutTests/fast/gradients/viewport-units-gradient.html 2014-05-23 05:18:23 UTC (rev 169248)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ background-image: linear-gradient(white, white 50vh, black 50vh, black 100vh);
+ }
+
+ body {
+ height: 600px;
+ }
+ </style>
+</head>
+<body>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169247 => 169248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-23 04:34:32 UTC (rev 169247)
+++ trunk/Source/WebCore/ChangeLog 2014-05-23 05:18:23 UTC (rev 169248)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-22 Simon Fraser <simon.fraser@apple.com>
+
+ Make viewport units work in CSS gradients
+ https://bugs.webkit.org/show_bug.cgi?id=133204
+ <rdar://problem/17012259>
+
+ Reviewed by Tim Horton.
+
+ Make viewport percentage lengths work in gradients.
+
+ Test: fast/gradients/viewport-units-gradient.html
+
+ * css/CSSGradientValue.cpp:
+ (WebCore::CSSGradientValue::addStops):
+ (WebCore::CSSLinearGradientValue::createGradient):
+ (WebCore::CSSRadialGradientValue::createGradient):
+ * css/CSSGradientValue.h:
+
</ins><span class="cx"> 2014-05-22 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Add support for minimal-ui viewports
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGradientValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGradientValue.cpp (169247 => 169248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGradientValue.cpp 2014-05-23 04:34:32 UTC (rev 169247)
+++ trunk/Source/WebCore/css/CSSGradientValue.cpp 2014-05-23 05:18:23 UTC (rev 169248)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSGradientValue::addStops(Gradient* gradient, const CSSToLengthConversionData& conversionData, float maxLengthForRepeat)
</del><ins>+void CSSGradientValue::addStops(Gradient* gradient, RenderView* renderView, const CSSToLengthConversionData& conversionData, float maxLengthForRepeat)
</ins><span class="cx"> {
</span><span class="cx"> if (m_gradientType == CSSDeprecatedLinearGradient || m_gradientType == CSSDeprecatedRadialGradient) {
</span><span class="cx"> sortStopsIfNeeded();
</span><span class="lines">@@ -171,18 +171,21 @@
</span><span class="cx"> stops[i].color = stop.m_resolvedColor;
</span><span class="cx">
</span><span class="cx"> if (stop.m_position) {
</span><del>- if (stop.m_position->isPercentage())
- stops[i].offset = stop.m_position->getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE) / 100;
- else if (stop.m_position->isLength() || stop.m_position->isCalculatedPercentageWithLength()) {
</del><ins>+ const CSSPrimitiveValue& positionValue = *stop.m_position;
+ if (positionValue.isPercentage())
+ stops[i].offset = positionValue.getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE) / 100;
+ else if (positionValue.isLength() || positionValue.isViewportPercentageLength() || positionValue.isCalculatedPercentageWithLength()) {
</ins><span class="cx"> if (!computedGradientLength) {
</span><span class="cx"> FloatSize gradientSize(gradientStart - gradientEnd);
</span><span class="cx"> gradientLength = gradientSize.diagonalLength();
</span><span class="cx"> }
</span><span class="cx"> float length;
</span><del>- if (stop.m_position->isLength())
- length = stop.m_position->computeLength<float>(conversionData);
</del><ins>+ if (positionValue.isLength())
+ length = positionValue.computeLength<float>(conversionData);
+ else if (positionValue.isViewportPercentageLength())
+ length = valueForLength(positionValue.viewportPercentageLength(), 0, renderView);
</ins><span class="cx"> else {
</span><del>- Ref<CalculationValue> calculationValue { stop.m_position->cssCalcValue()->createCalculationValue(conversionData) };
</del><ins>+ Ref<CalculationValue> calculationValue { positionValue.cssCalcValue()->createCalculationValue(conversionData) };
</ins><span class="cx"> length = calculationValue->evaluate(gradientLength);
</span><span class="cx"> }
</span><span class="cx"> stops[i].offset = (gradientLength > 0) ? length / gradientLength : 0;
</span><span class="lines">@@ -701,7 +704,7 @@
</span><span class="cx"> RefPtr<Gradient> gradient = Gradient::create(firstPoint, secondPoint);
</span><span class="cx">
</span><span class="cx"> // Now add the stops.
</span><del>- addStops(gradient.get(), conversionData, 1);
</del><ins>+ addStops(gradient.get(), &renderer->view(), conversionData, 1);
</ins><span class="cx">
</span><span class="cx"> return gradient.release();
</span><span class="cx"> }
</span><span class="lines">@@ -1115,7 +1118,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Now add the stops.
</span><del>- addStops(gradient.get(), conversionData, maxExtent);
</del><ins>+ addStops(gradient.get(), &renderer->view(), conversionData, maxExtent);
</ins><span class="cx">
</span><span class="cx"> return gradient.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGradientValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGradientValue.h (169247 => 169248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGradientValue.h 2014-05-23 04:34:32 UTC (rev 169247)
+++ trunk/Source/WebCore/css/CSSGradientValue.h 2014-05-23 05:18:23 UTC (rev 169248)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> class FloatPoint;
</span><span class="cx"> class Gradient;
</span><ins>+class RenderView;
</ins><span class="cx">
</span><span class="cx"> enum CSSGradientType {
</span><span class="cx"> CSSDeprecatedLinearGradient,
</span><span class="lines">@@ -109,7 +110,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void addStops(Gradient*, const CSSToLengthConversionData&, float maxLengthForRepeat = 0);
</del><ins>+ void addStops(Gradient*, RenderView*, const CSSToLengthConversionData&, float maxLengthForRepeat = 0);
</ins><span class="cx">
</span><span class="cx"> // Resolve points/radii to front end values.
</span><span class="cx"> FloatPoint computeEndPoint(CSSPrimitiveValue*, CSSPrimitiveValue*, const CSSToLengthConversionData&, const FloatSize&);
</span></span></pre>
</div>
</div>
</body>
</html>