<!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>[183173] 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/183173">183173</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-04-22 23:03:22 -0700 (Wed, 22 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Move computeCoverageRect code from FrameView into TileController
https://bugs.webkit.org/show_bug.cgi?id=144087
Reviewed by Benjamin Poulain.
There is code in four different places that adjusts tiling coverage rect:
1. LegacyTileCache. This will remain unchanged.
2. FrameView::computeTileCoverageRect(). This was added to do velocity-based
page tiled coverage expansion for iOS WK2.
3. TileController::computeTileCoverageRect(): this is used for the page tiles
on Mac.
4. GraphicsLayerCA::adjustTiledLayerVisibleRect(). This is used by non-page
tiled layers on both iOS and Mac.
This patch reduced this list to 3, coalescing FrameView::computeTileCoverageRect()
and TileController::computeTileCoverageRect(). It removes the rect inflation that
affects the visibleRect passed into rootLayer->flushCompositingState() for iOS,
but the page tiles now do an identical coverage inflation. The visible rect
change does affect visible rect computations for non-page tiled backings, but
a future patch will restore that.
* page/FrameView.cpp:
(WebCore::FrameView::setScrollVelocity):
(WebCore::FrameView::computeCoverageRect): Deleted.
* page/FrameView.h:
* platform/graphics/TiledBacking.h:
(WebCore::VelocityData::VelocityData):
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::setVelocity):
(WebCore::TileController::computeTileCoverageRect):
* platform/graphics/ca/TileController.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::flushPendingLayerChanges):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllerh">trunk/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183172 => 183173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-23 06:02:14 UTC (rev 183172)
+++ trunk/Source/WebCore/ChangeLog 2015-04-23 06:03:22 UTC (rev 183173)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2015-04-22 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Move computeCoverageRect code from FrameView into TileController
+ https://bugs.webkit.org/show_bug.cgi?id=144087
+
+ Reviewed by Benjamin Poulain.
+
+ There is code in four different places that adjusts tiling coverage rect:
+ 1. LegacyTileCache. This will remain unchanged.
+ 2. FrameView::computeTileCoverageRect(). This was added to do velocity-based
+ page tiled coverage expansion for iOS WK2.
+ 3. TileController::computeTileCoverageRect(): this is used for the page tiles
+ on Mac.
+ 4. GraphicsLayerCA::adjustTiledLayerVisibleRect(). This is used by non-page
+ tiled layers on both iOS and Mac.
+
+ This patch reduced this list to 3, coalescing FrameView::computeTileCoverageRect()
+ and TileController::computeTileCoverageRect(). It removes the rect inflation that
+ affects the visibleRect passed into rootLayer->flushCompositingState() for iOS,
+ but the page tiles now do an identical coverage inflation. The visible rect
+ change does affect visible rect computations for non-page tiled backings, but
+ a future patch will restore that.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setScrollVelocity):
+ (WebCore::FrameView::computeCoverageRect): Deleted.
+ * page/FrameView.h:
+ * platform/graphics/TiledBacking.h:
+ (WebCore::VelocityData::VelocityData):
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::setVelocity):
+ (WebCore::TileController::computeTileCoverageRect):
+ * platform/graphics/ca/TileController.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+
</ins><span class="cx"> 2015-04-22 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove OwnPtr and PassOwnPtr use from WebKit/cf, WebKit/mac, and WebKit2
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (183172 => 183173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-04-23 06:02:14 UTC (rev 183172)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-04-23 06:03:22 UTC (rev 183173)
</span><span class="lines">@@ -107,9 +107,6 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "LegacyTileCache.h"
</span><del>-#include "MemoryCache.h"
-#include "MemoryPressureHandler.h"
-#include "SystemMemory.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -4545,55 +4542,9 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::setScrollVelocity(double horizontalVelocity, double verticalVelocity, double scaleChangeRate, double timestamp)
</span><span class="cx"> {
</span><del>- m_horizontalVelocity = horizontalVelocity;
- m_verticalVelocity = verticalVelocity;
- m_scaleChangeRate = scaleChangeRate;
- m_lastVelocityUpdateTime = timestamp;
</del><ins>+ if (TiledBacking* tiledBacking = this->tiledBacking())
+ tiledBacking->setVelocity(VelocityData(horizontalVelocity, verticalVelocity, scaleChangeRate, timestamp));
</ins><span class="cx"> }
</span><del>-
-FloatRect FrameView::computeCoverageRect(double horizontalMargin, double verticalMargin) const
-{
- FloatRect exposedContentRect = this->exposedContentRect();
- if (!m_speculativeTilingEnabled || MemoryPressureHandler::singleton().isUnderMemoryPressure())
- return exposedContentRect;
-
- double currentTime = monotonicallyIncreasingTime();
- double timeDelta = currentTime - m_lastVelocityUpdateTime;
-
- FloatRect futureRect = exposedContentRect;
- futureRect.setLocation(FloatPoint(futureRect.location().x() + timeDelta * m_horizontalVelocity, futureRect.location().y() + timeDelta * m_verticalVelocity));
-
- if (m_horizontalVelocity) {
- futureRect.setWidth(futureRect.width() + horizontalMargin);
- if (m_horizontalVelocity < 0)
- futureRect.setX(futureRect.x() - horizontalMargin);
- }
-
- if (m_verticalVelocity) {
- futureRect.setHeight(futureRect.height() + verticalMargin);
- if (m_verticalVelocity < 0)
- futureRect.setY(futureRect.y() - verticalMargin);
- }
-
- if (m_scaleChangeRate <= 0 && !m_horizontalVelocity && !m_verticalVelocity) {
- futureRect.setWidth(futureRect.width() + horizontalMargin);
- futureRect.setHeight(futureRect.height() + verticalMargin);
- futureRect.setX(futureRect.x() - horizontalMargin / 2);
- futureRect.setY(futureRect.y() - verticalMargin / 2);
- }
-
- IntSize contentSize = contentsSize();
- if (futureRect.maxX() > contentSize.width())
- futureRect.setX(contentSize.width() - futureRect.width());
- if (futureRect.maxY() > contentSize.height())
- futureRect.setY(contentSize.height() - futureRect.height());
- if (futureRect.x() < 0)
- futureRect.setX(0);
- if (futureRect.y() < 0)
- futureRect.setY(0);
-
- return futureRect;
-}
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> void FrameView::setScrollingPerformanceLoggingEnabled(bool flag)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (183172 => 183173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-04-23 06:02:14 UTC (rev 183172)
+++ trunk/Source/WebCore/page/FrameView.h 2015-04-23 06:03:22 UTC (rev 183173)
</span><span class="lines">@@ -139,7 +139,6 @@
</span><span class="cx"> WEBCORE_EXPORT void setCustomSizeForResizeEvent(IntSize);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setScrollVelocity(double horizontalVelocity, double verticalVelocity, double scaleChangeRate, double timestamp);
</span><del>- FloatRect computeCoverageRect(double horizontalMargin, double verticalMargin) const;
</del><span class="cx"> #else
</span><span class="cx"> bool useCustomFixedPositionLayoutRect() const { return false; }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (183172 => 183173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2015-04-23 06:02:14 UTC (rev 183172)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2015-04-23 06:03:22 UTC (rev 183173)
</span><span class="lines">@@ -40,6 +40,21 @@
</span><span class="cx"> AsyncScrollingIndication
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct VelocityData {
+ double horizontalVelocity;
+ double verticalVelocity;
+ double scaleChangeRate;
+ double lastUpdateTime;
+
+ VelocityData(double horizontal = 0, double vertical = 0, double scaleChange = 0, double updateTime = 0)
+ : horizontalVelocity(horizontal)
+ , verticalVelocity(vertical)
+ , scaleChangeRate(scaleChange)
+ , lastUpdateTime(updateTime)
+ {
+ }
+};
+
</ins><span class="cx"> class TiledBacking {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~TiledBacking() { }
</span><span class="lines">@@ -51,6 +66,8 @@
</span><span class="cx"> virtual void setTiledScrollingIndicatorPosition(const FloatPoint&) = 0;
</span><span class="cx"> virtual void setTopContentInset(float) = 0;
</span><span class="cx">
</span><ins>+ virtual void setVelocity(const VelocityData&) = 0;
+
</ins><span class="cx"> virtual void prepopulateRect(const FloatRect&) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void setIsInWindow(bool) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (183172 => 183173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2015-04-23 06:02:14 UTC (rev 183172)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2015-04-23 06:03:22 UTC (rev 183173)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#include "MemoryPressureHandler.h"
</ins><span class="cx"> #include "TileControllerMemoryHandlerIOS.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -198,6 +199,11 @@
</span><span class="cx"> return tileGrid().tilesWouldChangeForVisibleRect(newVisibleRect, m_visibleRect);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TileController::setVelocity(const VelocityData& velocity)
+{
+ m_velocity = velocity;
+}
+
</ins><span class="cx"> void TileController::setTopContentInset(float topContentInset)
</span><span class="cx"> {
</span><span class="cx"> m_topContentInset = topContentInset;
</span><span class="lines">@@ -299,14 +305,59 @@
</span><span class="cx"> if (!m_isInWindow)
</span><span class="cx"> return visibleRect;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ // FIXME: unify the iOS and Mac code.
+ UNUSED_PARAM(previousVisibleRect);
+
+ if (m_tileCoverage == CoverageForVisibleArea || MemoryPressureHandler::singleton().isUnderMemoryPressure())
+ return visibleRect;
+
+ double horizontalMargin = defaultTileWidth / tileGrid().scale();
+ double verticalMargin = defaultTileHeight / tileGrid().scale();
+
+ double currentTime = monotonicallyIncreasingTime();
+ double timeDelta = currentTime - m_velocity.lastUpdateTime;
+
+ FloatRect futureRect = visibleRect;
+ futureRect.setLocation(FloatPoint(
+ futureRect.location().x() + timeDelta * m_velocity.horizontalVelocity,
+ futureRect.location().y() + timeDelta * m_velocity.verticalVelocity));
+
+ if (m_velocity.horizontalVelocity) {
+ futureRect.setWidth(futureRect.width() + horizontalMargin);
+ if (m_velocity.horizontalVelocity < 0)
+ futureRect.setX(futureRect.x() - horizontalMargin);
+ }
+
+ if (m_velocity.verticalVelocity) {
+ futureRect.setHeight(futureRect.height() + verticalMargin);
+ if (m_velocity.verticalVelocity < 0)
+ futureRect.setY(futureRect.y() - verticalMargin);
+ }
+
+ if (m_velocity.scaleChangeRate <= 0 && !m_velocity.horizontalVelocity && !m_velocity.verticalVelocity) {
+ futureRect.setWidth(futureRect.width() + horizontalMargin);
+ futureRect.setHeight(futureRect.height() + verticalMargin);
+ futureRect.setX(futureRect.x() - horizontalMargin / 2);
+ futureRect.setY(futureRect.y() - verticalMargin / 2);
+ }
+
+ IntSize contentSize = bounds().size();
+ if (futureRect.maxX() > contentSize.width())
+ futureRect.setX(contentSize.width() - futureRect.width());
+ if (futureRect.maxY() > contentSize.height())
+ futureRect.setY(contentSize.height() - futureRect.height());
+ if (futureRect.x() < 0)
+ futureRect.setX(0);
+ if (futureRect.y() < 0)
+ futureRect.setY(0);
+
+ return futureRect;
+#else
</ins><span class="cx"> // FIXME: look at how far the document can scroll in each dimension.
</span><span class="cx"> float coverageHorizontalSize = visibleRect.width();
</span><span class="cx"> float coverageVerticalSize = visibleRect.height();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- UNUSED_PARAM(previousVisibleRect);
- return visibleRect;
-#else
</del><span class="cx"> bool largeVisibleRectChange = !previousVisibleRect.isEmpty() && !visibleRect.intersects(previousVisibleRect);
</span><span class="cx">
</span><span class="cx"> // Inflate the coverage rect so that it covers 2x of the visible width and 3x of the visible height.
</span><span class="lines">@@ -318,7 +369,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_tileCoverage & CoverageForVerticalScrolling && !largeVisibleRectChange)
</span><span class="cx"> coverageVerticalSize *= 3;
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> coverageVerticalSize += topMarginHeight() + bottomMarginHeight();
</span><span class="cx"> coverageHorizontalSize += leftMarginWidth() + rightMarginWidth();
</span><span class="cx">
</span><span class="lines">@@ -332,6 +383,7 @@
</span><span class="cx"> coverageTop = std::max(coverageTop, coverageBounds.y());
</span><span class="cx">
</span><span class="cx"> return FloatRect(coverageLeft, coverageTop, coverageHorizontalSize, coverageVerticalSize);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TileController::scheduleTileRevalidation(double interval)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.h (183172 => 183173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.h 2015-04-23 06:02:14 UTC (rev 183172)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.h 2015-04-23 06:03:22 UTC (rev 183173)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx"> virtual bool tilesWouldChangeForVisibleRect(const FloatRect&) const override;
</span><span class="cx"> virtual void setTiledScrollingIndicatorPosition(const FloatPoint&) override;
</span><span class="cx"> virtual void setTopContentInset(float) override;
</span><ins>+ virtual void setVelocity(const VelocityData&) override;
</ins><span class="cx"> virtual void prepopulateRect(const FloatRect&) override;
</span><span class="cx"> virtual void setIsInWindow(bool) override;
</span><span class="cx"> virtual void setTileCoverage(TileCoverage) override;
</span><span class="lines">@@ -182,6 +183,8 @@
</span><span class="cx"> float m_deviceScaleFactor;
</span><span class="cx">
</span><span class="cx"> TileCoverage m_tileCoverage;
</span><ins>+
+ VelocityData m_velocity;
</ins><span class="cx">
</span><span class="cx"> // m_marginTop and m_marginBottom are the height in pixels of the top and bottom margin tiles. The width
</span><span class="cx"> // of those tiles will be equivalent to the width of the other tiles in the grid. m_marginRight and
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (183172 => 183173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-04-23 06:02:14 UTC (rev 183172)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-04-23 06:03:22 UTC (rev 183173)
</span><span class="lines">@@ -458,10 +458,7 @@
</span><span class="cx">
</span><span class="cx"> if (GraphicsLayer* rootLayer = rootGraphicsLayer()) {
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- double horizontalMargin = defaultTileWidth / pageScaleFactor();
- double verticalMargin = defaultTileHeight / pageScaleFactor();
- FloatRect visibleRect = frameView.computeCoverageRect(horizontalMargin, verticalMargin);
- rootLayer->flushCompositingState(visibleRect);
</del><ins>+ rootLayer->flushCompositingState(frameView.exposedContentRect());
</ins><span class="cx"> #else
</span><span class="cx"> // Having a m_clipLayer indicates that we're doing scrolling via GraphicsLayers.
</span><span class="cx"> IntRect visibleRect = m_clipLayer ? IntRect(IntPoint(), frameView.unscaledVisibleContentSizeIncludingObscuredArea()) : frameView.visibleContentRect();
</span></span></pre>
</div>
</div>
</body>
</html>