<!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>[167340] 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/167340">167340</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-15 19:04:01 -0700 (Tue, 15 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make page overlay functionality working on coordinated graphics.
https://bugs.webkit.org/show_bug.cgi?id=131425
Patch by Hyowon Kim <hw1008.kim@samsung.com> on 2014-04-15
Reviewed by Darin Adler.
Page overlay functionality did not work on coordinated graphics since <a href="http://trac.webkit.org/projects/webkit/changeset/166975">r166975</a>.
This patch removes deprecated code related to the PageOverlay GraphicsLayer management.
and makes CoordinatedLayerTreeHost use PageOverlayController.
Source/WebCore:
* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
(WebCore::CompositingCoordinator::setRootCompositingLayer):
(WebCore::CompositingCoordinator::flushPendingLayerChanges):
* platform/graphics/texmap/coordinated/CompositingCoordinator.h:
Source/WebKit2:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
(WebKit::CoordinatedDrawingArea::mainFrameContentSizeChanged):
(WebKit::CoordinatedDrawingArea::didInstallPageOverlay): Deleted.
(WebKit::CoordinatedDrawingArea::didUninstallPageOverlay): Deleted.
(WebKit::CoordinatedDrawingArea::setPageOverlayNeedsDisplay): Deleted.
(WebKit::CoordinatedDrawingArea::setPageOverlayOpacity): Deleted.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::setRootCompositingLayer):
(WebKit::CoordinatedLayerTreeHost::didFlushRootLayer):
(WebKit::CoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
(WebKit::CoordinatedLayerTreeHost::didInstallPageOverlay): Deleted.
(WebKit::CoordinatedLayerTreeHost::didUninstallPageOverlay): Deleted.
(WebKit::CoordinatedLayerTreeHost::setPageOverlayNeedsDisplay): Deleted.
(WebKit::CoordinatedLayerTreeHost::setPageOverlayOpacity): Deleted.
(WebKit::CoordinatedLayerTreeHost::createPageOverlayLayer): Deleted.
(WebKit::CoordinatedLayerTreeHost::destroyPageOverlayLayer): Deleted.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
* WebProcess/WebPage/LayerTreeHost.h:
(WebKit::LayerTreeHost::didInstallPageOverlay):
(WebKit::LayerTreeHost::didUninstallPageOverlay):
(WebKit::LayerTreeHost::setPageOverlayNeedsDisplay):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebCore/ChangeLog 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-15 Hyowon Kim <hw1008.kim@samsung.com>
+
+ Make page overlay functionality working on coordinated graphics.
+ https://bugs.webkit.org/show_bug.cgi?id=131425
+
+ Reviewed by Darin Adler.
+
+ Page overlay functionality did not work on coordinated graphics since r166975.
+ This patch removes deprecated code related to the PageOverlay GraphicsLayer management.
+ and makes CoordinatedLayerTreeHost use PageOverlayController.
+
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+ (WebCore::CompositingCoordinator::setRootCompositingLayer):
+ (WebCore::CompositingCoordinator::flushPendingLayerChanges):
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.h:
+
</ins><span class="cx"> 2014-04-10 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Snapshotted plugins may need to be restarted if style properties are changed after initial load of plugin.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -72,14 +72,17 @@
</span><span class="cx"> CoordinatedGraphicsLayer::setShouldSupportContentsTiling(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositingCoordinator::setRootCompositingLayer(GraphicsLayer* layer)
</del><ins>+void CompositingCoordinator::setRootCompositingLayer(GraphicsLayer* compositingLayer, GraphicsLayer* overlayLayer)
</ins><span class="cx"> {
</span><span class="cx"> if (m_rootCompositingLayer)
</span><span class="cx"> m_rootCompositingLayer->removeFromParent();
</span><span class="cx">
</span><del>- m_rootCompositingLayer = layer;
</del><ins>+ m_rootCompositingLayer = compositingLayer;
</ins><span class="cx"> if (m_rootCompositingLayer)
</span><span class="cx"> m_rootLayer->addChildAtIndex(m_rootCompositingLayer, 0);
</span><ins>+
+ if (overlayLayer)
+ m_rootLayer->addChild(overlayLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositingCoordinator::sizeDidChange(const IntSize& newSize)
</span><span class="lines">@@ -95,7 +98,7 @@
</span><span class="cx"> initializeRootCompositingLayerIfNeeded();
</span><span class="cx">
</span><span class="cx"> m_rootLayer->flushCompositingStateForThisLayerOnly();
</span><del>- m_client->didFlushRootLayer();
</del><ins>+ m_client->didFlushRootLayer(m_visibleContentsRect);
</ins><span class="cx">
</span><span class="cx"> bool didSync = m_page->mainFrame().view()->flushCompositingStateIncludingSubframes();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> public:
</span><span class="cx"> class Client {
</span><span class="cx"> public:
</span><del>- virtual void didFlushRootLayer() = 0;
</del><ins>+ virtual void didFlushRootLayer(const FloatRect& visibleContentRect) = 0;
</ins><span class="cx"> virtual void notifyFlushRequired() = 0;
</span><span class="cx"> virtual void commitSceneState(const CoordinatedGraphicsState&) = 0;
</span><span class="cx"> virtual void paintLayerContents(const GraphicsLayer*, GraphicsContext&, const IntRect& clipRect) = 0;
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> CompositingCoordinator(Page*, CompositingCoordinator::Client*);
</span><span class="cx"> virtual ~CompositingCoordinator();
</span><span class="cx">
</span><del>- void setRootCompositingLayer(GraphicsLayer*);
</del><ins>+ void setRootCompositingLayer(GraphicsLayer* compositingLayer, GraphicsLayer* overlayLayer);
</ins><span class="cx"> void sizeDidChange(const IntSize& newSize);
</span><span class="cx"> void deviceOrPageScaleFactorChanged();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-04-15 Hyowon Kim <hw1008.kim@samsung.com>
+
+ Make page overlay functionality working on coordinated graphics.
+ https://bugs.webkit.org/show_bug.cgi?id=131425
+
+ Reviewed by Darin Adler.
+
+ Page overlay functionality did not work on coordinated graphics since r166975.
+ This patch removes deprecated code related to the PageOverlay GraphicsLayer management.
+ and makes CoordinatedLayerTreeHost use PageOverlayController.
+
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
+ (WebKit::CoordinatedDrawingArea::mainFrameContentSizeChanged):
+ (WebKit::CoordinatedDrawingArea::didInstallPageOverlay): Deleted.
+ (WebKit::CoordinatedDrawingArea::didUninstallPageOverlay): Deleted.
+ (WebKit::CoordinatedDrawingArea::setPageOverlayNeedsDisplay): Deleted.
+ (WebKit::CoordinatedDrawingArea::setPageOverlayOpacity): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h:
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::setRootCompositingLayer):
+ (WebKit::CoordinatedLayerTreeHost::didFlushRootLayer):
+ (WebKit::CoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
+ (WebKit::CoordinatedLayerTreeHost::didInstallPageOverlay): Deleted.
+ (WebKit::CoordinatedLayerTreeHost::didUninstallPageOverlay): Deleted.
+ (WebKit::CoordinatedLayerTreeHost::setPageOverlayNeedsDisplay): Deleted.
+ (WebKit::CoordinatedLayerTreeHost::setPageOverlayOpacity): Deleted.
+ (WebKit::CoordinatedLayerTreeHost::createPageOverlayLayer): Deleted.
+ (WebKit::CoordinatedLayerTreeHost::destroyPageOverlayLayer): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+ * WebProcess/WebPage/LayerTreeHost.h:
+ (WebKit::LayerTreeHost::didInstallPageOverlay):
+ (WebKit::LayerTreeHost::didUninstallPageOverlay):
+ (WebKit::LayerTreeHost::setPageOverlayNeedsDisplay):
+
</ins><span class="cx"> 2014-04-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce API::FormClient
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DrawingAreaProxyMessages.h"
</span><span class="cx"> #include "LayerTreeContext.h"
</span><ins>+#include "PageOverlayController.h"
</ins><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "UpdateInfo.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="lines">@@ -213,36 +214,6 @@
</span><span class="cx"> return m_layerTreeHost && m_layerTreeHost->forceRepaintAsync(callbackID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedDrawingArea::didInstallPageOverlay(PageOverlay* pageOverlay)
-{
- if (m_layerTreeHost)
- m_layerTreeHost->didInstallPageOverlay(pageOverlay);
-}
-
-void CoordinatedDrawingArea::didUninstallPageOverlay(PageOverlay* pageOverlay)
-{
- if (m_layerTreeHost)
- m_layerTreeHost->didUninstallPageOverlay(pageOverlay);
-
- setNeedsDisplay();
-}
-
-void CoordinatedDrawingArea::setPageOverlayNeedsDisplay(PageOverlay* pageOverlay, const IntRect& rect)
-{
- if (m_layerTreeHost) {
- m_layerTreeHost->setPageOverlayNeedsDisplay(pageOverlay, rect);
- return;
- }
-
- setNeedsDisplayInRect(rect);
-}
-
-void CoordinatedDrawingArea::setPageOverlayOpacity(PageOverlay* pageOverlay, float value)
-{
- if (m_layerTreeHost)
- m_layerTreeHost->setPageOverlayOpacity(pageOverlay, value);
-}
-
</del><span class="cx"> void CoordinatedDrawingArea::setPaintingEnabled(bool paintingEnabled)
</span><span class="cx"> {
</span><span class="cx"> m_isPaintingEnabled = paintingEnabled;
</span><span class="lines">@@ -253,6 +224,11 @@
</span><span class="cx"> m_webPage->corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CoordinatedDrawingArea::mainFrameContentSizeChanged(const WebCore::IntSize&)
+{
+ m_webPage->pageOverlayController().didChangeDocumentSize();
+}
+
</ins><span class="cx"> void CoordinatedDrawingArea::layerHostDidFlushLayers()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_layerTreeHost);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -55,13 +55,9 @@
</span><span class="cx"> virtual void forceRepaint();
</span><span class="cx"> virtual bool forceRepaintAsync(uint64_t callbackID);
</span><span class="cx">
</span><del>- virtual void didInstallPageOverlay(PageOverlay*);
- virtual void didUninstallPageOverlay(PageOverlay*);
- virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&);
- virtual void setPageOverlayOpacity(PageOverlay*, float);
-
</del><span class="cx"> virtual void setPaintingEnabled(bool);
</span><span class="cx"> virtual void updatePreferences(const WebPreferencesStore&) override;
</span><ins>+ virtual void mainFrameContentSizeChanged(const WebCore::IntSize&) override;
</ins><span class="cx">
</span><span class="cx"> virtual WebCore::GraphicsLayerFactory* graphicsLayerFactory() override;
</span><span class="cx"> virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer* graphicsLayer)
</span><span class="cx"> {
</span><del>- m_coordinator->setRootCompositingLayer(graphicsLayer);
</del><ins>+ m_coordinator->setRootCompositingLayer(graphicsLayer, m_webPage->pageOverlayController().viewOverlayRootLayer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::invalidate()
</span><span class="lines">@@ -155,37 +155,6 @@
</span><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedLayerTreeHost::didInstallPageOverlay(PageOverlay* pageOverlay)
-{
- ASSERT(!m_pageOverlay);
- m_pageOverlay = pageOverlay;
-
- createPageOverlayLayer();
- scheduleLayerFlush();
-}
-
-void CoordinatedLayerTreeHost::didUninstallPageOverlay(PageOverlay*)
-{
- m_pageOverlay = 0;
-
- destroyPageOverlayLayer();
- scheduleLayerFlush();
-}
-
-void CoordinatedLayerTreeHost::setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect& rect)
-{
- ASSERT(m_pageOverlayLayer);
- m_pageOverlayLayer->setNeedsDisplayInRect(rect);
- scheduleLayerFlush();
-}
-
-void CoordinatedLayerTreeHost::setPageOverlayOpacity(PageOverlay*, float value)
-{
- ASSERT(m_pageOverlayLayer);
- m_pageOverlayLayer->setOpacity(value);
- scheduleLayerFlush();
-}
-
</del><span class="cx"> void CoordinatedLayerTreeHost::setVisibleContentsRect(const FloatRect& rect, const FloatPoint& trajectoryVector)
</span><span class="cx"> {
</span><span class="cx"> m_coordinator->setVisibleContentsRect(rect, trajectoryVector);
</span><span class="lines">@@ -204,10 +173,9 @@
</span><span class="cx"> m_coordinator->purgeBackingStores();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedLayerTreeHost::didFlushRootLayer()
</del><ins>+void CoordinatedLayerTreeHost::didFlushRootLayer(const FloatRect& visibleContentRect)
</ins><span class="cx"> {
</span><del>- if (m_pageOverlayLayer)
- m_pageOverlayLayer->flushCompositingStateForThisLayerOnly();
</del><ins>+ m_webPage->pageOverlayController().flushPageOverlayLayers(visibleContentRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::performScheduledLayerFlush()
</span><span class="lines">@@ -238,28 +206,6 @@
</span><span class="cx"> performScheduledLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedLayerTreeHost::createPageOverlayLayer()
-{
- ASSERT(!m_pageOverlayLayer);
-
- m_pageOverlayLayer = GraphicsLayer::create(graphicsLayerFactory(), m_coordinator.get());
-#ifndef NDEBUG
- m_pageOverlayLayer->setName("CompositingCoordinator page overlay content");
-#endif
-
- m_pageOverlayLayer->setDrawsContent(true);
- m_pageOverlayLayer->setSize(m_coordinator->rootLayer()->size());
-
- m_coordinator->rootLayer()->addChild(m_pageOverlayLayer.get());
-}
-
-void CoordinatedLayerTreeHost::destroyPageOverlayLayer()
-{
- ASSERT(m_pageOverlayLayer);
- m_pageOverlayLayer->removeFromParent();
- m_pageOverlayLayer = nullptr;
-}
-
</del><span class="cx"> void CoordinatedLayerTreeHost::paintLayerContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, const IntRect& clipRect)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -278,8 +224,7 @@
</span><span class="cx"> void CoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged()
</span><span class="cx"> {
</span><span class="cx"> m_coordinator->deviceOrPageScaleFactorChanged();
</span><del>- if (m_pageOverlayLayer)
- m_pageOverlayLayer->deviceOrPageScaleFactorChanged();
</del><ins>+ m_webPage->pageOverlayController().didChangeDeviceScaleFactor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::pageBackgroundTransparencyChanged()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -57,11 +57,6 @@
</span><span class="cx"> virtual bool forceRepaintAsync(uint64_t callbackID);
</span><span class="cx"> virtual void sizeDidChange(const WebCore::IntSize& newSize);
</span><span class="cx">
</span><del>- virtual void didInstallPageOverlay(PageOverlay*);
- virtual void didUninstallPageOverlay(PageOverlay*);
- virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&);
- virtual void setPageOverlayOpacity(PageOverlay*, float);
-
</del><span class="cx"> virtual void pauseRendering() { m_isSuspended = true; }
</span><span class="cx"> virtual void resumeRendering() { m_isSuspended = false; scheduleLayerFlush(); }
</span><span class="cx"> virtual void deviceOrPageScaleFactorChanged() override;
</span><span class="lines">@@ -83,8 +78,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // CoordinatedLayerTreeHost
</span><del>- void createPageOverlayLayer();
- void destroyPageOverlayLayer();
</del><span class="cx"> void cancelPendingLayerFlush();
</span><span class="cx"> void performScheduledLayerFlush();
</span><span class="cx"> void setVisibleContentsRect(const WebCore::FloatRect&, const WebCore::FloatPoint&);
</span><span class="lines">@@ -95,17 +88,13 @@
</span><span class="cx"> void layerFlushTimerFired(WebCore::Timer<CoordinatedLayerTreeHost>*);
</span><span class="cx">
</span><span class="cx"> // CompositingCoordinator::Client
</span><del>- virtual void didFlushRootLayer() override;
</del><ins>+ virtual void didFlushRootLayer(const WebCore::FloatRect& visibleContentRect) override;
</ins><span class="cx"> virtual void notifyFlushRequired() override { scheduleLayerFlush(); };
</span><span class="cx"> virtual void commitSceneState(const WebCore::CoordinatedGraphicsState&) override;
</span><span class="cx"> virtual void paintLayerContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, const WebCore::IntRect& clipRect) override;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::CompositingCoordinator> m_coordinator;
</span><span class="cx">
</span><del>- // The page overlay layer. Will be null if there's no page overlay.
- std::unique_ptr<WebCore::GraphicsLayer> m_pageOverlayLayer;
- RefPtr<PageOverlay> m_pageOverlay;
-
</del><span class="cx"> bool m_notifyAfterScheduledLayerFlush;
</span><span class="cx"> bool m_isValid;
</span><span class="cx"> bool m_isSuspended;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (167339 => 167340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2014-04-16 00:26:11 UTC (rev 167339)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2014-04-16 02:04:01 UTC (rev 167340)
</span><span class="lines">@@ -74,9 +74,9 @@
</span><span class="cx"> virtual void deviceOrPageScaleFactorChanged() = 0;
</span><span class="cx"> virtual void pageBackgroundTransparencyChanged() = 0;
</span><span class="cx">
</span><del>- virtual void didInstallPageOverlay(PageOverlay*) = 0;
- virtual void didUninstallPageOverlay(PageOverlay*) = 0;
- virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&) = 0;
</del><ins>+ virtual void didInstallPageOverlay(PageOverlay*) { }
+ virtual void didUninstallPageOverlay(PageOverlay*) { }
+ virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&) { }
</ins><span class="cx"> virtual void setPageOverlayOpacity(PageOverlay*, float) { }
</span><span class="cx">
</span><span class="cx"> virtual void pauseRendering() { }
</span></span></pre>
</div>
</div>
</body>
</html>