<!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>[160243] 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/160243">160243</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-06 13:02:22 -0800 (Fri, 06 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] ShapeOutsideInfo needs to use the parent's writing mode when calculating offsets
https://bugs.webkit.org/show_bug.cgi?id=124680
Patch by Rob Buis <rob.buis@samsung.com> on 2013-12-06
Reviewed by Dirk Schulze.
Source/WebCore:
Do not take the writing-mode property on the float into account for shape-outside.
Add a virtual method writingMode() in order to do this for shape-outside but
keep old behavior (element writingMode) for shape-inside.
Change existing test floats/shape-outside-floats-different-writing-modes.html to test the
new behavior.
* rendering/shapes/ShapeInfo.cpp:
(WebCore::::computedShape):
* rendering/shapes/ShapeInfo.h:
(WebCore::ShapeInfo::writingMode):
* rendering/shapes/ShapeOutsideInfo.cpp:
(WebCore::ShapeOutsideInfo::writingMode):
* rendering/shapes/ShapeOutsideInfo.h:
LayoutTests:
Make sure the writing-mode property on the float is not taken into account for shape-outside.
Adapt highlight-shape-outside.html so it sets the writing-mode on the container div, not the float.
However because of earlier unreliability in EFL/GTK, skip the test for now.
* TestExpectations:
* fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html:
* inspector-protocol/model/highlight-shape-outside-expected.txt:
* inspector-protocol/model/highlight-shape-outside.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</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="#trunkSourceWebCorerenderingshapesShapeInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/LayoutTests/ChangeLog 2013-12-06 21:02:22 UTC (rev 160243)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-06 Rob Buis <rob.buis@samsung.com>
+
+ [CSS Shapes] ShapeOutsideInfo needs to use the parent's writing mode when calculating offsets
+ https://bugs.webkit.org/show_bug.cgi?id=124680
+
+ Reviewed by Dirk Schulze.
+
+ Make sure the writing-mode property on the float is not taken into account for shape-outside.
+ Adapt highlight-shape-outside.html so it sets the writing-mode on the container div, not the float.
+ However because of earlier unreliability in EFL/GTK, skip the test for now.
+
+ * TestExpectations:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html:
+ * inspector-protocol/model/highlight-shape-outside-expected.txt:
+ * inspector-protocol/model/highlight-shape-outside.html:
+
</ins><span class="cx"> 2013-12-06 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL should support all of ValueToInt32
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/LayoutTests/TestExpectations 2013-12-06 21:02:22 UTC (rev 160243)
</span><span class="lines">@@ -68,3 +68,5 @@
</span><span class="cx"> # No port in WebKit already support getMediaStream, so we are skipping those for now.
</span><span class="cx"> fast/mediastream/MediaStream-construct-with-ended-tracks.html [ Skip ]
</span><span class="cx"> fast/mediastream/MediaStream-clone.html [ Skip ]
</span><ins>+
+webkit.org/b/124660 inspector-protocol/model/highlight-shape-outside.html [ Failure ]
</ins></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 (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html 2013-12-06 21:02:22 UTC (rev 160243)
</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) content-box;
</del><ins>+ -webkit-shape-outside: rectangle(-20px, 0px, 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="trunkLayoutTestsinspectorprotocolmodelhighlightshapeoutsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/LayoutTests/inspector-protocol/model/highlight-shape-outside.html 2013-12-06 21:02:22 UTC (rev 160243)
</span><span class="lines">@@ -72,19 +72,19 @@
</span><span class="cx"> 'path' : ['M', 50, 50, 'L', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.rectangle.vertical-lr',
</del><ins>+ 'selector' : '.vertical-lr > .rectangle',
</ins><span class="cx"> 'path' : ['M', 50, 50, 'L', 50, 100, 'L', 150, 100, 'L', 150, 50, 'L', 50, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.rectangle.vertical-rl',
</del><ins>+ 'selector' : '.vertical-rl > .rectangle',
</ins><span class="cx"> 'path' : ['M', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'L', 150, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.rectangle.padded.vertical-rl',
</del><ins>+ 'selector' : '.vertical-rl > .rectangle.padded',
</ins><span class="cx"> 'path' : ['M', 175, 75, 'L', 175, 125, 'L', 75, 125, 'L', 75, 75, 'L', 175, 75, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- 'selector' : '.rectangle.padded.vertical-rl.border-box',
</del><ins>+ 'selector' : '.vertical-rl > .rectangle.padded.border-box',
</ins><span class="cx"> 'path' : ['M', 150, 50, 'L', 150, 100, 'L', 50, 100, 'L', 50, 50, 'L', 150, 50, 'Z']
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -130,10 +130,14 @@
</span><span class="cx"> <div class='shape polygon'></div>
</span><span class="cx"> <div class='shape padded rectangle'></div>
</span><span class="cx"> <div class='shape padded rectangle border-box'></div>
</span><del>- <div class='shape rectangle vertical-lr'></div>
- <div class='shape rectangle vertical-rl'></div>
- <div class='shape padded rectangle vertical-rl'></div>
- <div class='shape padded rectangle vertical-rl border-box'></div>
</del><ins>+ <div class='vertical-lr'>
+ <div class='shape rectangle'></div>
+ </div>
+ <div class='vertical-rl'>
+ <div class='shape rectangle'></div>
+ <div class='shape padded rectangle'></div>
+ <div class='shape padded rectangle border-box'></div>
+ </div>
</ins><span class="cx"> <div class='shape padded content-box'></div>
</span><span class="cx"> <div class='shape padded raster-svg'></div>
</span><span class="cx"> <div class='shape padded raster-svg-complex'></div>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/Source/WebCore/ChangeLog 2013-12-06 21:02:22 UTC (rev 160243)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-12-06 Rob Buis <rob.buis@samsung.com>
+
+ [CSS Shapes] ShapeOutsideInfo needs to use the parent's writing mode when calculating offsets
+ https://bugs.webkit.org/show_bug.cgi?id=124680
+
+ Reviewed by Dirk Schulze.
+
+ Do not take the writing-mode property on the float into account for shape-outside.
+ Add a virtual method writingMode() in order to do this for shape-outside but
+ keep old behavior (element writingMode) for shape-inside.
+
+ Change existing test floats/shape-outside-floats-different-writing-modes.html to test the
+ new behavior.
+
+ * rendering/shapes/ShapeInfo.cpp:
+ (WebCore::::computedShape):
+ * rendering/shapes/ShapeInfo.h:
+ (WebCore::ShapeInfo::writingMode):
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ (WebCore::ShapeOutsideInfo::writingMode):
+ * rendering/shapes/ShapeOutsideInfo.h:
+
</ins><span class="cx"> 2013-12-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove Staging Workaround
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2013-12-06 21:02:22 UTC (rev 160243)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> if (Shape* shape = m_shape.get())
</span><span class="cx"> return *shape;
</span><span class="cx">
</span><del>- WritingMode writingMode = m_renderer.style().writingMode();
</del><ins>+ WritingMode writingMode = this->writingMode();
</ins><span class="cx"> Length margin = m_renderer.style().shapeMargin();
</span><span class="cx"> Length padding = m_renderer.style().shapePadding();
</span><span class="cx"> float shapeImageThreshold = m_renderer.style().shapeImageThreshold();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.h (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2013-12-06 21:02:22 UTC (rev 160243)
</span><span class="lines">@@ -165,6 +165,8 @@
</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><ins>+ virtual WritingMode writingMode() const { return m_renderer.style().writingMode(); }
+
</ins><span class="cx"> LayoutUnit logicalTopOffset() const
</span><span class="cx"> {
</span><span class="cx"> BasicShape::ReferenceBox box = resolvedBox();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2013-12-06 21:02:22 UTC (rev 160243)
</span><span class="lines">@@ -100,6 +100,12 @@
</span><span class="cx"> return m_renderer.style().shapeOutside();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WritingMode ShapeOutsideInfo::writingMode() const
+{
+ ASSERT(m_renderer.containingBlock());
+ return m_renderer.containingBlock()->style().writingMode();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h (160242 => 160243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2013-12-06 20:59:16 UTC (rev 160242)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2013-12-06 21:02:22 UTC (rev 160243)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx"> return computedShape().getExcludedIntervals(lineTop, lineHeight, segments);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual WritingMode writingMode() const;
+
</ins><span class="cx"> LayoutUnit m_leftMarginBoxDelta;
</span><span class="cx"> LayoutUnit m_rightMarginBoxDelta;
</span><span class="cx"> LayoutUnit m_lineTop;
</span></span></pre>
</div>
</div>
</body>
</html>