<!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>[208062] trunk/Source/WebCore</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/208062">208062</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-10-28 12:40:44 -0700 (Fri, 28 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Clean up gradient parsing
https://bugs.webkit.org/show_bug.cgi?id=164139
Reviewed by Dean Jackson.
* css/CSSGradientValue.cpp:
(WebCore::positionFromValue):
(WebCore::CSSGradientValue::computeEndPoint):
* css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradient):
(WebCore::CSSPropertyParserHelpers::consumeGradientColorStops):
(WebCore::CSSPropertyParserHelpers::consumeDeprecatedRadialGradient):
(WebCore::CSSPropertyParserHelpers::consumeRadialGradient):
(WebCore::CSSPropertyParserHelpers::consumeLinearGradient):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorecssparserCSSPropertyParserHelperscpp">trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208061 => 208062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-28 18:58:23 UTC (rev 208061)
+++ trunk/Source/WebCore/ChangeLog 2016-10-28 19:40:44 UTC (rev 208062)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-28 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Clean up gradient parsing
+ https://bugs.webkit.org/show_bug.cgi?id=164139
+
+ Reviewed by Dean Jackson.
+
+ * css/CSSGradientValue.cpp:
+ (WebCore::positionFromValue):
+ (WebCore::CSSGradientValue::computeEndPoint):
+ * css/parser/CSSPropertyParserHelpers.cpp:
+ (WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradient):
+ (WebCore::CSSPropertyParserHelpers::consumeGradientColorStops):
+ (WebCore::CSSPropertyParserHelpers::consumeDeprecatedRadialGradient):
+ (WebCore::CSSPropertyParserHelpers::consumeRadialGradient):
+ (WebCore::CSSPropertyParserHelpers::consumeLinearGradient):
+
</ins><span class="cx"> 2016-10-28 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> New CSS Parser should use Colors not RGBA32s
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGradientValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGradientValue.cpp (208061 => 208062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGradientValue.cpp 2016-10-28 18:58:23 UTC (rev 208061)
+++ trunk/Source/WebCore/css/CSSGradientValue.cpp 2016-10-28 19:40:44 UTC (rev 208062)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "GradientImage.h"
</span><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "NodeRenderStyle.h"
</span><ins>+#include "Pair.h"
</ins><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="lines">@@ -494,21 +495,37 @@
</span><span class="cx"> gradient.setStopsSorted(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static float positionFromValue(CSSPrimitiveValue& value, const CSSToLengthConversionData& conversionData, const FloatSize& size, bool isHorizontal)
</del><ins>+static float positionFromValue(const CSSPrimitiveValue* value, const CSSToLengthConversionData& conversionData, const FloatSize& size, bool isHorizontal)
</ins><span class="cx"> {
</span><del>- if (value.isNumber())
- return value.floatValue() * conversionData.zoom();
-
</del><ins>+ int origin = 0;
+ int sign = 1;
</ins><span class="cx"> int edgeDistance = isHorizontal ? size.width() : size.height();
</span><del>- if (value.isPercentage())
- return value.floatValue() / 100.f * edgeDistance;
</del><ins>+
+ // In this case the center of the gradient is given relative to an edge in the
+ // form of: [ top | bottom | right | left ] [ <percentage> | <length> ].
+ if (value->isPair()) {
+ CSSValueID originID = value->pairValue()->first()->valueID();
+ value = value->pairValue()->second();
+
+ if (originID == CSSValueRight || originID == CSSValueBottom) {
+ // For right/bottom, the offset is relative to the far edge.
+ origin = edgeDistance;
+ sign = -1;
+ }
+ }
+
+ if (value->isNumber())
+ return origin + sign * value->floatValue() * conversionData.zoom();
+
+ if (value->isPercentage())
+ return origin + sign * value->floatValue() / 100.f * edgeDistance;
</ins><span class="cx">
</span><del>- if (value.isCalculatedPercentageWithLength()) {
- Ref<CalculationValue> calculationValue { value.cssCalcValue()->createCalculationValue(conversionData) };
- return calculationValue->evaluate(edgeDistance);
</del><ins>+ if (value->isCalculatedPercentageWithLength()) {
+ Ref<CalculationValue> calculationValue { value->cssCalcValue()->createCalculationValue(conversionData) };
+ return origin + sign * calculationValue->evaluate(edgeDistance);
</ins><span class="cx"> }
</span><del>-
- switch (value.valueID()) {
</del><ins>+
+ switch (value->valueID()) {
</ins><span class="cx"> case CSSValueTop:
</span><span class="cx"> ASSERT(!isHorizontal);
</span><span class="cx"> return 0;
</span><span class="lines">@@ -521,11 +538,13 @@
</span><span class="cx"> case CSSValueRight:
</span><span class="cx"> ASSERT(isHorizontal);
</span><span class="cx"> return size.width();
</span><ins>+ case CSSValueCenter:
+ return origin + sign * .5f * edgeDistance;
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return value.computeLength<float>(conversionData);
</del><ins>+ return origin + sign * value->computeLength<float>(conversionData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint CSSGradientValue::computeEndPoint(CSSPrimitiveValue* horizontal, CSSPrimitiveValue* vertical, const CSSToLengthConversionData& conversionData, const FloatSize& size)
</span><span class="lines">@@ -533,10 +552,10 @@
</span><span class="cx"> FloatPoint result;
</span><span class="cx">
</span><span class="cx"> if (horizontal)
</span><del>- result.setX(positionFromValue(*horizontal, conversionData, size, true));
</del><ins>+ result.setX(positionFromValue(horizontal, conversionData, size, true));
</ins><span class="cx">
</span><span class="cx"> if (vertical)
</span><del>- result.setY(positionFromValue(*vertical, conversionData, size, false));
</del><ins>+ result.setY(positionFromValue(vertical, conversionData, size, false));
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParserHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (208061 => 208062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-10-28 18:58:23 UTC (rev 208061)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-10-28 19:40:44 UTC (rev 208062)
</span><span class="lines">@@ -753,11 +753,11 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> point = consumeDeprecatedGradientPoint(args, true);
</span><span class="cx"> if (!point)
</span><span class="cx"> return nullptr;
</span><del>- result->setFirstX(WTFMove(point));
</del><ins>+ result->setFirstX(point.copyRef());
</ins><span class="cx"> point = consumeDeprecatedGradientPoint(args, false);
</span><span class="cx"> if (!point)
</span><span class="cx"> return nullptr;
</span><del>- result->setFirstY(WTFMove(point));
</del><ins>+ result->setFirstY(point.copyRef());
</ins><span class="cx">
</span><span class="cx"> if (!consumeCommaIncludingWhitespace(args))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -767,17 +767,17 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> radius = consumeNumber(args, ValueRangeAll);
</span><span class="cx"> if (!radius || !consumeCommaIncludingWhitespace(args))
</span><span class="cx"> return nullptr;
</span><del>- downcast<CSSRadialGradientValue>(result.get())->setFirstRadius(WTFMove(radius));
</del><ins>+ downcast<CSSRadialGradientValue>(result.get())->setFirstRadius(radius.copyRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> point = consumeDeprecatedGradientPoint(args, true);
</span><span class="cx"> if (!point)
</span><span class="cx"> return nullptr;
</span><del>- result->setSecondX(WTFMove(point));
</del><ins>+ result->setSecondX(point.copyRef());
</ins><span class="cx"> point = consumeDeprecatedGradientPoint(args, false);
</span><span class="cx"> if (!point)
</span><span class="cx"> return nullptr;
</span><del>- result->setSecondY(WTFMove(point));
</del><ins>+ result->setSecondY(point.copyRef());
</ins><span class="cx">
</span><span class="cx"> // For radial gradients only, we now expect the second radius.
</span><span class="cx"> if (isDeprecatedRadialGradient) {
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> radius = consumeNumber(args, ValueRangeAll);
</span><span class="cx"> if (!radius)
</span><span class="cx"> return nullptr;
</span><del>- downcast<CSSRadialGradientValue>(result.get())->setSecondRadius(WTFMove(radius));
</del><ins>+ downcast<CSSRadialGradientValue>(result.get())->setSecondRadius(radius.copyRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSGradientColorStop stop;
</span><span class="lines">@@ -811,7 +811,12 @@
</span><span class="cx"> // Two hints in a row are not allowed.
</span><span class="cx"> if (!stop.m_color && (!supportsColorHints || previousStopWasColorHint))
</span><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> previousStopWasColorHint = !stop.m_color;
</span><ins>+
+ // FIXME-NEWPARSER: This boolean could be removed. Null checking color would be sufficient.
+ stop.isMidpoint = !stop.m_color;
+
</ins><span class="cx"> stop.m_position = consumeLengthOrPercent(range, cssParserMode, ValueRangeAll);
</span><span class="cx"> if (!stop.m_color && !stop.m_position)
</span><span class="cx"> return false;
</span><span class="lines">@@ -835,17 +840,17 @@
</span><span class="cx"> if ((centerX || centerY) && !consumeCommaIncludingWhitespace(args))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- result->setFirstX(WTFMove(centerX));
- result->setFirstY(WTFMove(centerY));
- result->setSecondX(WTFMove(centerX));
- result->setSecondY(WTFMove(centerY));
</del><ins>+ result->setFirstX(centerX.copyRef());
+ result->setFirstY(centerY.copyRef());
+ result->setSecondX(centerX.copyRef());
+ result->setSecondY(centerY.copyRef());
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> shape = consumeIdent<CSSValueCircle, CSSValueEllipse>(args);
</span><span class="cx"> RefPtr<CSSPrimitiveValue> sizeKeyword = consumeIdent<CSSValueClosestSide, CSSValueClosestCorner, CSSValueFarthestSide, CSSValueFarthestCorner, CSSValueContain, CSSValueCover>(args);
</span><span class="cx"> if (!shape)
</span><span class="cx"> shape = consumeIdent<CSSValueCircle, CSSValueEllipse>(args);
</span><del>- result->setShape(WTFMove(shape));
- result->setSizingBehavior(WTFMove(sizeKeyword));
</del><ins>+ result->setShape(shape.copyRef());
+ result->setSizingBehavior(sizeKeyword.copyRef());
</ins><span class="cx">
</span><span class="cx"> // Or, two lengths or percentages
</span><span class="cx"> if (!shape && !sizeKeyword) {
</span><span class="lines">@@ -856,8 +861,8 @@
</span><span class="cx"> if (!verticalSize)
</span><span class="cx"> return nullptr;
</span><span class="cx"> consumeCommaIncludingWhitespace(args);
</span><del>- result->setEndHorizontalSize(WTFMove(horizontalSize));
- result->setEndVerticalSize(WTFMove(verticalSize));
</del><ins>+ result->setEndHorizontalSize(horizontalSize.copyRef());
+ result->setEndVerticalSize(verticalSize.copyRef());
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> consumeCommaIncludingWhitespace(args);
</span><span class="lines">@@ -926,10 +931,10 @@
</span><span class="cx"> || (verticalSize && verticalSize->isCalculatedPercentageWithLength()))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- result->setShape(WTFMove(shape));
- result->setSizingBehavior(WTFMove(sizeKeyword));
- result->setEndHorizontalSize(WTFMove(horizontalSize));
- result->setEndVerticalSize(WTFMove(verticalSize));
</del><ins>+ result->setShape(shape.copyRef());
+ result->setSizingBehavior(sizeKeyword.copyRef());
+ result->setEndHorizontalSize(horizontalSize.copyRef());
+ result->setEndVerticalSize(verticalSize.copyRef());
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> centerX;
</span><span class="cx"> RefPtr<CSSPrimitiveValue> centerY;
</span><span class="lines">@@ -939,12 +944,12 @@
</span><span class="cx"> if (!(centerX && centerY))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- result->setFirstX(WTFMove(centerX));
- result->setFirstY(WTFMove(centerY));
</del><ins>+ result->setFirstX(centerX.copyRef());
+ result->setFirstY(centerY.copyRef());
</ins><span class="cx">
</span><span class="cx"> // Right now, CSS radial gradients have the same start and end centers.
</span><del>- result->setSecondX(WTFMove(centerX));
- result->setSecondY(WTFMove(centerY));
</del><ins>+ result->setSecondX(centerX.copyRef());
+ result->setSecondY(centerY.copyRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((shape || sizeKeyword || horizontalSize || centerX || centerY) && !consumeCommaIncludingWhitespace(args))
</span><span class="lines">@@ -974,8 +979,8 @@
</span><span class="cx"> endX = consumeIdent<CSSValueLeft, CSSValueRight>(args);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result->setFirstX(WTFMove(endX));
- result->setFirstY(WTFMove(endY));
</del><ins>+ result->setFirstX(endX.copyRef());
+ result->setFirstY(endY.copyRef());
</ins><span class="cx"> } else {
</span><span class="cx"> expectComma = false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>