<!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>[159792] 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/159792">159792</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2013-11-26 15:05:28 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Layout using [<box> || <shape>] value
https://bugs.webkit.org/show_bug.cgi?id=124428
Reviewed by David Hyatt.
Source/WebCore:
When a box value is supplied, use it to size and position the shape. Otherwise,
use a default value (content-box for shape-inside, margin-box for shape-outside).
This patch extends the sizing and positioning code used for the box patch (Bug 124227)
to also apply to shapes. With this patch, we also no longer use the box-sizing
property to size and position shapes.
Tests: fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001.html
fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002.html
fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue): Adjust for ShapeValues storing
BasicShape::ReferenceBox as their box value, rather than a CSSValueID.
* css/DeprecatedStyleBuilder.cpp:
(WebCore::ApplyPropertyShape::applyValue): Ditto.
* rendering/shapes/ShapeInfo.h:
(WebCore::ShapeInfo::setShapeSize): Adjust for BasicShapes with reference boxes
as well as plain box values. Also, remove old box-sizing code.
(WebCore::ShapeInfo::logicalTopOffset): Ditto.
(WebCore::ShapeInfo::logicalLeftOffset): Ditto.
* rendering/shapes/ShapeInsideInfo.h:
* rendering/shapes/ShapeOutsideInfo.h:
* rendering/style/ShapeValue.h:
(WebCore::ShapeValue::createBoxValue): Adjust for boxes being stored as
BasicShape::ReferenceBoxes.
(WebCore::ShapeValue::box): Ditto.
(WebCore::ShapeValue::ShapeValue): Ditto.
LayoutTests:
Adding tests to make sure that shapes properly size and position themselves across box values
and writing modes. Some shape-outside tests needed to be updated to explicitly size themselves
to content-box, as they were relying on that being the default value. Some shape-inside tests
needed to be adjusted as box-sizing no longer affects the shape size and position.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html:
Explicitly size to content-box.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html: Ditto.
* csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html: Ditto.
* fast/shapes/shape-inside/shape-inside-box-sizing-expected.html: Small test cleanup.
* fast/shapes/shape-inside/shape-inside-box-sizing.html: Modify shapes to provide their sizing box.
* fast/shapes/shape-inside/shape-inside-empty-expected.html: Small test cleanup.
* fast/shapes/shape-inside/shape-inside-empty.html: Modify shapes to provide their sizing box.
* fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html: Ditto.
* fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003.html: Added.
* inspector-protocol/model/highlight-shape-outside.html: Modify shapes to provide their sizing box.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatscircle001html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin001html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin002html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin003html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin004html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin010html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin011html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin012html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin014html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin015html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin016html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin017html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin018html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin021html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspadding001html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspadding002html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspadding003html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspadding004html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon000html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon001html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon002html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html</a></li>
<li><a href="#trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatssquareborder000html">trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideboxsizingexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideboxsizinghtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideemptyexpectedhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideemptyhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsdifferentwritingmodeshtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolmodelhighlightshapeoutsidehtml">trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleShapeValueh">trunk/Source/WebCore/rendering/style/ShapeValue.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes001expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes001html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes002expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes002html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes003expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes003html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/ChangeLog 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2013-11-26 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Layout using [<box> || <shape>] value
+ https://bugs.webkit.org/show_bug.cgi?id=124428
+
+ Reviewed by David Hyatt.
+
+ Adding tests to make sure that shapes properly size and position themselves across box values
+ and writing modes. Some shape-outside tests needed to be updated to explicitly size themselves
+ to content-box, as they were relying on that being the default value. Some shape-inside tests
+ needed to be adjusted as box-sizing no longer affects the shape size and position.
+
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html:
+ Explicitly size to content-box.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html: Ditto.
+ * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html: Ditto.
+ * fast/shapes/shape-inside/shape-inside-box-sizing-expected.html: Small test cleanup.
+ * fast/shapes/shape-inside/shape-inside-box-sizing.html: Modify shapes to provide their sizing box.
+ * fast/shapes/shape-inside/shape-inside-empty-expected.html: Small test cleanup.
+ * fast/shapes/shape-inside/shape-inside-empty.html: Modify shapes to provide their sizing box.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html: Ditto.
+ * fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003.html: Added.
+ * inspector-protocol/model/highlight-shape-outside.html: Modify shapes to provide their sizing box.
+
</ins><span class="cx"> 2013-11-26 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in JSC::ASTBuilder::Expression JSC::Parser<JSC::Lexer<unsigned char> >::parseUnaryExpression<JSC::ASTBuilder>(JSC::ASTBuilder&)
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatscircle001html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-circle-001.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> width: 80px;
</span><span class="cx"> height: 40px;
</span><span class="cx"> background-color: green;
</span><del>- -webkit-shape-outside: circle(50%, 50%, 50%); /* cx,cy,radius */
</del><ins>+ -webkit-shape-outside: circle(50%, 50%, 50%) content-box; /* cx,cy,radius */
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin001html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-001.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 50%, 100%) content-box;
</ins><span class="cx"> margin-top: 20px;
</span><span class="cx"> background-color: green;
</span><span class="cx"> }
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 50%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 50%, 100%) content-box;
</ins><span class="cx"> margin-top: 20px;
</span><span class="cx"> background-color: green;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin002html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-002.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-bottom: 20px;
</span><span class="cx"> background-color: green;
</span><span class="cx"> }
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-bottom: 20px;
</span><span class="cx"> background-color: green;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin003html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-003.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-top: 20px;
</span><span class="cx"> margin-bottom: 20px;
</span><span class="cx"> background-color: green;
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-top: 20px;
</span><span class="cx"> margin-bottom: 20px;
</span><span class="cx"> background-color: green;
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin004html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-004.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-right: 20px;
</span><span class="cx"> background-color: green;
</span><span class="cx"> }
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-right: 20px;
</span><span class="cx"> background-color: green;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin010html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-010.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 20%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 20%, 100%) content-box;
</ins><span class="cx"> margin-left: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(80%, 0, 20%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(80%, 0, 20%, 100%) content-box;
</ins><span class="cx"> margin-right: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin011html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-011.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 20%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 20%, 100%) content-box;
</ins><span class="cx"> margin-right: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(80%, 0, 20%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(80%, 0, 20%, 100%) content-box;
</ins><span class="cx"> margin-left: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin012html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-012.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 40px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-top: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 40px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-top: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin014html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-014.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 20%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 20%) content-box;
</ins><span class="cx"> margin-top: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 80%, 100%, 20%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 80%, 100%, 20%) content-box;
</ins><span class="cx"> margin-bottom: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin015html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-015.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 20%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 20%) content-box;
</ins><span class="cx"> margin-bottom: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 80%, 100%, 20%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 80%, 100%, 20%) content-box;
</ins><span class="cx"> margin-top: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin016html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-016.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 20%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 20%) content-box;
</ins><span class="cx"> margin-top: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 80%, 100%, 20%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 80%, 100%, 20%) content-box;
</ins><span class="cx"> margin-bottom: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin017html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-017.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 20%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 20%) content-box;
</ins><span class="cx"> margin-bottom: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 80%, 100%, 20%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 80%, 100%, 20%) content-box;
</ins><span class="cx"> margin-top: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin018html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-018.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 40px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-left: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 40px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-left: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatsmargin021html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-021.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 40px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-right: -20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 40px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> margin-right: -20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspadding001html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-001.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> padding-top: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> padding-top: 20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspadding002html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-002.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> padding-bottom: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> padding-bottom: 20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspadding003html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-003.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> padding-top: 20px;
</span><span class="cx"> padding-bottom: 20px;
</span><span class="cx"> }
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> padding-top: 20px;
</span><span class="cx"> padding-bottom: 20px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspadding004html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-padding-004.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> float: left;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> padding-right: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> float: right;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: rectangle(0, 0, 100%, 100%);
</del><ins>+ -webkit-shape-outside: rectangle(0, 0, 100%, 100%) content-box;
</ins><span class="cx"> padding-right: 20px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon000html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-000.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> margin-left: 100px;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 200px;
</span><del>- -webkit-shape-outside: polygon(100px 0px, -100px 200px, 100px 200px);
</del><ins>+ -webkit-shape-outside: polygon(100px 0px, -100px 200px, 100px 200px) content-box;
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon001html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-001.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> margin-top: 100px;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: polygon(0px 100px, 200px -100px, 200px 100px);
</del><ins>+ -webkit-shape-outside: polygon(0px 100px, 200px -100px, 200px 100px) content-box;
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatspolygon002html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-polygon-002.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> margin-top: 100px;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 100px;
</span><del>- -webkit-shape-outside: polygon(0px 100px, 0px -100px, 200px 100px);
</del><ins>+ -webkit-shape-outside: polygon(0px 100px, 0px -100px, 200px 100px) content-box;
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestscsswgcontributorsadobesubmittedshapesshapeoutsideshapeoutsidefloatssquareborder000html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> border-width: 15px;
</span><span class="cx"> border-style: solid;
</span><span class="cx"> border-color: green red red green;
</span><del>- -webkit-shape-outside: rectangle(0px, 0px, 35px, 35px);
</del><ins>+ -webkit-shape-outside: rectangle(0px, 0px, 35px, 35px) content-box;
</ins><span class="cx"> background-color: green;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> border-width: 15px;
</span><span class="cx"> border-style: solid;
</span><span class="cx"> border-color: green green red red;
</span><del>- -webkit-shape-outside: rectangle(35px, 0px, 35px, 35px);
</del><ins>+ -webkit-shape-outside: rectangle(35px, 0px, 35px, 35px) content-box;
</ins><span class="cx"> background-color: green;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideboxsizingexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing-expected.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing-expected.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing-expected.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>- <p>These tests check that shape inside correctly offsets from the correct box-sizing box. They require the Ahem font.</p>
</del><ins>+ <p>These tests check that shape inside offsets from the correct box. They require the Ahem font.</p>
</ins><span class="cx"> <p>The following tests check writing modes on a box with a 5 10 15 20px blue border, and 5 10 15 20px shape offsets.</p>
</span><span class="cx"> <div class='border shape-inside horizontal-tb'>
</span><span class="cx"> xxx xxx xxx xxx
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideboxsizinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-box-sizing.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -32,10 +32,10 @@
</span><span class="cx"> color: green;
</span><span class="cx"> }
</span><span class="cx"> .border-box.shape-inside {
</span><del>- -webkit-shape-inside: rectangle(10px, 20px, 30px, 40px);
</del><ins>+ -webkit-shape-inside: rectangle(10px, 20px, 30px, 40px) border-box;
</ins><span class="cx"> }
</span><span class="cx"> .border-box.border.padding.shape-inside {
</span><del>- -webkit-shape-inside: rectangle(15px, 30px, 30px, 40px);
</del><ins>+ -webkit-shape-inside: rectangle(15px, 30px, 30px, 40px) border-box;
</ins><span class="cx"> }
</span><span class="cx"> .vertical-lr {
</span><span class="cx"> -webkit-writing-mode: vertical-lr;
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>- <p>These tests check that shape inside correctly offsets from the correct box-sizing box. They require the Ahem font.</p>
</del><ins>+ <p>These tests check that shape inside offsets from the correct box. They require the Ahem font.</p>
</ins><span class="cx"> <p>The following tests check writing modes on a box with a 5 10 15 20px blue border, and 5 10 15 20px shape offsets.</p>
</span><span class="cx"> <div class='border shape-inside horizontal-tb'>
</span><span class="cx"> xxx xxx xxx xxx
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideemptyexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty-expected.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty-expected.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty-expected.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -4,13 +4,12 @@
</span><span class="cx"> <style>
</span><span class="cx"> #rectangles div {
</span><span class="cx"> width: 800px;
</span><del>- height: 40px;
</del><ins>+ height: 0px;
</ins><span class="cx"> line-height: 20px;
</span><span class="cx"> margin-top: 50px;
</span><del>- border: solid green;
- box-sizing: border-box;
</del><ins>+ border-top: 40px solid green;
</ins><span class="cx"> }
</span><del>- #rectangles p { margin-top: 34px; }
</del><ins>+ #rectangles p { margin-top: 0; }
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -25,7 +24,7 @@
</span><span class="cx"> <p>This text should be pushed down below the green rectangle. (There is a circle(0px, 0px, 0px) shape-inside CSS property on the green rectangle.)</p>
</span><span class="cx"> </div>
</span><span class="cx"> <div>
</span><del>- <p>This text should be pushed down below the green rectangle. (There is an ellipseX0(0px, 0px, 0px, 1em) shape-inside CSS property on the green rectangle.)</p>
</del><ins>+ <p>This text should be pushed down below the green rectangle. (There is an ellipse(0px, 0px, 0px, 1em) shape-inside CSS property on the green rectangle.)</p>
</ins><span class="cx"> </div>
</span><span class="cx"> <div>
</span><span class="cx"> <p>This text should be pushed down below the green rectangle. (There is an ellipse(0px, 0px, 1em, 0px) shape-inside CSS property on the green rectangle.)</p>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideemptyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-empty.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx"> height: 40px;
</span><span class="cx"> line-height: 20px;
</span><span class="cx"> margin-top: 50px;
</span><del>- border: solid green;
- box-sizing: border-box;
</del><ins>+ background-color: green;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #shape-inside-rectangle-width0 {
</span><span class="lines">@@ -52,7 +51,7 @@
</span><span class="cx"> This text should be pushed down below the green rectangle. (There is a circle(0px, 0px, 0px) shape-inside CSS property on the green rectangle.)
</span><span class="cx"> </p>
</span><span class="cx"> <p id="shape-inside-ellipse-radiusX0">
</span><del>- This text should be pushed down below the green rectangle. (There is an ellipseX0(0px, 0px, 0px, 1em) shape-inside CSS property on the green rectangle.)
</del><ins>+ This text should be pushed down below the green rectangle. (There is an ellipse(0px, 0px, 0px, 1em) shape-inside CSS property on the green rectangle.)
</ins><span class="cx"> </p>
</span><span class="cx"> <p id="shape-inside-ellipse-radiusY0">
</span><span class="cx"> This text should be pushed down below the green rectangle. (There is an ellipse(0px, 0px, 1em, 0px) shape-inside CSS property on the green rectangle.)
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsdifferentwritingmodeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> }
</span><span class="cx"> .float {
</span><span class="cx"> -webkit-writing-mode: vertical-lr;
</span><del>- -webkit-shape-outside: rectangle(0px, -20px, 20px, 20px);
</del><ins>+ -webkit-shape-outside: rectangle(0px, -20px, 20px, 20px) content-box;
</ins><span class="cx"> height: 20px;
</span><span class="cx"> width: 40px;
</span><span class="cx"> margin: 0px 20px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes001expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001-expected.html (0 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001-expected.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<html>
+<head>
+<style>
+.container {
+ width: 90px;
+ height: 90px;
+ color: green;
+ background-color: green;
+ margin: 10px;
+}
+</style>
+</head>
+<body>
+ <p>These tests set the shape-outside to a &lt;shape&gt; &lt;box&gt; pair, where the shape takes up its entire sizing box. They test for each of the various sizing boxes (margin/border/padding/content). They require the Ahem font. You should see green squares, with no red.</p>
+ <p>shape-outside: content-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: padding-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: border-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: margin-box</p>
+ <div class='container'>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes001html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001.html (0 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+<html>
+<head>
+<style>
+.container {
+ width: 90px;
+ height: 90px;
+ color: green;
+ background-color: red;
+ font: 30px/1 Ahem, sans-serif;
+ margin: 10px;
+ -webkit-font-smoothing: antialiased;
+}
+.content-box {
+ -webkit-shape-outside: polygon(0 0, 100% 0, 100% 100%) content-box;
+ background-clip: content-box;
+ width: 30px;
+ height: 30px;
+ padding: 10px;
+ border: 10px solid transparent;
+ margin: 10px;
+}
+.padding-box {
+ -webkit-shape-outside: polygon(0 0, 100% 0, 100% 100%) padding-box;
+ background-clip: padding-box;
+ width: 10px;
+ height: 10px;
+ padding: 10px 20px;
+ border: 15px solid transparent;
+ margin: 15px;
+}
+.border-box {
+ -webkit-shape-outside: polygon(0 0, 100% 0, 100% 100%) border-box;
+ background-clip: border-box;
+ width: 10px;
+ height: 10px;
+ padding: 5px 10px;
+ border: 5px solid transparent;
+ border-right-width: 10px;
+ margin: 30px;
+}
+.margin-box {
+ -webkit-shape-outside: polygon(0 0, 100% 0, 100% 100%) margin-box;
+ width: 10px;
+ height: 10px;
+ padding: 2px 4px;
+ border: 3px solid transparent;
+ border-right-width: 6px;
+ margin: 5px 10px;
+}
+.margin-box::before {
+ display: block;
+ margin-top: -10px;
+ width: 30px;
+ height: 30px;
+ background-color: green;
+ content: ' ';
+}
+.shape {
+ background-color: green;
+ float: left;
+ border-left-width: 0;
+ padding-left: 0;
+ margin-left: 0;
+}
+</style>
+</head>
+<body>
+ <p>These tests set the shape-outside to a &lt;shape&gt; &lt;box&gt; pair, where the shape takes up its entire sizing box. They test for each of the various sizing boxes (margin/border/padding/content). They require the Ahem font. You should see green squares, with no red.</p>
+ <p>shape-outside: content-box</p>
+ <div class='container'>
+ <div class='shape content-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: padding-box</p>
+ <div class='container'>
+ <div class='shape padding-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: border-box</p>
+ <div class='container'>
+ <div class='shape border-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: margin-box</p>
+ <div class='container'>
+ <div class='shape margin-box'></div>
+ xx xxx xxx
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes002expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002-expected.html (0 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002-expected.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<html>
+<head>
+<style>
+.container {
+ width: 90px;
+ height: 90px;
+ color: green;
+ background-color: green;
+ margin: 10px;
+}
+</style>
+</head>
+<body>
+ <p>These tests set the shape-outside to a &lt;shape&gt; &lt;box&gt; pair with writing-mode: vertical-lr, where the shape takes up its entire sizing box. They test for each of the various sizing boxes (margin/border/padding/content). They require the Ahem font. You should see green squares, with no red.</p>
+ <p>shape-outside: content-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: padding-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: border-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: margin-box</p>
+ <div class='container'>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes002html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002.html (0 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+<html>
+<head>
+<style>
+.container {
+ width: 90px;
+ height: 90px;
+ color: green;
+ background-color: red;
+ font: 30px/1 Ahem, sans-serif;
+ margin: 10px;
+ -webkit-font-smoothing: antialiased;
+ -webkit-writing-mode: vertical-lr;
+}
+.content-box {
+ -webkit-shape-outside: content-box;
+ background-clip: content-box;
+ width: 30px;
+ height: 30px;
+ padding: 10px;
+ border: 10px solid transparent;
+ margin: 10px;
+}
+.padding-box {
+ -webkit-shape-outside: padding-box;
+ background-clip: padding-box;
+ width: 10px;
+ height: 10px;
+ padding: 20px 10px;
+ border: 15px solid transparent;
+ margin: 15px;
+}
+.border-box {
+ -webkit-shape-outside: border-box;
+ background-clip: border-box;
+ width: 10px;
+ height: 10px;
+ padding: 10px 5px;
+ border: 5px solid transparent;
+ border-bottom-width: 10px;
+ margin: 30px;
+}
+.margin-box {
+ -webkit-shape-outside: margin-box;
+ width: 10px;
+ height: 10px;
+ padding: 4px 2px;
+ border: 3px solid transparent;
+ border-bottom-width: 6px;
+ margin: 10px 5px;
+}
+.margin-box::before {
+ display: block;
+ margin-left: -10px;
+ width: 30px;
+ height: 30px;
+ background-color: green;
+ content: ' ';
+}
+.shape {
+ background-color: green;
+ float: left;
+ border-top-width: 0;
+ padding-top: 0;
+ margin-top: 0;
+}
+</style>
+</head>
+<body>
+ <p>These tests set the shape-outside to a &lt;shape&gt; &lt;box&gt; pair with writing-mode: vertical-lr, where the shape takes up its entire sizing box. They test for each of the various sizing boxes (margin/border/padding/content). They require the Ahem font. You should see green squares, with no red.</p>
+ <p>shape-outside: content-box</p>
+ <div class='container'>
+ <div class='shape content-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: padding-box</p>
+ <div class='container'>
+ <div class='shape padding-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: border-box</p>
+ <div class='container'>
+ <div class='shape border-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: margin-box</p>
+ <div class='container'>
+ <div class='shape margin-box'></div>
+ xx xxx xxx
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes003expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003-expected.html (0 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003-expected.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<html>
+<head>
+<style>
+.container {
+ width: 90px;
+ height: 90px;
+ color: green;
+ background-color: green;
+ margin: 10px;
+}
+</style>
+</head>
+<body>
+ <p>These tests set the shape-outside to a &lt;shape&gt; &lt;box&gt; pair with writing-mode: vertical-rl, where the shape takes up its entire sizing box. They test for each of the various sizing boxes (margin/border/padding/content). They require the Ahem font. You should see green squares, with no red.</p>
+ <p>shape-outside: content-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: padding-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: border-box</p>
+ <div class='container'>
+ </div>
+ <p>shape-outside: margin-box</p>
+ <div class='container'>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideshapeboxes003html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003.html (0 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+<html>
+<head>
+<style>
+.container {
+ width: 90px;
+ height: 90px;
+ color: green;
+ background-color: red;
+ font: 30px/1 Ahem, sans-serif;
+ margin: 10px;
+ -webkit-font-smoothing: antialiased;
+ -webkit-writing-mode: vertical-rl;
+}
+.content-box {
+ -webkit-shape-outside: content-box;
+ background-clip: content-box;
+ width: 30px;
+ height: 30px;
+ padding: 10px;
+ border: 10px solid transparent;
+ margin: 10px;
+}
+.padding-box {
+ -webkit-shape-outside: padding-box;
+ background-clip: padding-box;
+ width: 10px;
+ height: 10px;
+ padding: 20px 10px;
+ border: 15px solid transparent;
+ margin: 15px;
+}
+.border-box {
+ -webkit-shape-outside: border-box;
+ background-clip: border-box;
+ width: 10px;
+ height: 10px;
+ padding: 10px 5px;
+ border: 5px solid transparent;
+ border-bottom-width: 10px;
+ margin: 30px;
+}
+.margin-box {
+ -webkit-shape-outside: margin-box;
+ width: 10px;
+ height: 10px;
+ padding: 4px 2px;
+ border: 3px solid transparent;
+ border-bottom-width: 6px;
+ margin: 10px 5px;
+}
+.margin-box::before {
+ display: block;
+ margin-right: -10px;
+ width: 30px;
+ height: 30px;
+ background-color: green;
+ content: ' ';
+}
+.shape {
+ background-color: green;
+ float: left;
+ border-top-width: 0;
+ padding-top: 0;
+ margin-top: 0;
+}
+</style>
+</head>
+<body>
+ <p>These tests set the shape-outside to a &lt;shape&gt; &lt;box&gt; pair with writing-mode: vertical-rl, where the shape takes up its entire sizing box. They test for each of the various sizing boxes (margin/border/padding/content). They require the Ahem font. You should see green squares, with no red.</p>
+ <p>shape-outside: content-box</p>
+ <div class='container'>
+ <div class='shape content-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: padding-box</p>
+ <div class='container'>
+ <div class='shape padding-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: border-box</p>
+ <div class='container'>
+ <div class='shape border-box'></div>
+ xxx xx xxx
+ </div>
+ <p>shape-outside: margin-box</p>
+ <div class='container'>
+ <div class='shape margin-box'></div>
+ xx xxx xxx
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolmodelhighlightshapeoutsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -25,11 +25,17 @@
</span><span class="cx"> -webkit-writing-mode: vertical-rl;
</span><span class="cx"> }
</span><span class="cx"> .rectangle {
</span><del>- -webkit-shape-outside: rectangle(50px, 50px, 100px, 50px);
</del><ins>+ -webkit-shape-outside: rectangle(50px, 50px, 100px, 50px) content-box;
</ins><span class="cx"> }
</span><ins>+.rectangle.border-box {
+ -webkit-shape-outside: rectangle(50px, 50px, 100px, 50px) border-box;
+}
</ins><span class="cx"> .polygon {
</span><del>- -webkit-shape-outside: polygon(50px 50px, 100px 50px, 100px 100px, 50px 100px);
</del><ins>+ -webkit-shape-outside: polygon(50px 50px, 100px 50px, 100px 100px, 50px 100px) content-box;
</ins><span class="cx"> }
</span><ins>+.polygon.border-box {
+ -webkit-shape-outside: polygon(50px 50px, 100px 50px, 100px 100px, 50px 100px) border-box;
+}
</ins><span class="cx"> .content-box {
</span><span class="cx"> -webkit-shape-outside: content-box;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/Source/WebCore/ChangeLog 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2013-11-26 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Layout using [<box> || <shape>] value
+ https://bugs.webkit.org/show_bug.cgi?id=124428
+
+ Reviewed by David Hyatt.
+
+ When a box value is supplied, use it to size and position the shape. Otherwise,
+ use a default value (content-box for shape-inside, margin-box for shape-outside).
+ This patch extends the sizing and positioning code used for the box patch (Bug 124227)
+ to also apply to shapes. With this patch, we also no longer use the box-sizing
+ property to size and position shapes.
+
+ Tests: fast/shapes/shape-outside-floats/shape-outside-shape-boxes-001.html
+ fast/shapes/shape-outside-floats/shape-outside-shape-boxes-002.html
+ fast/shapes/shape-outside-floats/shape-outside-shape-boxes-003.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue): Adjust for ShapeValues storing
+ BasicShape::ReferenceBox as their box value, rather than a CSSValueID.
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyShape::applyValue): Ditto.
+ * rendering/shapes/ShapeInfo.h:
+ (WebCore::ShapeInfo::setShapeSize): Adjust for BasicShapes with reference boxes
+ as well as plain box values. Also, remove old box-sizing code.
+ (WebCore::ShapeInfo::logicalTopOffset): Ditto.
+ (WebCore::ShapeInfo::logicalLeftOffset): Ditto.
+ * rendering/shapes/ShapeInsideInfo.h:
+ * rendering/shapes/ShapeOutsideInfo.h:
+ * rendering/style/ShapeValue.h:
+ (WebCore::ShapeValue::createBoxValue): Adjust for boxes being stored as
+ BasicShape::ReferenceBoxes.
+ (WebCore::ShapeValue::box): Ditto.
+ (WebCore::ShapeValue::ShapeValue): Ditto.
+
</ins><span class="cx"> 2013-11-26 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> ImageBuffer::create should return a std::unique_ptr instead of OwnPtr.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -2901,7 +2901,7 @@
</span><span class="cx"> if (!style->shapeInside())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueAuto);
</span><span class="cx"> if (style->shapeInside()->type() == ShapeValue::Box)
</span><del>- return cssValuePool().createIdentifierValue(style->shapeInside()->box());
</del><ins>+ return valueForBox(style->shapeInside()->box());
</ins><span class="cx"> if (style->shapeInside()->type() == ShapeValue::Outside)
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueOutsideShape);
</span><span class="cx"> if (style->shapeInside()->type() == ShapeValue::Image) {
</span><span class="lines">@@ -2915,7 +2915,7 @@
</span><span class="cx"> if (!style->shapeOutside())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueAuto);
</span><span class="cx"> if (style->shapeOutside()->type() == ShapeValue::Box)
</span><del>- return cssValuePool().createIdentifierValue(style->shapeOutside()->box());
</del><ins>+ return valueForBox(style->shapeOutside()->box());
</ins><span class="cx"> if (style->shapeOutside()->type() == ShapeValue::Image) {
</span><span class="cx"> if (style->shapeOutside()->image())
</span><span class="cx"> return style->shapeOutside()->image()->cssValue();
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -2085,7 +2085,7 @@
</span><span class="cx"> || primitiveValue->getValueID() == CSSValueBorderBox
</span><span class="cx"> || primitiveValue->getValueID() == CSSValuePaddingBox
</span><span class="cx"> || primitiveValue->getValueID() == CSSValueMarginBox)
</span><del>- setValue(styleResolver->style(), ShapeValue::createBoxValue(primitiveValue->getValueID()));
</del><ins>+ setValue(styleResolver->style(), ShapeValue::createBoxValue(boxForValue(primitiveValue)));
</ins><span class="cx"> else if (primitiveValue->getValueID() == CSSValueOutsideShape)
</span><span class="cx"> setValue(styleResolver->style(), ShapeValue::createOutsideValue());
</span><span class="cx"> else if (primitiveValue->isShape()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.h (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -73,26 +73,25 @@
</span><span class="cx">
</span><span class="cx"> void setShapeSize(LayoutUnit logicalWidth, LayoutUnit logicalHeight)
</span><span class="cx"> {
</span><del>- if (shapeValue()->type() == ShapeValue::Box) {
- switch (shapeValue()->box()) {
- case CSSValueMarginBox:
- logicalHeight += m_renderer.marginLogicalHeight();
- logicalWidth += m_renderer.marginLogicalWidth();
- break;
- case CSSValueBorderBox:
- break;
- case CSSValuePaddingBox:
- logicalHeight -= m_renderer.borderLogicalHeight();
- logicalWidth -= m_renderer.borderLogicalWidth();
- break;
- default:
- logicalHeight -= m_renderer.borderAndPaddingLogicalHeight();
- logicalWidth -= m_renderer.borderAndPaddingLogicalWidth();
- break;
- }
- } else if (m_renderer.style().boxSizing() == CONTENT_BOX) {
</del><ins>+ BasicShape::ReferenceBox box = resolvedBox();
+ switch (box) {
+ case BasicShape::MarginBox:
+ logicalHeight += m_renderer.marginLogicalHeight();
+ logicalWidth += m_renderer.marginLogicalWidth();
+ break;
+ case BasicShape::BorderBox:
+ break;
+ case BasicShape::PaddingBox:
+ logicalHeight -= m_renderer.borderLogicalHeight();
+ logicalWidth -= m_renderer.borderLogicalWidth();
+ break;
+ case BasicShape::ContentBox:
</ins><span class="cx"> logicalHeight -= m_renderer.borderAndPaddingLogicalHeight();
</span><span class="cx"> logicalWidth -= m_renderer.borderAndPaddingLogicalWidth();
</span><ins>+ break;
+ case BasicShape::None:
+ ASSERT_NOT_REACHED();
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutSize newLogicalSize(logicalWidth, logicalHeight);
</span><span class="lines">@@ -161,34 +160,39 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual BasicShape::ReferenceBox resolvedBox() const = 0;
</ins><span class="cx"> virtual LayoutRect computedShapeLogicalBoundingBox() const = 0;
</span><span class="cx"> virtual ShapeValue* shapeValue() const = 0;
</span><span class="cx"> virtual void getIntervals(LayoutUnit, LayoutUnit, SegmentList&) const = 0;
</span><span class="cx">
</span><span class="cx"> LayoutUnit logicalTopOffset() const
</span><span class="cx"> {
</span><del>- if (shapeValue()->type() == ShapeValue::Box) {
- switch (shapeValue()->box()) {
- case CSSValueMarginBox: return -m_renderer.marginBefore();
- case CSSValueBorderBox: return LayoutUnit();
- case CSSValuePaddingBox: return m_renderer.borderBefore();
- default: return m_renderer.borderAndPaddingBefore();
- }
</del><ins>+ BasicShape::ReferenceBox box = resolvedBox();
+ switch (box) {
+ case BasicShape::MarginBox: return -m_renderer.marginBefore();
+ case BasicShape::BorderBox: return LayoutUnit();
+ case BasicShape::PaddingBox: return m_renderer.borderBefore();
+ case BasicShape::ContentBox: return m_renderer.borderAndPaddingBefore();
+ case BasicShape::None: break;
</ins><span class="cx"> }
</span><del>- return m_renderer.style().boxSizing() == CONTENT_BOX ? m_renderer.borderAndPaddingBefore() : LayoutUnit();
</del><ins>+ ASSERT_NOT_REACHED();
+ return LayoutUnit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit logicalLeftOffset() const
</span><span class="cx"> {
</span><del>- if (shapeValue()->type() == ShapeValue::Box) {
- switch (shapeValue()->box()) {
- case CSSValueMarginBox: return -m_renderer.marginStart();
- case CSSValueBorderBox: return LayoutUnit();
- case CSSValuePaddingBox: return m_renderer.borderStart();
- default: return m_renderer.borderAndPaddingStart();
- }
</del><ins>+ if (m_renderer.isRenderRegion())
+ return LayoutUnit();
+ BasicShape::ReferenceBox box = resolvedBox();
+ switch (box) {
+ case BasicShape::MarginBox: return -m_renderer.marginStart();
+ case BasicShape::BorderBox: return LayoutUnit();
+ case BasicShape::PaddingBox: return m_renderer.borderStart();
+ case BasicShape::ContentBox: return m_renderer.borderAndPaddingStart();
+ case BasicShape::None: break;
</ins><span class="cx"> }
</span><del>- return (m_renderer.style().boxSizing() == CONTENT_BOX && !m_renderer.isRenderRegion()) ? m_renderer.borderAndPaddingStart() : LayoutUnit();
</del><ins>+ ASSERT_NOT_REACHED();
+ return LayoutUnit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit m_shapeLineTop;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -106,6 +106,15 @@
</span><span class="cx"> return computedShape().lineOverlapsShapePaddingBounds(m_shapeLineTop, m_lineHeight);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+protected:
+ virtual BasicShape::ReferenceBox resolvedBox() const OVERRIDE
+ {
+ if (shapeValue()->box() == BasicShape::None)
+ return BasicShape::ContentBox;
+
+ return shapeValue()->box();
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape().shapePaddingLogicalBoundingBox(); }
</span><span class="cx"> virtual ShapeValue* shapeValue() const OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -60,6 +60,17 @@
</span><span class="cx"> return computedShape().lineOverlapsShapeMarginBounds(m_shapeLineTop, m_lineHeight);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+protected:
+ virtual BasicShape::ReferenceBox resolvedBox() const OVERRIDE
+ {
+ if (shapeValue()->box() == BasicShape::None) {
+ if (shapeValue()->type() == ShapeValue::Image)
+ return BasicShape::ContentBox;
+ return BasicShape::MarginBox;
+ }
+ return shapeValue()->box();
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape().shapeMarginLogicalBoundingBox(); }
</span><span class="cx"> virtual ShapeValue* shapeValue() const OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleShapeValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ShapeValue.h (159791 => 159792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ShapeValue.h 2013-11-26 22:58:17 UTC (rev 159791)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.h 2013-11-26 23:05:28 UTC (rev 159792)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> return adoptRef(new ShapeValue(shape));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<ShapeValue> createBoxValue(CSSValueID id)
</del><ins>+ static PassRefPtr<ShapeValue> createBoxValue(BasicShape::ReferenceBox box)
</ins><span class="cx"> {
</span><del>- return adoptRef(new ShapeValue(id));
</del><ins>+ return adoptRef(new ShapeValue(box));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<ShapeValue> createOutsideValue()
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> ShapeValueType type() const { return m_type; }
</span><span class="cx"> BasicShape* shape() const { return m_shape.get(); }
</span><del>- CSSValueID box() const { return m_box; }
</del><ins>+ BasicShape::ReferenceBox box() const { return m_box; }
</ins><span class="cx">
</span><span class="cx"> StyleImage* image() const { return m_image.get(); }
</span><span class="cx"> bool isImageValid() const { return image() && image()->cachedImage() && image()->cachedImage()->hasImage(); }
</span><span class="lines">@@ -87,18 +87,21 @@
</span><span class="cx"> ShapeValue(PassRefPtr<BasicShape> shape)
</span><span class="cx"> : m_type(Shape)
</span><span class="cx"> , m_shape(shape)
</span><ins>+ , m_box(m_shape->box())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> ShapeValue(ShapeValueType type)
</span><span class="cx"> : m_type(type)
</span><ins>+ , m_box(BasicShape::None)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> ShapeValue(PassRefPtr<StyleImage> image)
</span><span class="cx"> : m_type(Image)
</span><span class="cx"> , m_image(image)
</span><ins>+ , m_box(BasicShape::None)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><del>- ShapeValue(CSSValueID box)
</del><ins>+ ShapeValue(BasicShape::ReferenceBox box)
</ins><span class="cx"> : m_type(Box)
</span><span class="cx"> , m_box(box)
</span><span class="cx"> {
</span><span class="lines">@@ -107,7 +110,7 @@
</span><span class="cx"> ShapeValueType m_type;
</span><span class="cx"> RefPtr<BasicShape> m_shape;
</span><span class="cx"> RefPtr<StyleImage> m_image;
</span><del>- CSSValueID m_box;
</del><ins>+ BasicShape::ReferenceBox m_box;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>