<!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>[168534] 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/168534">168534</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-05-09 09:15:59 -0700 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] 1-2% performance regression in html5-full-render after <a href="http://trac.webkit.org/projects/webkit/changeset/168286">r168286</a>
https://bugs.webkit.org/show_bug.cgi?id=132672
Reviewed by Mihnea Ovidenie.
The patch optimizes the search of regions when there's a single region in the chain.
There's no need to execute advanced search logic, we can directly return that region.
Tests: No function change, no tests.
* rendering/RenderBlock.cpp:
(WebCore::canComputeRegionRangeForBox):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::regionAtBlockOffset):
(WebCore::RenderFlowThread::hasCachedRegionRangeForBox): Renamed from hasRegionRangeForBox to
better suggest what the function does.
(WebCore::RenderFlowThread::getRegionRangeForBox):
(WebCore::RenderFlowThread::hasRegionRangeForBox): Deleted.
* rendering/RenderFlowThread.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168533 => 168534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-09 15:54:05 UTC (rev 168533)
+++ trunk/Source/WebCore/ChangeLog 2014-05-09 16:15:59 UTC (rev 168534)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-09 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] 1-2% performance regression in html5-full-render after r168286
+ https://bugs.webkit.org/show_bug.cgi?id=132672
+
+ Reviewed by Mihnea Ovidenie.
+
+ The patch optimizes the search of regions when there's a single region in the chain.
+ There's no need to execute advanced search logic, we can directly return that region.
+
+ Tests: No function change, no tests.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::canComputeRegionRangeForBox):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::regionAtBlockOffset):
+ (WebCore::RenderFlowThread::hasCachedRegionRangeForBox): Renamed from hasRegionRangeForBox to
+ better suggest what the function does.
+ (WebCore::RenderFlowThread::getRegionRangeForBox):
+ (WebCore::RenderFlowThread::hasRegionRangeForBox): Deleted.
+ * rendering/RenderFlowThread.h:
+
</ins><span class="cx"> 2014-05-09 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [EME] Call suspendIfNeeded() in the MediaKeySession create() method to avoid an ASSERT.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (168533 => 168534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-05-09 15:54:05 UTC (rev 168533)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-05-09 16:15:59 UTC (rev 168534)
</span><span class="lines">@@ -3897,7 +3897,7 @@
</span><span class="cx"> if (!childBox.canHaveOutsideRegionRange())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return flowThreadContainingBlock->hasRegionRangeForBox(parentBlock);
</del><ins>+ return flowThreadContainingBlock->hasCachedRegionRangeForBox(parentBlock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBlock::childBoxIsUnsplittableForFragmentation(const RenderBox& child) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (168533 => 168534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-05-09 15:54:05 UTC (rev 168533)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-05-09 16:15:59 UTC (rev 168534)
</span><span class="lines">@@ -401,6 +401,9 @@
</span><span class="cx"> if (m_regionList.isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><ins>+ if (m_regionList.size() == 1 && extendLastRegion)
+ return m_regionList.first();
+
</ins><span class="cx"> if (offset <= 0)
</span><span class="cx"> return clampBox ? clampBox->clampToStartAndEndRegions(m_regionList.first()) : m_regionList.first();
</span><span class="cx">
</span><span class="lines">@@ -747,7 +750,7 @@
</span><span class="cx"> range.setRange(startRegion, endRegion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderFlowThread::hasRegionRangeForBox(const RenderBox* box) const
</del><ins>+bool RenderFlowThread::hasCachedRegionRangeForBox(const RenderBox* box) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(box);
</span><span class="cx">
</span><span class="lines">@@ -794,6 +797,11 @@
</span><span class="cx"> if (!hasValidRegionInfo()) // We clear the ranges when we invalidate the regions.
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (m_regionList.size() == 1) {
+ startRegion = endRegion = m_regionList.first();
+ return true;
+ }
+
</ins><span class="cx"> if (getRegionRangeForBoxFromCachedInfo(box, startRegion, endRegion))
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -810,7 +818,7 @@
</span><span class="cx"> cb = cb->parent()->enclosingBox();
</span><span class="cx"> ASSERT(cb);
</span><span class="cx">
</span><del>- if (hasRegionRangeForBox(cb))
</del><ins>+ if (hasCachedRegionRangeForBox(cb))
</ins><span class="cx"> cbToUse = cb;
</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 (168533 => 168534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-05-09 15:54:05 UTC (rev 168533)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-05-09 16:15:59 UTC (rev 168534)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setRegionRangeForBox(const RenderBox*, RenderRegion*, RenderRegion*);
</span><span class="cx"> bool getRegionRangeForBox(const RenderBox*, RenderRegion*& startRegion, RenderRegion*& endRegion) const;
</span><del>- bool hasRegionRangeForBox(const RenderBox*) const;
</del><ins>+ bool hasCachedRegionRangeForBox(const RenderBox*) const;
</ins><span class="cx">
</span><span class="cx"> // Check if the object is in region and the region is part of this flow thread.
</span><span class="cx"> bool objectInFlowRegion(const RenderObject*, const RenderRegion*) const;
</span></span></pre>
</div>
</div>
</body>
</html>