<!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>[160176] 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/160176">160176</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-05 08:48:06 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Fix inset when only a subset of the arguments are defined
https://bugs.webkit.org/show_bug.cgi?id=125277
Reviewed by David Hyatt.
Source/WebCore:
I thought Length's default value is fixed-0, but actually it's auto-0. For the optional arguments
of inset shape, we need to use fixed-0, so I updated the code and the tests to use that explicitly.
No new tests, I updated the old ones.
* css/BasicShapeFunctions.cpp:
(WebCore::basicShapeForValue):
LayoutTests:
* fast/shapes/shape-outside-floats/shape-outside-floats-inset.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsinsethtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-inset.html</a></li>
<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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160175 => 160176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-05 16:27:21 UTC (rev 160175)
+++ trunk/LayoutTests/ChangeLog 2013-12-05 16:48:06 UTC (rev 160176)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-05 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Fix inset when only a subset of the arguments are defined
+ https://bugs.webkit.org/show_bug.cgi?id=125277
+
+ Reviewed by David Hyatt.
+
+ * fast/shapes/shape-outside-floats/shape-outside-floats-inset.html:
+
</ins><span class="cx"> 2013-12-05 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsinsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-inset.html (160175 => 160176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-inset.html 2013-12-05 16:27:21 UTC (rev 160175)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-inset.html 2013-12-05 16:48:06 UTC (rev 160176)
</span><span class="lines">@@ -17,13 +17,13 @@
</span><span class="cx"> height: 40px;
</span><span class="cx"> }
</span><span class="cx"> .top {
</span><del>- -webkit-shape-outside: inset(20px 0 0 0);
</del><ins>+ -webkit-shape-outside: inset(20px);
</ins><span class="cx"> }
</span><span class="cx"> .right {
</span><del>- -webkit-shape-outside: inset(0 20px 0 0);
</del><ins>+ -webkit-shape-outside: inset(0 20px);
</ins><span class="cx"> }
</span><span class="cx"> .bottom {
</span><del>- -webkit-shape-outside: inset(0 0 20px 0);
</del><ins>+ -webkit-shape-outside: inset(0 0 20px);
</ins><span class="cx"> }
</span><span class="cx"> .left {
</span><span class="cx"> -webkit-shape-outside: inset(0 0 0 20px);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160175 => 160176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-05 16:27:21 UTC (rev 160175)
+++ trunk/Source/WebCore/ChangeLog 2013-12-05 16:48:06 UTC (rev 160176)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-05 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Fix inset when only a subset of the arguments are defined
+ https://bugs.webkit.org/show_bug.cgi?id=125277
+
+ Reviewed by David Hyatt.
+
+ I thought Length's default value is fixed-0, but actually it's auto-0. For the optional arguments
+ of inset shape, we need to use fixed-0, so I updated the code and the tests to use that explicitly.
+
+ No new tests, I updated the old ones.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::basicShapeForValue):
+
</ins><span class="cx"> 2013-12-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Do not use deprecated gtk-doc 'Rename to' tag
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (160175 => 160176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2013-12-05 16:27:21 UTC (rev 160175)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2013-12-05 16:48:06 UTC (rev 160176)
</span><span class="lines">@@ -404,16 +404,26 @@
</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->left())
</del><ins>+ if (rectValue->top())
</ins><span class="cx"> rect->setTop(convertToLength(style, rootStyle, rectValue->top()));
</span><del>- else
</del><ins>+ else {
+ rect->setTop(Length(0, Fixed));
</ins><span class="cx"> return rect;
</span><ins>+ }
</ins><span class="cx"> if (rectValue->right())
</span><span class="cx"> rect->setRight(convertToLength(style, rootStyle, rectValue->right()));
</span><ins>+ else
+ rect->setRight(Length(0, Fixed));
+
</ins><span class="cx"> if (rectValue->bottom())
</span><span class="cx"> rect->setBottom(convertToLength(style, rootStyle, rectValue->bottom()));
</span><ins>+ else
+ rect->setBottom(Length(0, Fixed));
+
</ins><span class="cx"> if (rectValue->left())
</span><span class="cx"> rect->setLeft(convertToLength(style, rootStyle, rectValue->left()));
</span><ins>+ else
+ rect->setLeft(Length(0, Fixed));
</ins><span class="cx">
</span><span class="cx"> if (rectValue->topLeftRadius()) {
</span><span class="cx"> Pair* topLeftRadius = rectValue->topLeftRadius()->getPairValue();
</span></span></pre>
</div>
</div>
</body>
</html>