<!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>[159822] 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/159822">159822</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2013-11-27 12:19:48 -0800 (Wed, 27 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Shape-Inside Should Default to 'auto'
https://bugs.webkit.org/show_bug.cgi?id=124851
Reviewed by Alexandru Chiculita.
Source/WebCore:
The current shape-inside specification has the property default to the 'auto'
value, not 'outside-shape'.
Updated tests are under fast/shapes.
* rendering/style/RenderStyle.cpp:
* rendering/style/RenderStyle.h:
LayoutTests:
Update tests to reflect a default shape-inside value of 'auto'.
* fast/shapes/css-shapes-disabled-expected.txt:
* fast/shapes/css-shapes-disabled.html:
* fast/shapes/parsing/parsing-shape-inside-expected.txt:
* fast/shapes/parsing/parsing-shape-inside.html:
* fast/shapes/parsing/parsing-shape-lengths-expected.txt:
* fast/shapes/parsing/parsing-shape-lengths.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshapescssshapesdisabledexpectedtxt">trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapescssshapesdisabledhtml">trunk/LayoutTests/fast/shapes/css-shapes-disabled.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeinsidehtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapelengthsexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapelengthshtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/ChangeLog 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-11-27 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Shape-Inside Should Default to 'auto'
+ https://bugs.webkit.org/show_bug.cgi?id=124851
+
+ Reviewed by Alexandru Chiculita.
+
+ Update tests to reflect a default shape-inside value of 'auto'.
+
+ * fast/shapes/css-shapes-disabled-expected.txt:
+ * fast/shapes/css-shapes-disabled.html:
+ * fast/shapes/parsing/parsing-shape-inside-expected.txt:
+ * fast/shapes/parsing/parsing-shape-inside.html:
+ * fast/shapes/parsing/parsing-shape-lengths-expected.txt:
+ * fast/shapes/parsing/parsing-shape-lengths.html:
+
</ins><span class="cx"> 2013-11-27 Hans Muller <hmuller@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] shape-inside rectangle layout can fail
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapescssshapesdisabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/css-shapes-disabled-expected.txt 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> PASS testInlineStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is null
</span><span class="cx"> PASS testComputedStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)") is "auto"
</span><span class="cx"> PASS testInlineStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is null
</span><del>-PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "outside-shape"
</del><ins>+PASS testComputedStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)") is "auto"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapescssshapesdisabledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/css-shapes-disabled.html (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/css-shapes-disabled.html 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/css-shapes-disabled.html 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> testStyle("-webkit-shape-padding", "10px", "0px");
</span><span class="cx">
</span><span class="cx"> testStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)", "auto");
</span><del>-testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "outside-shape");
</del><ins>+testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "auto");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -80,99 +80,99 @@
</span><span class="cx"> PASS removeBaseURL(getCSSText("-webkit-shape-inside", "url('image')")) is "url(image)"
</span><span class="cx"> PASS removeBaseURL(getComputedStyleValue("-webkit-shape-inside", "url('image')")) is "url(image)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "calc()") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "calc()") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "none") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "none") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "none") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "rectangle()") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle()") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "rectangle(10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px 20px 30px 40px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset-rectangle()") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle()") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px 20px 30px 40px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 50px, 60px, 70px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px 20px 30px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px 30px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px, 40px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px 20px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px 20px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px 10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px 10px at center)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px at center center 10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at center center 10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at center center 10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px 10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px 10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px at center)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(at center center 10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse()") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse()") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px, 20px, 30px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px 40px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon()") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon()") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd 10px 20px, 30px 40px, 40px 50px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero 10px 20px, 30px 40px, 40px 50px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(nonzero)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(evenodd)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(nonzero,10px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero,10px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(evenodd,12px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd,12px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px, 20px, 30px, 40px, 40px, 50px)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "content-box content-box") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "content-box content-box") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0 0, 10px 10px, 10px 0) polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0 0, 10px 10px, 10px 0) content-box") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "auto content-box") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "auto content-box") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "auto content-box") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "url('shape.svg') content-box") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') content-box") is "auto"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "auto"
</ins><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "auto", "rectangle(10px, 20px, 30px, 40px)") is "parent: auto, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
</span><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "outside-shape", "rectangle(10px, 20px, 30px, 40px)") is "parent: outside-shape, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
</span><del>-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"
-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"
</del><ins>+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"
+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"
</ins><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "inherit") is "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"
</span><del>-PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: outside-shape, child: outside-shape"
</del><ins>+PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "", "inherit") is "parent: auto, child: auto"
</ins><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-inside", "auto", "inherit") is "parent: auto, child: auto"
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside.html 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> testLocalURLShapeProperty("-webkit-shape-inside", "url(\'image\')", "url(image)");
</span><span class="cx">
</span><span class="cx"> invalidShapeValues.forEach(function(value, i, a) {
</span><del>- testShapePropertyParsingFailure("-webkit-shape-inside", value, "outside-shape")
</del><ins>+ testShapePropertyParsingFailure("-webkit-shape-inside", value, "auto")
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> applyToEachArglist(
</span><span class="lines">@@ -29,10 +29,10 @@
</span><span class="cx"> [// [property, parentValue, childValue, expectedValue]
</span><span class="cx"> ["-webkit-shape-inside", "auto", "rectangle(10px, 20px, 30px, 40px)", "parent: auto, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
</span><span class="cx"> ["-webkit-shape-inside", "outside-shape", "rectangle(10px, 20px, 30px, 40px)", "parent: outside-shape, child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
</span><del>- ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"],
- ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: outside-shape"],
</del><ins>+ ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "initial", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"],
+ ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: auto"],
</ins><span class="cx"> ["-webkit-shape-inside", "rectangle(10px, 20px, 30px, 40px)", "inherit", "parent: rectangle(10px, 20px, 30px, 40px, 0px, 0px), child: rectangle(10px, 20px, 30px, 40px, 0px, 0px)"],
</span><del>- ["-webkit-shape-inside", "", "inherit", "parent: outside-shape, child: outside-shape"],
</del><ins>+ ["-webkit-shape-inside", "", "inherit", "parent: auto, child: auto"],
</ins><span class="cx"> ["-webkit-shape-inside", "auto", "inherit", "parent: auto, child: auto"]]
</span><span class="cx"> );
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapelengthsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -33,39 +33,39 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(100%, 100%, 100%, 100%)") is "ellipse(100%, 100%, 100%, 100%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, px)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(1px, 1px, calc())") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "outside-shape"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapelengthshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> function testInvalidValue(property, value) {
</span><span class="cx"> testStyleValue(value, null);
</span><del>- testComputedStyleValue(value, 'outside-shape');
</del><ins>+ testComputedStyleValue(value, 'auto');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // absolute lengths - number serialization, units
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/Source/WebCore/ChangeLog 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-11-27 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Shape-Inside Should Default to 'auto'
+ https://bugs.webkit.org/show_bug.cgi?id=124851
+
+ Reviewed by Alexandru Chiculita.
+
+ The current shape-inside specification has the property default to the 'auto'
+ value, not 'outside-shape'.
+
+ Updated tests are under fast/shapes.
+
+ * rendering/style/RenderStyle.cpp:
+ * rendering/style/RenderStyle.h:
+
</ins><span class="cx"> 2013-11-27 Hans Muller <hmuller@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] shape-inside rectangle layout can fail
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -1854,14 +1854,6 @@
</span><span class="cx"> surround.access()->border.m_image.setOutset(outset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
-ShapeValue* RenderStyle::initialShapeInside()
-{
- static ShapeValue* outsideValue = ShapeValue::createOutsideValue().leakRef();
- return outsideValue;
-}
-#endif
-
</del><span class="cx"> void RenderStyle::setColumnStylesFromPaginationMode(const Pagination::Mode& paginationMode)
</span><span class="cx"> {
</span><span class="cx"> if (paginationMode == Pagination::Unpaginated)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (159821 => 159822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-11-27 20:17:06 UTC (rev 159821)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-11-27 20:19:48 UTC (rev 159822)
</span><span class="lines">@@ -1532,7 +1532,7 @@
</span><span class="cx"> }
</span><span class="cx"> ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); }
</span><span class="cx">
</span><del>- static ShapeValue* initialShapeInside();
</del><ins>+ static ShapeValue* initialShapeInside() { return 0; }
</ins><span class="cx"> static ShapeValue* initialShapeOutside() { return 0; }
</span><span class="cx">
</span><span class="cx"> const Length& shapePadding() const { return rareNonInheritedData->m_shapePadding; }
</span></span></pre>
</div>
</div>
</body>
</html>