<!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>[182431] 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/182431">182431</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-04-06 10:00:54 -0700 (Mon, 06 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use a RenderObject bit for isRenderFlowThread()
https://bugs.webkit.org/show_bug.cgi?id=143439
Reviewed by Darin Adler.
Turning isRenderFlowThread() into a bit in rare data rather than a virtual function reduces
the time under RenderLayer::scrollTo() on a large overflow:scroll table from 56% to 44%.
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::RenderFlowThread):
* rendering/RenderFlowThread.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::setIsRenderFlowThread):
* rendering/RenderObject.h:
(WebCore::RenderObject::isDragging):
(WebCore::RenderObject::hasReflection):
(WebCore::RenderObject::isRenderFlowThread):
(WebCore::RenderObject::RenderObjectRareData::RenderObjectRareData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</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 (182430 => 182431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-06 16:32:12 UTC (rev 182430)
+++ trunk/Source/WebCore/ChangeLog 2015-04-06 17:00:54 UTC (rev 182431)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-04-06 Simon Fraser <simon.fraser@apple.com>
+
+ Use a RenderObject bit for isRenderFlowThread()
+ https://bugs.webkit.org/show_bug.cgi?id=143439
+
+ Reviewed by Darin Adler.
+
+ Turning isRenderFlowThread() into a bit in rare data rather than a virtual function reduces
+ the time under RenderLayer::scrollTo() on a large overflow:scroll table from 56% to 44%.
+
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::RenderFlowThread):
+ * rendering/RenderFlowThread.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::setIsRenderFlowThread):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::isDragging):
+ (WebCore::RenderObject::hasReflection):
+ (WebCore::RenderObject::isRenderFlowThread):
+ (WebCore::RenderObject::RenderObjectRareData::RenderObjectRareData):
+
</ins><span class="cx"> 2015-04-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] [SVG -> OTF Converter] Support the SVG -> OTF Font Converter
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (182430 => 182431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2015-04-06 16:32:12 UTC (rev 182430)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2015-04-06 17:00:54 UTC (rev 182431)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> , m_needsTwoPhasesLayout(false)
</span><span class="cx"> , m_layersToRegionMappingsDirty(true)
</span><span class="cx"> {
</span><ins>+ setIsRenderFlowThread(true);
</ins><span class="cx"> setFlowThreadState(InsideOutOfFlowThread);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (182430 => 182431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2015-04-06 16:32:12 UTC (rev 182430)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2015-04-06 17:00:54 UTC (rev 182431)
</span><span class="lines">@@ -235,8 +235,6 @@
</span><span class="cx"> virtual bool shouldCheckColumnBreaks() const { return false; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isRenderFlowThread() const override final { return true; }
-
</del><span class="cx"> // Always create a RenderLayer for the RenderFlowThread so that we
</span><span class="cx"> // can easily avoid drawing the children directly.
</span><span class="cx"> virtual bool requiresLayer() const override final { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (182430 => 182431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-04-06 16:32:12 UTC (rev 182430)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-04-06 17:00:54 UTC (rev 182431)
</span><span class="lines">@@ -2509,6 +2509,12 @@
</span><span class="cx"> ensureRareData().setHasReflection(hasReflection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderObject::setIsRenderFlowThread(bool isFlowThread)
+{
+ if (isFlowThread || hasRareData())
+ ensureRareData().setIsRenderFlowThread(isFlowThread);
+}
+
</ins><span class="cx"> RenderObject::RareDataHash& RenderObject::rareDataMap()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<RareDataHash> map;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (182430 => 182431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-04-06 16:32:12 UTC (rev 182430)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-04-06 17:00:54 UTC (rev 182431)
</span><span class="lines">@@ -350,7 +350,6 @@
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> virtual bool isRenderGrid() const { return false; }
</span><span class="cx"> #endif
</span><del>- virtual bool isRenderFlowThread() const { return false; }
</del><span class="cx"> virtual bool isRenderNamedFlowThread() const { return false; }
</span><span class="cx"> bool isInFlowRenderFlowThread() const { return isRenderFlowThread() && !isOutOfFlowPositioned(); }
</span><span class="cx"> bool isOutOfFlowRenderFlowThread() const { return isRenderFlowThread() && isOutOfFlowPositioned(); }
</span><span class="lines">@@ -518,6 +517,10 @@
</span><span class="cx"> bool isReplaced() const { return m_bitfields.isReplaced(); } // a "replaced" element (see CSS)
</span><span class="cx"> bool isHorizontalWritingMode() const { return m_bitfields.horizontalWritingMode(); }
</span><span class="cx">
</span><ins>+ bool isDragging() const { return m_bitfields.hasRareData() && rareData().isDragging(); }
+ bool hasReflection() const { return m_bitfields.hasRareData() && rareData().hasReflection(); }
+ bool isRenderFlowThread() const { return m_bitfields.hasRareData() && rareData().isRenderFlowThread(); }
+
</ins><span class="cx"> bool hasLayer() const { return m_bitfields.hasLayer(); }
</span><span class="cx">
</span><span class="cx"> enum BoxDecorationState {
</span><span class="lines">@@ -623,11 +626,9 @@
</span><span class="cx"> void setHasLayer(bool b = true) { m_bitfields.setHasLayer(b); }
</span><span class="cx"> void setHasTransformRelatedProperty(bool b = true) { m_bitfields.setHasTransformRelatedProperty(b); }
</span><span class="cx">
</span><del>- bool isDragging() const { return m_bitfields.hasRareData() && rareData().isDragging(); }
- bool hasReflection() const { return m_bitfields.hasRareData() && rareData().hasReflection(); }
-
</del><span class="cx"> void setIsDragging(bool);
</span><span class="cx"> void setHasReflection(bool = true);
</span><ins>+ void setIsRenderFlowThread(bool = true);
</ins><span class="cx">
</span><span class="cx"> // Hook so that RenderTextControl can return the line height of its inner renderer.
</span><span class="cx"> // For other renderers, the value is the same as lineHeight(false).
</span><span class="lines">@@ -1015,11 +1016,13 @@
</span><span class="cx"> RenderObjectRareData()
</span><span class="cx"> : m_isDragging(false)
</span><span class="cx"> , m_hasReflection(false)
</span><ins>+ , m_isRenderFlowThread(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(isDragging, IsDragging);
</span><span class="cx"> ADD_BOOLEAN_BITFIELD(hasReflection, HasReflection);
</span><ins>+ ADD_BOOLEAN_BITFIELD(isRenderFlowThread, IsRenderFlowThread);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RenderObjectRareData rareData() const;
</span></span></pre>
</div>
</div>
</body>
</html>