<!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>[173421] 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/173421">173421</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-09-08 23:36:37 -0700 (Mon, 08 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Minor refactor in CSSComputedStyleDeclaration
https://bugs.webkit.org/show_bug.cgi?id=136664
Reviewed by Darin Adler.
The "if (length.isPercentNotCalculated()) createValue() else zoomAdjustedPixelValue()"
pattern occurred a number of times here, so factor into percentageOrZoomAdjustedValue().
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::positionOffsetValue): l -> length
(WebCore::percentageOrZoomAdjustedValue):
(WebCore::getBorderRadiusCornerValues):
(WebCore::getBorderRadiusCornerValue):
(WebCore::scrollSnapDestination):
(WebCore::scrollSnapPoints):
(WebCore::scrollSnapCoordinates):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173420 => 173421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-09 06:34:42 UTC (rev 173420)
+++ trunk/Source/WebCore/ChangeLog 2014-09-09 06:36:37 UTC (rev 173421)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-09-08 Simon Fraser <simon.fraser@apple.com>
+
+ Minor refactor in CSSComputedStyleDeclaration
+ https://bugs.webkit.org/show_bug.cgi?id=136664
+
+ Reviewed by Darin Adler.
+
+ The "if (length.isPercentNotCalculated()) createValue() else zoomAdjustedPixelValue()"
+ pattern occurred a number of times here, so factor into percentageOrZoomAdjustedValue().
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::positionOffsetValue): l -> length
+ (WebCore::percentageOrZoomAdjustedValue):
+ (WebCore::getBorderRadiusCornerValues):
+ (WebCore::getBorderRadiusCornerValue):
+ (WebCore::scrollSnapDestination):
+ (WebCore::scrollSnapPoints):
+ (WebCore::scrollSnapCoordinates):
+
</ins><span class="cx"> 2014-09-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Application Cache Storage: failed to execute statement "DELETE FROM CacheGroups" error "no such table: CacheGroups"
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (173420 => 173421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-09-09 06:34:42 UTC (rev 173420)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-09-09 06:36:37 UTC (rev 173421)
</span><span class="lines">@@ -674,36 +674,36 @@
</span><span class="cx"> if (!style)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Length l;
</del><ins>+ Length length;
</ins><span class="cx"> switch (propertyID) {
</span><span class="cx"> case CSSPropertyLeft:
</span><del>- l = style->left();
</del><ins>+ length = style->left();
</ins><span class="cx"> break;
</span><span class="cx"> case CSSPropertyRight:
</span><del>- l = style->right();
</del><ins>+ length = style->right();
</ins><span class="cx"> break;
</span><span class="cx"> case CSSPropertyTop:
</span><del>- l = style->top();
</del><ins>+ length = style->top();
</ins><span class="cx"> break;
</span><span class="cx"> case CSSPropertyBottom:
</span><del>- l = style->bottom();
</del><ins>+ length = style->bottom();
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (style->hasOutOfFlowPosition()) {
</span><del>- if (l.isFixed())
- return zoomAdjustedPixelValue(l.value(), style);
</del><ins>+ if (length.isFixed())
+ return zoomAdjustedPixelValue(length.value(), style);
</ins><span class="cx">
</span><del>- return cssValuePool().createValue(l);
</del><ins>+ return cssValuePool().createValue(length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (style->hasInFlowPosition()) {
</span><span class="cx"> // FIXME: It's not enough to simply return "auto" values for one offset if the other side is defined.
</span><span class="cx"> // In other words if left is auto and right is not auto, then left's computed value is negative right().
</span><span class="cx"> // So we should get the opposite length unit and see if it is auto.
</span><del>- return cssValuePool().createValue(l);
</del><ins>+ return cssValuePool().createValue(length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueAuto);
</span><span class="lines">@@ -717,27 +717,27 @@
</span><span class="cx"> return cssValuePool().createColorValue(color.rgb());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static PassRef<CSSPrimitiveValue> percentageOrZoomAdjustedValue(Length length, const RenderStyle* style)
+{
+ if (length.isPercentNotCalculated())
+ return cssValuePool().createValue(length.percent(), CSSPrimitiveValue::CSS_PERCENTAGE);
+
+ return zoomAdjustedPixelValue(valueForLength(length, 0), style);
+}
+
</ins><span class="cx"> static PassRef<CSSValueList> getBorderRadiusCornerValues(const LengthSize& radius, const RenderStyle* style)
</span><span class="cx"> {
</span><span class="cx"> auto list = CSSValueList::createSpaceSeparated();
</span><del>- if (radius.width().isPercentNotCalculated())
- list.get().append(cssValuePool().createValue(radius.width().percent(), CSSPrimitiveValue::CSS_PERCENTAGE));
- else
- list.get().append(zoomAdjustedPixelValue(valueForLength(radius.width(), 0), style));
- if (radius.height().isPercentNotCalculated())
- list.get().append(cssValuePool().createValue(radius.height().percent(), CSSPrimitiveValue::CSS_PERCENTAGE));
- else
- list.get().append(zoomAdjustedPixelValue(valueForLength(radius.height(), 0), style));
</del><ins>+ list.get().append(percentageOrZoomAdjustedValue(radius.width(), style));
+ list.get().append(percentageOrZoomAdjustedValue(radius.height(), style));
</ins><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRef<CSSValue> getBorderRadiusCornerValue(const LengthSize& radius, const RenderStyle* style)
</span><span class="cx"> {
</span><del>- if (radius.width() == radius.height()) {
- if (radius.width().isPercentNotCalculated())
- return cssValuePool().createValue(radius.width().percent(), CSSPrimitiveValue::CSS_PERCENTAGE);
- return zoomAdjustedPixelValue(valueForLength(radius.width(), 0), style);
- }
</del><ins>+ if (radius.width() == radius.height())
+ return percentageOrZoomAdjustedValue(radius.width(), style);
+
</ins><span class="cx"> return getBorderRadiusCornerValues(radius, style);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1095,34 +1095,20 @@
</span><span class="cx"> static PassRef<CSSValueList> scrollSnapDestination(RenderStyle* style, Length x, Length y)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValueList> snapDestinationValue = CSSValueList::createSpaceSeparated();
</span><del>- if (x.isPercentNotCalculated())
- snapDestinationValue->append(cssValuePool().createValue(x.percent(), CSSPrimitiveValue::CSS_PERCENTAGE));
- else
- snapDestinationValue->append(zoomAdjustedPixelValue(valueForLength(x, 0), style));
-
- if (y.isPercentNotCalculated())
- snapDestinationValue->append(cssValuePool().createValue(y.percent(), CSSPrimitiveValue::CSS_PERCENTAGE));
- else
- snapDestinationValue->append(zoomAdjustedPixelValue(valueForLength(y, 0), style));
-
</del><ins>+ snapDestinationValue->append(percentageOrZoomAdjustedValue(x, style));
+ snapDestinationValue->append(percentageOrZoomAdjustedValue(y, style));
</ins><span class="cx"> return snapDestinationValue.releaseNonNull();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRef<CSSValueList> scrollSnapPoints(RenderStyle* style, const Vector<Length>& points, Length repeatPoint, bool hasRepeat)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValueList> snapPointsValue = CSSValueList::createSpaceSeparated();
</span><del>- for (auto& point : points) {
- if (point.isPercentNotCalculated())
- snapPointsValue->append(cssValuePool().createValue(point.percent(), CSSPrimitiveValue::CSS_PERCENTAGE));
- else
- snapPointsValue->append(zoomAdjustedPixelValue(valueForLength(point, 0), style));
- }
- if (hasRepeat) {
- if (repeatPoint.isPercentNotCalculated())
- snapPointsValue->append(cssValuePool().createValue(LengthRepeat::create(cssValuePool().createValue(repeatPoint.percent(), CSSPrimitiveValue::CSS_PERCENTAGE))));
- else
- snapPointsValue->append(cssValuePool().createValue(LengthRepeat::create(zoomAdjustedPixelValue(valueForLength(repeatPoint, 0), style))));
- }
</del><ins>+ for (auto& point : points)
+ snapPointsValue->append(percentageOrZoomAdjustedValue(point, style));
+
+ if (hasRepeat)
+ snapPointsValue->append(cssValuePool().createValue(LengthRepeat::create(percentageOrZoomAdjustedValue(repeatPoint, style))));
+
</ins><span class="cx"> return snapPointsValue.releaseNonNull();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1131,18 +1117,9 @@
</span><span class="cx"> RefPtr<CSSValueList> snapCoordinatesValue = CSSValueList::createCommaSeparated();
</span><span class="cx"> for (const auto& coordinate : coordinates) {
</span><span class="cx"> RefPtr<CSSValueList> currentCoordinate = CSSValueList::createSpaceSeparated();
</span><del>- Length point = coordinate.first;
- if (point.isPercentNotCalculated())
- currentCoordinate->append(cssValuePool().createValue(point.percent(), CSSPrimitiveValue::CSS_PERCENTAGE));
- else
- currentCoordinate->append(zoomAdjustedPixelValue(valueForLength(point, 0), style));
</del><ins>+ currentCoordinate->append(percentageOrZoomAdjustedValue(coordinate.first, style));
+ currentCoordinate->append(percentageOrZoomAdjustedValue(coordinate.second, style));
</ins><span class="cx">
</span><del>- point = coordinate.second;
- if (point.isPercentNotCalculated())
- currentCoordinate->append(cssValuePool().createValue(point.percent(), CSSPrimitiveValue::CSS_PERCENTAGE));
- else
- currentCoordinate->append(zoomAdjustedPixelValue(valueForLength(point, 0), style));
-
</del><span class="cx"> snapCoordinatesValue->append(currentCoordinate.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx"> return snapCoordinatesValue.releaseNonNull();
</span></span></pre>
</div>
</div>
</body>
</html>