<!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>[181695] 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/181695">181695</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-18 09:22:04 -0700 (Wed, 18 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skip trying to paint overlay scrollbars when there are none or they are clipped out
https://bugs.webkit.org/show_bug.cgi?id=142811
rdar://problem/20200725
Reviewed by Darin Adler.
In some content with lots of layers and overflow:scroll, we could spend 20% of
the time under paintOverflowControlsForFragments() setting up an (empty) clip,
and then trying to draw scrollbars that we don't have.
Avoid calling paintOverflowControlsForFragments() if there are no scrollbars,
and don't both setting up an empty clip just to paint nothing.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::paintOverflowControlsForFragments):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181694 => 181695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-18 16:15:17 UTC (rev 181694)
+++ trunk/Source/WebCore/ChangeLog 2015-03-18 16:22:04 UTC (rev 181695)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-03-17 Simon Fraser <simon.fraser@apple.com>
+
+ Skip trying to paint overlay scrollbars when there are none or they are clipped out
+ https://bugs.webkit.org/show_bug.cgi?id=142811
+ rdar://problem/20200725
+
+ Reviewed by Darin Adler.
+
+ In some content with lots of layers and overflow:scroll, we could spend 20% of
+ the time under paintOverflowControlsForFragments() setting up an (empty) clip,
+ and then trying to draw scrollbars that we don't have.
+
+ Avoid calling paintOverflowControlsForFragments() if there are no scrollbars,
+ and don't both setting up an empty clip just to paint nothing.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayerContents):
+ (WebCore::RenderLayer::paintOverflowControlsForFragments):
+
</ins><span class="cx"> 2015-03-18 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Unreviewed build fix after r181665.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (181694 => 181695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-18 16:15:17 UTC (rev 181694)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-18 16:22:04 UTC (rev 181695)
</span><span class="lines">@@ -4319,7 +4319,7 @@
</span><span class="cx"> paintFlowThreadIfRegionForFragments(layerFragments, context, localPaintingInfo, localPaintFlags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isPaintingOverlayScrollbars)
</del><ins>+ if (isPaintingOverlayScrollbars && hasScrollbars())
</ins><span class="cx"> paintOverflowControlsForFragments(layerFragments, context, localPaintingInfo);
</span><span class="cx">
</span><span class="cx"> if (filterPainter) {
</span><span class="lines">@@ -4615,8 +4615,7 @@
</span><span class="cx"> const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo& localPaintingInfo, PaintBehavior paintBehavior,
</span><span class="cx"> RenderObject* subtreePaintRootForRenderer)
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < layerFragments.size(); ++i) {
- const LayerFragment& fragment = layerFragments.at(i);
</del><ins>+ for (const auto& fragment : layerFragments) {
</ins><span class="cx"> if (!fragment.shouldPaintContent)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -4646,8 +4645,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Begin transparency if we have something to paint.
</span><span class="cx"> if (haveTransparency) {
</span><del>- for (size_t i = 0; i < layerFragments.size(); ++i) {
- const LayerFragment& fragment = layerFragments.at(i);
</del><ins>+ for (const auto& fragment : layerFragments) {
</ins><span class="cx"> if (fragment.shouldPaintContent && !fragment.foregroundRect.isEmpty()) {
</span><span class="cx"> beginTransparencyLayers(transparencyLayerContext, localPaintingInfo, transparencyPaintDirtyRect);
</span><span class="cx"> break;
</span><span class="lines">@@ -4703,8 +4701,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool shouldClip = localPaintingInfo.clipToDirtyRect && layerFragments.size() > 1;
</span><span class="cx">
</span><del>- for (size_t i = 0; i < layerFragments.size(); ++i) {
- const LayerFragment& fragment = layerFragments.at(i);
</del><ins>+ for (const auto& fragment : layerFragments) {
</ins><span class="cx"> if (!fragment.shouldPaintContent || fragment.foregroundRect.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -4724,8 +4721,7 @@
</span><span class="cx"> void RenderLayer::paintOutlineForFragments(const LayerFragments& layerFragments, GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo,
</span><span class="cx"> PaintBehavior paintBehavior, RenderObject* subtreePaintRootForRenderer)
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < layerFragments.size(); ++i) {
- const LayerFragment& fragment = layerFragments.at(i);
</del><ins>+ for (const auto& fragment : layerFragments) {
</ins><span class="cx"> if (fragment.outlineRect.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -4740,8 +4736,7 @@
</span><span class="cx"> void RenderLayer::paintMaskForFragments(const LayerFragments& layerFragments, GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo,
</span><span class="cx"> RenderObject* subtreePaintRootForRenderer)
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < layerFragments.size(); ++i) {
- const LayerFragment& fragment = layerFragments.at(i);
</del><ins>+ for (const auto& fragment : layerFragments) {
</ins><span class="cx"> if (!fragment.shouldPaintContent)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -4761,8 +4756,7 @@
</span><span class="cx"> void RenderLayer::paintChildClippingMaskForFragments(const LayerFragments& layerFragments, GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo,
</span><span class="cx"> RenderObject* subtreePaintRootForRenderer)
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < layerFragments.size(); ++i) {
- const LayerFragment& fragment = layerFragments.at(i);
</del><ins>+ for (const auto& fragment : layerFragments) {
</ins><span class="cx"> if (!fragment.shouldPaintContent)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -4780,8 +4774,9 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::paintOverflowControlsForFragments(const LayerFragments& layerFragments, GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo)
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < layerFragments.size(); ++i) {
- const LayerFragment& fragment = layerFragments.at(i);
</del><ins>+ for (const auto& fragment : layerFragments) {
+ if (fragment.backgroundRect.isEmpty())
+ continue;
</ins><span class="cx"> clipToRect(localPaintingInfo, context, fragment.backgroundRect);
</span><span class="cx"> paintOverflowControls(context, roundedIntPoint(toLayoutPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subpixelAccumulation)),
</span><span class="cx"> snappedIntRect(fragment.backgroundRect.rect()), true);
</span></span></pre>
</div>
</div>
</body>
</html>