<!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>[178192] 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/178192">178192</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2015-01-09 13:01:53 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] content inside second shape area when two floats interact
https://bugs.webkit.org/show_bug.cgi?id=137702
Reviewed by Zalan Bujtas.
Source/WebCore:
If a float has a shape-outside, we cannot assume that it has a uniform
width for the height of the float, so we cannot use simple line
layout.
Test: fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor): Don't use simple line layout
if we have shape-outside. Also, rename floatRenderer to
floatingObject, since the variable doesn't contain a renderer.
LayoutTests:
* fast/shapes/shape-outside-floats/shape-outside-text-overlap-float-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidetextoverlapfloatexpectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidetextoverlapfloathtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178191 => 178192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-09 20:59:05 UTC (rev 178191)
+++ trunk/LayoutTests/ChangeLog 2015-01-09 21:01:53 UTC (rev 178192)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-09 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] content inside second shape area when two floats interact
+ https://bugs.webkit.org/show_bug.cgi?id=137702
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/shapes/shape-outside-floats/shape-outside-text-overlap-float-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html: Added.
+
</ins><span class="cx"> 2015-01-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow HTTPS + 'Cache-control: no-store' sub-frames into the page cache
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidetextoverlapfloatexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float-expected.html (0 => 178192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float-expected.html 2015-01-09 21:01:53 UTC (rev 178192)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ #container {
+ font: 10px/1 Ahem;
+ width: 40px;
+ position: relative;
+ }
+
+ #left-triangle, #right-triangle {
+ position: absolute;
+ top: 0px;
+ width: 20px;
+ height: 20px;
+ background-color: green;
+ }
+
+ #left-triangle {
+ left: 0px;
+ -webkit-clip-path: polygon(0 0, 100% 100%, 0 100%);
+ }
+
+ #right-triangle {
+ right: 0px;
+ -webkit-clip-path: polygon(100% 0, 100% 100%, 0 100%);
+ }
+
+ .top {
+ width: 10px;
+ height: 10px;
+ }
+
+ .bottom {
+ width: 20px;
+ height: 10px;
+ }
+
+ .left {
+ float: left;
+ }
+
+ .right {
+ float: right;
+ }
+</style>
+<body>
+ <p>The black rectangles should not overlap the green trianges.</p>
+ <div id="container">
+ <div id="left-triangle"></div>
+ <div id="right-triangle"></div>
+ <div class="left top"></div>
+ <div class="right top"></div>
+ <div>xx</div>
+ <div class="left bottom"></div>
+ <div class="right bottom"></div>
+ <div>xx</div>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidetextoverlapfloathtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html (0 => 178192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html 2015-01-09 21:01:53 UTC (rev 178192)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ #container {
+ font: 10px/1 Ahem;
+ width: 40px;
+ }
+
+ #left, #right {
+ width: 20px;
+ height: 20px;
+ background-color: green;
+ }
+
+ #left {
+ float: left;
+ -webkit-shape-outside: polygon(0 0, 100% 100%, 0 100%);
+ -webkit-clip-path: polygon(0 0, 100% 100%, 0 100%);
+ }
+
+ #right {
+ float: right;
+ -webkit-shape-outside: polygon(100% 0, 100% 100%, 0 100%);
+ -webkit-clip-path: polygon(100% 0, 100% 100%, 0 100%);
+ }
+</style>
+<body>
+ <p>The black rectangles should not overlap the green trianges.</p>
+ <div id="container">
+ <div id="left"></div>
+ <div id="right"></div>
+ <p>xx xx</p>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178191 => 178192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-09 20:59:05 UTC (rev 178191)
+++ trunk/Source/WebCore/ChangeLog 2015-01-09 21:01:53 UTC (rev 178192)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-09 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] content inside second shape area when two floats interact
+ https://bugs.webkit.org/show_bug.cgi?id=137702
+
+ Reviewed by Zalan Bujtas.
+
+ If a float has a shape-outside, we cannot assume that it has a uniform
+ width for the height of the float, so we cannot use simple line
+ layout.
+
+ Test: fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseFor): Don't use simple line layout
+ if we have shape-outside. Also, rename floatRenderer to
+ floatingObject, since the variable doesn't contain a renderer.
+
</ins><span class="cx"> 2015-01-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow HTTPS + 'Cache-control: no-store' sub-frames into the page cache
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (178191 => 178192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-09 20:59:05 UTC (rev 178191)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-09 21:01:53 UTC (rev 178192)
</span><span class="lines">@@ -170,9 +170,15 @@
</span><span class="cx"> for (const auto& textRenderer : childrenOfType<RenderText>(flow)) {
</span><span class="cx"> minimumWidthNeeded = std::min(minimumWidthNeeded, textRenderer.minLogicalWidth());
</span><span class="cx">
</span><del>- for (auto& floatRenderer : *flow.floatingObjectSet()) {
- ASSERT(floatRenderer);
- float availableWidth = flow.availableLogicalWidthForLine(floatRenderer->y(), false);
</del><ins>+ for (auto& floatingObject : *flow.floatingObjectSet()) {
+ ASSERT(floatingObject);
+#if ENABLE(CSS_SHAPES)
+ // if a float has a shape, we cannot tell if content will need to be shifted until after we lay it out,
+ // since the amount of space is not uniform for the height of the float.
+ if (floatingObject->renderer().shapeOutsideInfo())
+ return false;
+#endif
+ float availableWidth = flow.availableLogicalWidthForLine(floatingObject->y(), false);
</ins><span class="cx"> if (availableWidth < minimumWidthNeeded)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>