<!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>[166909] 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/166909">166909</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-07 21:47:05 -0700 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Simplify the parsing of width arguments for Inset shapes
https://bugs.webkit.org/show_bug.cgi?id=131305
Reviewed by Andreas Kling.
This code introduces some helper functions for setting the size arguments of inset shapes. This change
also modifies the code to be the same as in Blink, so it helps us to keep the shapes code similar.
No new tests, no behavior change.
* css/CSSBasicShapes.h:
(WebCore::CSSBasicShapeInset::updateShapeSize4Values):
(WebCore::CSSBasicShapeInset::updateShapeSize1Value):
(WebCore::CSSBasicShapeInset::updateShapeSize2Values):
(WebCore::CSSBasicShapeInset::updateShapeSize3Values):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseBasicShapeInset):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapesh">trunk/Source/WebCore/css/CSSBasicShapes.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166908 => 166909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-08 03:55:12 UTC (rev 166908)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 04:47:05 UTC (rev 166909)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-04-07 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Simplify the parsing of width arguments for Inset shapes
+ https://bugs.webkit.org/show_bug.cgi?id=131305
+
+ Reviewed by Andreas Kling.
+
+ This code introduces some helper functions for setting the size arguments of inset shapes. This change
+ also modifies the code to be the same as in Blink, so it helps us to keep the shapes code similar.
+
+ No new tests, no behavior change.
+
+ * css/CSSBasicShapes.h:
+ (WebCore::CSSBasicShapeInset::updateShapeSize4Values):
+ (WebCore::CSSBasicShapeInset::updateShapeSize1Value):
+ (WebCore::CSSBasicShapeInset::updateShapeSize2Values):
+ (WebCore::CSSBasicShapeInset::updateShapeSize3Values):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseBasicShapeInset):
+
</ins><span class="cx"> 2014-04-07 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> fast/css3-text/css3-text-decoration/text-decoration-thickness.html fails on GTK
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.h (166908 => 166909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.h 2014-04-08 03:55:12 UTC (rev 166908)
+++ trunk/Source/WebCore/css/CSSBasicShapes.h 2014-04-08 04:47:05 UTC (rev 166909)
</span><span class="lines">@@ -81,6 +81,29 @@
</span><span class="cx"> void setBottom(PassRefPtr<CSSPrimitiveValue> bottom) { m_bottom = bottom; }
</span><span class="cx"> void setLeft(PassRefPtr<CSSPrimitiveValue> left) { m_left = left; }
</span><span class="cx">
</span><ins>+ void updateShapeSize4Values(CSSPrimitiveValue* top, CSSPrimitiveValue* right, CSSPrimitiveValue* bottom, CSSPrimitiveValue* left)
+ {
+ setTop(top);
+ setRight(right);
+ setBottom(bottom);
+ setLeft(left);
+ }
+
+ void updateShapeSize1Value(CSSPrimitiveValue* value1)
+ {
+ updateShapeSize4Values(value1, value1, value1, value1);
+ }
+
+ void updateShapeSize2Values(CSSPrimitiveValue* value1, CSSPrimitiveValue* value2)
+ {
+ updateShapeSize4Values(value1, value2, value1, value2);
+ }
+
+ void updateShapeSize3Values(CSSPrimitiveValue* value1, CSSPrimitiveValue* value2, CSSPrimitiveValue* value3)
+ {
+ updateShapeSize4Values(value1, value2, value3, value2);
+ }
+
</ins><span class="cx"> void setTopLeftRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_topLeftRadius = radius; }
</span><span class="cx"> void setTopRightRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_topRightRadius = radius; }
</span><span class="cx"> void setBottomRightRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_bottomRightRadius = radius; }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (166908 => 166909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-04-08 03:55:12 UTC (rev 166908)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-04-08 04:47:05 UTC (rev 166909)
</span><span class="lines">@@ -5428,31 +5428,19 @@
</span><span class="cx">
</span><span class="cx"> switch (widthArguments.size()) {
</span><span class="cx"> case 1: {
</span><del>- shape->setTop(widthArguments[0]);
- shape->setRight(widthArguments[0]);
- shape->setBottom(widthArguments[0]);
- shape->setLeft(widthArguments[0]);
</del><ins>+ shape->updateShapeSize1Value(widthArguments[0].get());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case 2: {
</span><del>- shape->setTop(widthArguments[0]);
- shape->setRight(widthArguments[1]);
- shape->setBottom(widthArguments[0]);
- shape->setLeft(widthArguments[1]);
</del><ins>+ shape->updateShapeSize2Values(widthArguments[0].get(), widthArguments[1].get());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case 3: {
</span><del>- shape->setTop(widthArguments[0]);
- shape->setRight(widthArguments[1]);
- shape->setBottom(widthArguments[2]);
- shape->setLeft(widthArguments[1]);
</del><ins>+ shape->updateShapeSize3Values(widthArguments[0].get(), widthArguments[1].get(), widthArguments[2].get());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case 4: {
</span><del>- shape->setTop(widthArguments[0]);
- shape->setRight(widthArguments[1]);
- shape->setBottom(widthArguments[2]);
- shape->setLeft(widthArguments[3]);
</del><ins>+ shape->updateShapeSize4Values(widthArguments[0].get(), widthArguments[1].get(), widthArguments[2].get(), widthArguments[3].get());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span></span></pre>
</div>
</div>
</body>
</html>