<!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>[175230] trunk/Source/WebCore</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/175230">175230</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-10-27 13:42:47 -0700 (Mon, 27 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Devirtualize RenderDeprecatedFlexibleBox::isStretchingChildren().
<https://webkit.org/b/138096>
Reviewed by Chris Dumez.
This function is only ever called on a renderer after we've checked
that it's a RenderDeprecatedFlexibleBox, so make it non-virtual.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalHeight):
* rendering/RenderDeprecatedFlexibleBox.h:
* rendering/RenderObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxh">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175229 => 175230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-27 20:08:13 UTC (rev 175229)
+++ trunk/Source/WebCore/ChangeLog 2014-10-27 20:42:47 UTC (rev 175230)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-27 Andreas Kling <akling@apple.com>
+
+ Devirtualize RenderDeprecatedFlexibleBox::isStretchingChildren().
+ <https://webkit.org/b/138096>
+
+ Reviewed by Chris Dumez.
+
+ This function is only ever called on a renderer after we've checked
+ that it's a RenderDeprecatedFlexibleBox, so make it non-virtual.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeLogicalHeight):
+ * rendering/RenderDeprecatedFlexibleBox.h:
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2014-10-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Reintroduce null check removed in r175222
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (175229 => 175230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-10-27 20:08:13 UTC (rev 175229)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-10-27 20:42:47 UTC (rev 175230)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PaintInfo.h"
</span><span class="cx"> #include "RenderBoxRegionInfo.h"
</span><ins>+#include "RenderDeprecatedFlexibleBox.h"
</ins><span class="cx"> #include "RenderFlexibleBox.h"
</span><span class="cx"> #include "RenderGeometryMap.h"
</span><span class="cx"> #include "RenderInline.h"
</span><span class="lines">@@ -2698,8 +2699,8 @@
</span><span class="cx"> // Block children of horizontal flexible boxes fill the height of the box.
</span><span class="cx"> // FIXME: Account for block-flow in flexible boxes.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=46418
</span><del>- if (h.isAuto() && parent()->isDeprecatedFlexibleBox() && parent()->style().boxOrient() == HORIZONTAL
- && parent()->isStretchingChildren()) {
</del><ins>+ if (h.isAuto() && is<RenderDeprecatedFlexibleBox>(*parent()) && parent()->style().boxOrient() == HORIZONTAL
+ && downcast<RenderDeprecatedFlexibleBox>(*parent()).isStretchingChildren()) {
</ins><span class="cx"> h = Length(parentBox()->contentLogicalHeight() - marginBefore() - marginAfter() - borderAndPaddingLogicalHeight(), Fixed);
</span><span class="cx"> checkMinMaxHeight = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h (175229 => 175230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h 2014-10-27 20:08:13 UTC (rev 175229)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h 2014-10-27 20:42:47 UTC (rev 175230)
</span><span class="lines">@@ -44,8 +44,9 @@
</span><span class="cx"> void layoutHorizontalBox(bool relayoutChildren);
</span><span class="cx"> void layoutVerticalBox(bool relayoutChildren);
</span><span class="cx">
</span><ins>+ bool isStretchingChildren() const { return m_stretchingChildren; }
+
</ins><span class="cx"> virtual bool avoidsFloats() const override { return true; }
</span><del>- virtual bool isStretchingChildren() const override { return m_stretchingChildren; }
</del><span class="cx"> virtual bool canCollapseAnonymousBlockChild() const override { return false; }
</span><span class="cx">
</span><span class="cx"> void placeChild(RenderBox* child, const LayoutPoint& location, LayoutSize* childLayoutDelta = 0);
</span><span class="lines">@@ -69,4 +70,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderDeprecatedFlexibleBox, isDeprecatedFlexibleBox())
+
</ins><span class="cx"> #endif // RenderDeprecatedFlexibleBox_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (175229 => 175230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-10-27 20:08:13 UTC (rev 175229)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-10-27 20:42:47 UTC (rev 175230)
</span><span class="lines">@@ -805,7 +805,6 @@
</span><span class="cx">
</span><span class="cx"> // Virtual function helpers for the deprecated Flexible Box Layout (display: -webkit-box).
</span><span class="cx"> virtual bool isDeprecatedFlexibleBox() const { return false; }
</span><del>- virtual bool isStretchingChildren() const { return false; }
</del><span class="cx">
</span><span class="cx"> // Virtual function helper for the new FlexibleBox Layout (display: -webkit-flex).
</span><span class="cx"> virtual bool isFlexibleBox() const { return false; }
</span></span></pre>
</div>
</div>
</body>
</html>