<!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>[166958] trunk/Source</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/166958">166958</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 13:50:47 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove exposedRect from TileController
https://bugs.webkit.org/show_bug.cgi?id=131378
Reviewed by Simon Fraser.
Source/WebCore:
Having two separate visible rectangles is confusing. We should compute one on higher level.
* page/FrameView.cpp:
(WebCore::FrameView::setExposedRect):
Push exposed rect to tile controller by doing a layer flush (like the changed visible rect is normally passed).
* platform/graphics/TiledBacking.h:
* platform/graphics/ca/mac/TileController.h:
* platform/graphics/ca/mac/TileController.mm:
Remove exposedRect and just use visibleRect.
(WebCore::TileController::TileController):
(WebCore::TileController::setTiledScrollingIndicatorPosition):
Update the scrolling indicator position.
(WebCore::TileController::updateTileCoverageMap):
(WebCore::TileController::setExposedRect): Deleted.
* platform/graphics/ca/mac/TileGrid.h:
* platform/graphics/ca/mac/TileGrid.mm:
(WebCore::TileGrid::tilesWouldChangeForVisibleRect):
(WebCore::TileGrid::revalidateTiles):
(WebCore::TileGrid::scaledExposedRect): Deleted.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::RenderLayerBacking):
No need to push exposedRect anymore.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::flushPendingLayerChanges):
Integrate exposed rect to visible rect when flushing layers.
Source/WebKit2:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::updateScrolledExposedRect):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::updateScrolledExposedRect):
Update the visible rect for pageOverlayLayers by calling flushCompositingState. This way
tile controller visible rect updates always happens via compositing flush (we assert
for this in TileController::setVisibleRect).</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="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileControllerh">trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileControllermm">trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileGridh">trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileGridmm">trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-04-08 Antti Koivisto <antti@apple.com>
+
+ Remove exposedRect from TileController
+ https://bugs.webkit.org/show_bug.cgi?id=131378
+
+ Reviewed by Simon Fraser.
+
+ Having two separate visible rectangles is confusing. We should compute one on higher level.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setExposedRect):
+
+ Push exposed rect to tile controller by doing a layer flush (like the changed visible rect is normally passed).
+
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/ca/mac/TileController.h:
+ * platform/graphics/ca/mac/TileController.mm:
+
+ Remove exposedRect and just use visibleRect.
+
+ (WebCore::TileController::TileController):
+ (WebCore::TileController::setTiledScrollingIndicatorPosition):
+
+ Update the scrolling indicator position.
+
+ (WebCore::TileController::updateTileCoverageMap):
+ (WebCore::TileController::setExposedRect): Deleted.
+ * platform/graphics/ca/mac/TileGrid.h:
+ * platform/graphics/ca/mac/TileGrid.mm:
+ (WebCore::TileGrid::tilesWouldChangeForVisibleRect):
+ (WebCore::TileGrid::revalidateTiles):
+ (WebCore::TileGrid::scaledExposedRect): Deleted.
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::RenderLayerBacking):
+
+ No need to push exposedRect anymore.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+
+ Integrate exposed rect to visible rect when flushing layers.
+
</ins><span class="cx"> 2014-04-08 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Always do a full GC when simulating memory pressure.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -4290,14 +4290,16 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_exposedRect == exposedRect)
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> m_exposedRect = exposedRect;
</span><span class="cx">
</span><span class="cx"> // FIXME: We should support clipping to the exposed rect for subframes as well.
</span><del>- if (m_frame->isMainFrame()) {
- if (TiledBacking* tiledBacking = this->tiledBacking())
- tiledBacking->setExposedRect(exposedRect);
- }
</del><ins>+ if (!m_frame->isMainFrame())
+ return;
+ if (TiledBacking* tiledBacking = this->tiledBacking())
+ tiledBacking->setTiledScrollingIndicatorPosition(exposedRect.location());
+
+ if (auto* view = renderView())
+ view->compositor().scheduleLayerFlush(false /* canThrottle */);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> virtual FloatRect visibleRect() const = 0;
</span><span class="cx"> virtual bool tilesWouldChangeForVisibleRect(const FloatRect&) const = 0;
</span><span class="cx">
</span><del>- virtual void setExposedRect(const FloatRect&) = 0;
</del><ins>+ virtual void setTiledScrollingIndicatorPosition(const FloatPoint&) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void prepopulateRect(const FloatRect&) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> bool isInWindow() const { return m_isInWindow; }
</span><span class="cx">
</span><span class="cx"> float deviceScaleFactor() const { return m_deviceScaleFactor; }
</span><del>- FloatRect exposedRect() const { return m_exposedRect; }
</del><span class="cx">
</span><span class="cx"> Color tileDebugBorderColor() const { return m_tileDebugBorderColor; }
</span><span class="cx"> float tileDebugBorderWidth() const { return m_tileDebugBorderWidth; }
</span><span class="lines">@@ -133,7 +132,7 @@
</span><span class="cx"> // TiledBacking member functions.
</span><span class="cx"> virtual void setVisibleRect(const FloatRect&) override;
</span><span class="cx"> virtual bool tilesWouldChangeForVisibleRect(const FloatRect&) const override;
</span><del>- virtual void setExposedRect(const FloatRect&) override;
</del><ins>+ virtual void setTiledScrollingIndicatorPosition(const FloatPoint&) 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">@@ -184,7 +183,7 @@
</span><span class="cx"> IntSize m_tileSize;
</span><span class="cx"> FloatRect m_visibleRect;
</span><span class="cx"> FloatRect m_visibleRectAtLastRevalidate;
</span><del>- FloatRect m_exposedRect; // The exposed area of containing platform views.
</del><ins>+ FloatPoint m_tiledScrollingIndicatorPosition;
</ins><span class="cx"> IntRect m_boundsAtLastRevalidate;
</span><span class="cx">
</span><span class="cx"> Timer<TileController> m_tileRevalidationTimer;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> : m_tileCacheLayer(rootPlatformLayer)
</span><span class="cx"> , m_tileGrid(std::make_unique<TileGrid>(*this))
</span><span class="cx"> , m_tileSize(defaultTileWidth, defaultTileHeight)
</span><del>- , m_exposedRect(FloatRect::infiniteRect())
</del><span class="cx"> , m_tileRevalidationTimer(this, &TileController::tileRevalidationTimerFired)
</span><span class="cx"> , m_contentsScale(1)
</span><span class="cx"> , m_deviceScaleFactor(1)
</span><span class="lines">@@ -213,13 +212,12 @@
</span><span class="cx"> return tileGrid().tilesWouldChangeForVisibleRect(newVisibleRect, m_visibleRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TileController::setExposedRect(const FloatRect& exposedRect)
</del><ins>+void TileController::setTiledScrollingIndicatorPosition(const FloatPoint& position)
</ins><span class="cx"> {
</span><del>- if (m_exposedRect == exposedRect)
</del><ins>+ if (m_tiledScrollingIndicatorPosition == position)
</ins><span class="cx"> return;
</span><del>-
- m_exposedRect = exposedRect;
- setNeedsRevalidateTiles();
</del><ins>+ m_tiledScrollingIndicatorPosition = position;
+ updateTileCoverageMap();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TileController::prepopulateRect(const FloatRect& rect)
</span><span class="lines">@@ -418,8 +416,6 @@
</span><span class="cx"> return;
</span><span class="cx"> FloatRect containerBounds = bounds();
</span><span class="cx"> FloatRect visibleRect = this->visibleRect();
</span><del>-
- visibleRect.intersect(tileGrid().scaledExposedRect());
</del><span class="cx"> visibleRect.contract(4, 4); // Layer is positioned 2px from top and left edges.
</span><span class="cx">
</span><span class="cx"> float widthScale = 1;
</span><span class="lines">@@ -433,11 +429,7 @@
</span><span class="cx"> FloatRect mapBounds = containerBounds;
</span><span class="cx"> mapBounds.scale(indicatorScale, indicatorScale);
</span><span class="cx">
</span><del>- if (!m_exposedRect.isInfinite())
- m_tiledScrollingIndicatorLayer->setPosition(m_exposedRect.location() + FloatPoint(2, 2));
- else
- m_tiledScrollingIndicatorLayer->setPosition(FloatPoint(2, 2));
-
</del><ins>+ m_tiledScrollingIndicatorLayer->setPosition(m_tiledScrollingIndicatorPosition + FloatPoint(2, 2));
</ins><span class="cx"> m_tiledScrollingIndicatorLayer->setBounds(mapBounds);
</span><span class="cx"> m_tiledScrollingIndicatorLayer->setNeedsDisplay();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.h (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.h 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.h 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -61,8 +61,6 @@
</span><span class="cx"> void revalidateTiles(TileValidationPolicyFlags);
</span><span class="cx"> bool tilesWouldChangeForVisibleRect(const FloatRect& newVisibleRect, const FloatRect& oldVisibleRect) const;
</span><span class="cx">
</span><del>- FloatRect scaledExposedRect() const;
-
</del><span class="cx"> IntRect tileCoverageRect() const;
</span><span class="cx"> IntRect extent() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileGridmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.mm (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.mm 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileGrid.mm 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -166,7 +166,6 @@
</span><span class="cx"> bool TileGrid::tilesWouldChangeForVisibleRect(const FloatRect& newVisibleRect, const FloatRect& oldVisibleRect) const
</span><span class="cx"> {
</span><span class="cx"> FloatRect visibleRect = newVisibleRect;
</span><del>- visibleRect.intersect(scaledExposedRect());
</del><span class="cx">
</span><span class="cx"> if (visibleRect.isEmpty())
</span><span class="cx"> return false;
</span><span class="lines">@@ -185,13 +184,6 @@
</span><span class="cx"> return coverageRect != m_primaryTileCoverageRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect TileGrid::scaledExposedRect() const
-{
- FloatRect scaledExposedRect = m_controller.exposedRect();
- scaledExposedRect.scale(1 / m_scale);
- return scaledExposedRect;
-}
-
</del><span class="cx"> bool TileGrid::prepopulateRect(const FloatRect& rect)
</span><span class="cx"> {
</span><span class="cx"> FloatRect scaledRect(rect);
</span><span class="lines">@@ -341,8 +333,6 @@
</span><span class="cx"> FloatRect visibleRect = m_controller.visibleRect();
</span><span class="cx"> IntRect bounds = m_controller.bounds();
</span><span class="cx">
</span><del>- visibleRect.intersect(scaledExposedRect());
-
</del><span class="cx"> if (visibleRect.isEmpty() || bounds.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -136,10 +136,8 @@
</span><span class="cx">
</span><span class="cx"> tiledBacking->setIsInWindow(page->isInWindow());
</span><span class="cx">
</span><del>- if (m_isMainFrameRenderViewLayer) {
- tiledBacking->setExposedRect(renderer().frame().view()->exposedRect());
</del><ins>+ if (m_isMainFrameRenderViewLayer)
</ins><span class="cx"> tiledBacking->setUnparentsOffscreenTiles(true);
</span><del>- }
</del><span class="cx">
</span><span class="cx"> tiledBacking->setScrollingPerformanceLoggingEnabled(page->settings().scrollingPerformanceLoggingEnabled());
</span><span class="cx"> adjustTiledBackingCoverage();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -433,6 +433,8 @@
</span><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.contentsSize()) : frameView.visibleContentRect();
</span><ins>+ if (!frameView.exposedRect().isInfinite())
+ visibleRect.intersect(IntRect(frameView.exposedRect()));
</ins><span class="cx"> rootLayer->flushCompositingState(visibleRect);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-08 Antti Koivisto <antti@apple.com>
+
+ Remove exposedRect from TileController
+ https://bugs.webkit.org/show_bug.cgi?id=131378
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::updateScrolledExposedRect):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::updateScrolledExposedRect):
+
+ Update the visible rect for pageOverlayLayers by calling flushCompositingState. This way
+ tile controller visible rect updates always happens via compositing flush (we assert
+ for this in TileController::setVisibleRect).
+
</ins><span class="cx"> 2014-04-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> FlagsChanged events are not delivered to input methods when using async text input
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -284,11 +284,9 @@
</span><span class="cx">
</span><span class="cx"> frameView->setExposedRect(m_scrolledExposedRect);
</span><span class="cx">
</span><del>- for (const auto& layer : m_pageOverlayLayers.values()) {
- if (TiledBacking* tiledBacking = layer->tiledBacking())
- tiledBacking->setExposedRect(m_scrolledExposedRect);
- }
-
</del><ins>+ for (const auto& layer : m_pageOverlayLayers.values())
+ layer->flushCompositingState(m_scrolledExposedRect);
+
</ins><span class="cx"> frameView->adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (166957 => 166958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-04-08 20:36:17 UTC (rev 166957)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-04-08 20:50:47 UTC (rev 166958)
</span><span class="lines">@@ -450,10 +450,8 @@
</span><span class="cx">
</span><span class="cx"> frameView->setExposedRect(m_scrolledExposedRect);
</span><span class="cx">
</span><del>- for (const auto& layer : m_pageOverlayLayers.values()) {
- if (TiledBacking* tiledBacking = layer->tiledBacking())
- tiledBacking->setExposedRect(m_scrolledExposedRect);
- }
</del><ins>+ for (const auto& layer : m_pageOverlayLayers.values())
+ layer->flushCompositingState(m_scrolledExposedRect);
</ins><span class="cx">
</span><span class="cx"> frameView->adjustTiledBackingCoverage();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>