<!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>[168363] 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/168363">168363</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-05-06 10:30:40 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Optimize the number of regions invalidations
https://bugs.webkit.org/show_bug.cgi?id=132611
Reviewed by David Hyatt.
Source/WebCore:
It is possible to invalidate the region chain of a flow thread
during the layout of the region when its height is not final.
This patch places the check after the height of the region
is determined, reducing the number of invalidations.
Tests: Less invalidations and repaints in the repaint tests for
the flow threads.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::updateLogicalHeight):
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::layoutBlock):
(WebCore::RenderNamedFlowFragment::invalidateRegionIfNeeded):
* rendering/RenderNamedFlowFragment.h:
LayoutTests:
Because there are less region invalidations there are less repaints
of the flow threads.
* fast/regions/repaint/repaint-regions-overflow-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastregionsrepaintrepaintregionsoverflowexpectedtxt">trunk/LayoutTests/fast/regions/repaint/repaint-regions-overflow-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmenth">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168362 => 168363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-06 16:44:41 UTC (rev 168362)
+++ trunk/LayoutTests/ChangeLog 2014-05-06 17:30:40 UTC (rev 168363)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-06 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] Optimize the number of regions invalidations
+ https://bugs.webkit.org/show_bug.cgi?id=132611
+
+ Reviewed by David Hyatt.
+
+ Because there are less region invalidations there are less repaints
+ of the flow threads.
+
+ * fast/regions/repaint/repaint-regions-overflow-expected.txt:
+
</ins><span class="cx"> 2014-05-06 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: VoiceOver does not announce text changes for content editable regions in Safari
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsrepaintrepaintregionsoverflowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/repaint/repaint-regions-overflow-expected.txt (168362 => 168363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/repaint/repaint-regions-overflow-expected.txt 2014-05-06 16:44:41 UTC (rev 168362)
+++ trunk/LayoutTests/fast/regions/repaint/repaint-regions-overflow-expected.txt 2014-05-06 17:30:40 UTC (rev 168363)
</span><span class="lines">@@ -6,17 +6,11 @@
</span><span class="cx">
</span><span class="cx"> (repaint rects
</span><span class="cx"> (rect 106 306 300 160)
</span><del>- (rect 14 72 300 210)
- (rect 106 122 300 210)
- (rect 14 298 300 18)
- (rect 106 348 300 18)
</del><span class="cx"> (rect 14 56 300 260)
</span><span class="cx"> (rect 106 106 300 260)
</span><span class="cx"> (rect 60 150 312 266)
</span><span class="cx"> (rect 100 200 312 266)
</span><span class="cx"> (rect 14 56 300 260)
</span><span class="cx"> (rect 106 106 300 260)
</span><del>- (rect 14 56 300 260)
- (rect 106 106 300 260)
</del><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168362 => 168363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-06 16:44:41 UTC (rev 168362)
+++ trunk/Source/WebCore/ChangeLog 2014-05-06 17:30:40 UTC (rev 168363)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-06 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] Optimize the number of regions invalidations
+ https://bugs.webkit.org/show_bug.cgi?id=132611
+
+ Reviewed by David Hyatt.
+
+ It is possible to invalidate the region chain of a flow thread
+ during the layout of the region when its height is not final.
+
+ This patch places the check after the height of the region
+ is determined, reducing the number of invalidations.
+
+ Tests: Less invalidations and repaints in the repaint tests for
+ the flow threads.
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::updateLogicalHeight):
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::layoutBlock):
+ (WebCore::RenderNamedFlowFragment::invalidateRegionIfNeeded):
+ * rendering/RenderNamedFlowFragment.h:
+
</ins><span class="cx"> 2014-05-03 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Extended Background] Respect repeat-x/repeat-y when creating margin tiles
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (168362 => 168363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-05-06 16:44:41 UTC (rev 168362)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-05-06 17:30:40 UTC (rev 168363)
</span><span class="lines">@@ -2925,8 +2925,10 @@
</span><span class="cx"> {
</span><span class="cx"> RenderBlock::updateLogicalHeight();
</span><span class="cx">
</span><del>- if (renderNamedFlowFragment())
</del><ins>+ if (renderNamedFlowFragment()) {
</ins><span class="cx"> renderNamedFlowFragment()->setLogicalHeight(std::max<LayoutUnit>(0, logicalHeight() - borderAndPaddingLogicalHeight()));
</span><ins>+ renderNamedFlowFragment()->invalidateRegionIfNeeded();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::setRenderNamedFlowFragment(RenderNamedFlowFragment* flowFragment)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (168362 => 168363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-05-06 16:44:41 UTC (rev 168362)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-05-06 17:30:40 UTC (rev 168363)
</span><span class="lines">@@ -262,10 +262,6 @@
</span><span class="cx"> RenderRegion::layoutBlock(relayoutChildren);
</span><span class="cx">
</span><span class="cx"> if (isValid()) {
</span><del>- LayoutRect oldRegionRect(flowThreadPortionRect());
- if (!isHorizontalWritingMode())
- oldRegionRect = oldRegionRect.transposedRect();
-
</del><span class="cx"> if (m_flowThread->inOverflowLayoutPhase() || m_flowThread->inFinalLayoutPhase()) {
</span><span class="cx"> computeOverflowFromFlowThread();
</span><span class="cx"> updateOversetState();
</span><span class="lines">@@ -276,11 +272,21 @@
</span><span class="cx"> clearComputedAutoHeight();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ }
+}
</ins><span class="cx">
</span><del>- if ((oldRegionRect.width() != pageLogicalWidth() || oldRegionRect.height() != pageLogicalHeight()) && !m_flowThread->inFinalLayoutPhase()) {
- // This can happen even if we are in the inConstrainedLayoutPhase and it will trigger a pathological layout of the flow thread.
- m_flowThread->invalidateRegions();
- }
</del><ins>+void RenderNamedFlowFragment::invalidateRegionIfNeeded()
+{
+ if (!isValid())
+ return;
+
+ LayoutRect oldRegionRect(flowThreadPortionRect());
+ if (!isHorizontalWritingMode())
+ oldRegionRect = oldRegionRect.transposedRect();
+
+ if ((oldRegionRect.width() != pageLogicalWidth() || oldRegionRect.height() != pageLogicalHeight()) && !m_flowThread->inFinalLayoutPhase()) {
+ // This can happen even if we are in the inConstrainedLayoutPhase and it will trigger a pathological layout of the flow thread.
+ m_flowThread->invalidateRegions();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h (168362 => 168363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h 2014-05-06 16:44:41 UTC (rev 168362)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h 2014-05-06 17:30:40 UTC (rev 168363)
</span><span class="lines">@@ -118,6 +118,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void absoluteQuadsForBoxInRegion(Vector<FloatQuad>&, bool*, const RenderBox*, float, float) override;
</span><span class="cx">
</span><ins>+ void invalidateRegionIfNeeded();
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual const char* renderName() const override { return "RenderNamedFlowFragment"; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>