<!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>[163552] 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/163552">163552</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-06 11:34:33 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Simplify BasicShapeInset creation
https://bugs.webkit.org/show_bug.cgi?id=128314
Reviewed by David Hyatt.
Introduce convertToLengthSize helper function in order to simplify and make BasicShapeInset more readable.
No new tests, no behavior change.
* css/BasicShapeFunctions.cpp:
(WebCore::convertToLengthSize):
(WebCore::basicShapeForValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssBasicShapeFunctionscpp">trunk/Source/WebCore/css/BasicShapeFunctions.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163551 => 163552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-06 19:26:52 UTC (rev 163551)
+++ trunk/Source/WebCore/ChangeLog 2014-02-06 19:34:33 UTC (rev 163552)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-06 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Simplify BasicShapeInset creation
+ https://bugs.webkit.org/show_bug.cgi?id=128314
+
+ Reviewed by David Hyatt.
+
+ Introduce convertToLengthSize helper function in order to simplify and make BasicShapeInset more readable.
+
+ No new tests, no behavior change.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::convertToLengthSize):
+ (WebCore::basicShapeForValue):
+
</ins><span class="cx"> 2014-02-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the Windows build.
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (163551 => 163552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-02-06 19:26:52 UTC (rev 163551)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-02-06 19:34:33 UTC (rev 163552)
</span><span class="lines">@@ -186,6 +186,15 @@
</span><span class="cx"> return value->convertToLength<FixedIntegerConversion | FixedFloatConversion | PercentConversion | CalculatedConversion | ViewportPercentageConversion>(style, rootStyle, style->effectiveZoom());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static LengthSize convertToLengthSize(const RenderStyle* style, const RenderStyle* rootStyle, CSSPrimitiveValue* value)
+{
+ if (!value)
+ return LengthSize(Length(0, Fixed), Length(0, Fixed));
+
+ Pair* pair = value->getPairValue();
+ return LengthSize(convertToLength(style, rootStyle, pair->first()), convertToLength(style, rootStyle, pair->second()));
+}
+
</ins><span class="cx"> static BasicShapeCenterCoordinate convertToCenterCoordinate(const RenderStyle* style, const RenderStyle* rootStyle, CSSPrimitiveValue* value)
</span><span class="cx"> {
</span><span class="cx"> BasicShapeCenterCoordinate::Direction direction;
</span><span class="lines">@@ -356,51 +365,16 @@
</span><span class="cx"> const CSSBasicShapeInset* rectValue = static_cast<const CSSBasicShapeInset* >(basicShapeValue);
</span><span class="cx"> RefPtr<BasicShapeInset> rect = BasicShapeInset::create();
</span><span class="cx">
</span><del>- if (rectValue->top())
- rect->setTop(convertToLength(style, rootStyle, rectValue->top()));
- else {
- rect->setTop(Length(0, Fixed));
- return rect;
- }
- if (rectValue->right())
- rect->setRight(convertToLength(style, rootStyle, rectValue->right()));
- else
- rect->setRight(Length(0, Fixed));
</del><ins>+ rect->setTop(convertToLength(style, rootStyle, rectValue->top()));
+ rect->setRight(convertToLength(style, rootStyle, rectValue->right()));
+ rect->setBottom(convertToLength(style, rootStyle, rectValue->bottom()));
+ rect->setLeft(convertToLength(style, rootStyle, rectValue->left()));
</ins><span class="cx">
</span><del>- if (rectValue->bottom())
- rect->setBottom(convertToLength(style, rootStyle, rectValue->bottom()));
- else
- rect->setBottom(Length(0, Fixed));
</del><ins>+ rect->setTopLeftRadius(convertToLengthSize(style, rootStyle, rectValue->topLeftRadius()));
+ rect->setTopRightRadius(convertToLengthSize(style, rootStyle, rectValue->topRightRadius()));
+ rect->setBottomRightRadius(convertToLengthSize(style, rootStyle, rectValue->bottomRightRadius()));
+ rect->setBottomLeftRadius(convertToLengthSize(style, rootStyle, rectValue->bottomLeftRadius()));
</ins><span class="cx">
</span><del>- if (rectValue->left())
- rect->setLeft(convertToLength(style, rootStyle, rectValue->left()));
- else
- rect->setLeft(Length(0, Fixed));
-
- if (rectValue->topLeftRadius()) {
- Pair* topLeftRadius = rectValue->topLeftRadius()->getPairValue();
- rect->setTopLeftRadius(LengthSize(convertToLength(style, rootStyle, topLeftRadius->first()), convertToLength(style, rootStyle, topLeftRadius->second())));
- } else
- rect->setTopLeftRadius(LengthSize(Length(0, Fixed), Length(0, Fixed)));
-
- if (rectValue->topRightRadius()) {
- Pair* topRightRadius = rectValue->topRightRadius()->getPairValue();
- rect->setTopRightRadius(LengthSize(convertToLength(style, rootStyle, topRightRadius->first()), convertToLength(style, rootStyle, topRightRadius->second())));
- } else
- rect->setTopRightRadius(LengthSize(Length(0, Fixed), Length(0, Fixed)));
-
- if (rectValue->bottomRightRadius()) {
- Pair* bottomRightRadius = rectValue->bottomRightRadius()->getPairValue();
- rect->setBottomRightRadius(LengthSize(convertToLength(style, rootStyle, bottomRightRadius->first()), convertToLength(style, rootStyle, bottomRightRadius->second())));
- } else
- rect->setBottomRightRadius(LengthSize(Length(0, Fixed), Length(0, Fixed)));
-
- if (rectValue->topLeftRadius()) {
- Pair* bottomLeftRadius = rectValue->bottomLeftRadius()->getPairValue();
- rect->setBottomLeftRadius(LengthSize(convertToLength(style, rootStyle, bottomLeftRadius->first()), convertToLength(style, rootStyle, bottomLeftRadius->second())));
- } else
- rect->setBottomLeftRadius(LengthSize(Length(0, Fixed), Length(0, Fixed)));
-
</del><span class="cx"> basicShape = rect.release();
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>