<!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>[179182] trunk/Source/WebKit2</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/179182">179182</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-27 08:10:17 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/166975">r166975</a>): [GTK] Page overlays are not drawn anymore after <a href="http://trac.webkit.org/projects/webkit/changeset/166975">r166975</a>
https://bugs.webkit.org/show_bug.cgi?id=131433
Reviewed by Žan Doberšek.
Implement page overlays for the GTK+ port.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
Override pure virtual setViewOverlayRootLayer().
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::display): Remove FIXME and use modern
for loop.
(WebKit::DrawingAreaImpl::attachViewOverlayGraphicsLayer): Remove
ifdefs and use LayerTreeHost::setViewOverlayRootLayer().
* WebProcess/WebPage/LayerTreeHost.h: Add pure virtual setViewOverlayRootLayer().
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::LayerTreeHostGtk): Initialize m_viewOverlayRootLayer.
(WebKit::LayerTreeHostGtk::initialize): Remove FIXME.
(WebKit::LayerTreeHostGtk::setNonCompositedContentsNeedDisplay):
Remove unused old page overlays code.
(WebKit::LayerTreeHostGtk::setNonCompositedContentsNeedDisplayInRect): Ditto.
(WebKit::LayerTreeHostGtk::sizeDidChange): Ditto.
(WebKit::LayerTreeHostGtk::paintContents): Remove FIXME.
(WebKit::LayerTreeHostGtk::flushPendingLayerChanges): Flush
compositing state on m_pageOverlayLayers if present.
(WebKit::LayerTreeHostGtk::setViewOverlayRootLayer): Set m_pageOverlayLayers.
(WebKit::LayerTreeHostGtk::createPageOverlayLayer): Deleted.
(WebKit::LayerTreeHostGtk::destroyPageOverlayLayer): Deleted.
* WebProcess/WebPage/gtk/LayerTreeHostGtk.h: Remove unused old
page overlays code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179181 => 179182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-27 15:59:58 UTC (rev 179181)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-27 16:10:17 UTC (rev 179182)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r166975): [GTK] Page overlays are not drawn anymore after r166975
+ https://bugs.webkit.org/show_bug.cgi?id=131433
+
+ Reviewed by Žan Doberšek.
+
+ Implement page overlays for the GTK+ port.
+
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+ Override pure virtual setViewOverlayRootLayer().
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::display): Remove FIXME and use modern
+ for loop.
+ (WebKit::DrawingAreaImpl::attachViewOverlayGraphicsLayer): Remove
+ ifdefs and use LayerTreeHost::setViewOverlayRootLayer().
+ * WebProcess/WebPage/LayerTreeHost.h: Add pure virtual setViewOverlayRootLayer().
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::LayerTreeHostGtk): Initialize m_viewOverlayRootLayer.
+ (WebKit::LayerTreeHostGtk::initialize): Remove FIXME.
+ (WebKit::LayerTreeHostGtk::setNonCompositedContentsNeedDisplay):
+ Remove unused old page overlays code.
+ (WebKit::LayerTreeHostGtk::setNonCompositedContentsNeedDisplayInRect): Ditto.
+ (WebKit::LayerTreeHostGtk::sizeDidChange): Ditto.
+ (WebKit::LayerTreeHostGtk::paintContents): Remove FIXME.
+ (WebKit::LayerTreeHostGtk::flushPendingLayerChanges): Flush
+ compositing state on m_pageOverlayLayers if present.
+ (WebKit::LayerTreeHostGtk::setViewOverlayRootLayer): Set m_pageOverlayLayers.
+ (WebKit::LayerTreeHostGtk::createPageOverlayLayer): Deleted.
+ (WebKit::LayerTreeHostGtk::destroyPageOverlayLayer): Deleted.
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.h: Remove unused old
+ page overlays code.
+
</ins><span class="cx"> 2015-01-27 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><span class="cx"> Remove remaining PLUGIN_ARCHITECTURE(WIN) code blocks from WebKit2.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (179181 => 179182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2015-01-27 15:59:58 UTC (rev 179181)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2015-01-27 16:10:17 UTC (rev 179182)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> virtual void scheduleAnimation() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void setViewOverlayRootLayer(WebCore::GraphicsLayer*);
</del><ins>+ virtual void setViewOverlayRootLayer(WebCore::GraphicsLayer*) override;
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<WebCore::CoordinatedSurface> createCoordinatedSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (179181 => 179182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-01-27 15:59:58 UTC (rev 179181)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-01-27 16:10:17 UTC (rev 179182)
</span><span class="lines">@@ -39,10 +39,6 @@
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx">
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
-#include "ThreadedCoordinatedLayerTreeHost.h"
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -654,12 +650,9 @@
</span><span class="cx">
</span><span class="cx"> graphicsContext->translate(-bounds.x(), -bounds.y());
</span><span class="cx">
</span><del>- for (size_t i = 0; i < rects.size(); ++i) {
- m_webPage.drawRect(*graphicsContext, rects[i]);
-
- // FIXME: Draw page olverlays. https://bugs.webkit.org/show_bug.cgi?id=131433.
-
- updateInfo.updateRects.append(rects[i]);
</del><ins>+ for (const auto& rect : rects) {
+ m_webPage.drawRect(*graphicsContext, rect);
+ updateInfo.updateRects.append(rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Layout can trigger more calls to setNeedsDisplay and we don't want to process them
</span><span class="lines">@@ -669,19 +662,13 @@
</span><span class="cx">
</span><span class="cx"> void DrawingAreaImpl::attachViewOverlayGraphicsLayer(WebCore::Frame* frame, WebCore::GraphicsLayer* viewOverlayRootLayer)
</span><span class="cx"> {
</span><del>-#if USE(COORDINATED_GRAPHICS_THREADED)
</del><span class="cx"> if (!frame->isMainFrame())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_layerTreeHost)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ThreadedCoordinatedLayerTreeHost* coordinatedLayerTreeHost = static_cast<ThreadedCoordinatedLayerTreeHost*>(m_layerTreeHost.get());
- coordinatedLayerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
-#else
- UNUSED_PARAM(frame);
- UNUSED_PARAM(viewOverlayRootLayer);
-#endif
</del><ins>+ m_layerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (179181 => 179182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2015-01-27 15:59:58 UTC (rev 179181)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2015-01-27 16:10:17 UTC (rev 179182)
</span><span class="lines">@@ -93,6 +93,8 @@
</span><span class="cx"> virtual void scheduleAnimation() = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ virtual void setViewOverlayRootLayer(WebCore::GraphicsLayer*) = 0;
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit LayerTreeHost(WebPage*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (179181 => 179182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2015-01-27 15:59:58 UTC (rev 179181)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2015-01-27 16:10:17 UTC (rev 179182)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> , m_notifyAfterScheduledLayerFlush(false)
</span><span class="cx"> , m_lastImmediateFlushTime(0)
</span><span class="cx"> , m_layerFlushSchedulingEnabled(true)
</span><ins>+ , m_viewOverlayRootLayer(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -125,8 +126,6 @@
</span><span class="cx"> static_cast<TextureMapperGL*>(m_textureMapper.get())->setEnableEdgeDistanceAntialiasing(true);
</span><span class="cx"> downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTextureMapper(m_textureMapper.get());
</span><span class="cx">
</span><del>- // FIXME: Cretae page olverlay layers. https://bugs.webkit.org/show_bug.cgi?id=131433.
-
</del><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -179,22 +178,12 @@
</span><span class="cx"> void LayerTreeHostGtk::setNonCompositedContentsNeedDisplay()
</span><span class="cx"> {
</span><span class="cx"> m_nonCompositedContentLayer->setNeedsDisplay();
</span><del>-
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
- it->value->setNeedsDisplay();
-
</del><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LayerTreeHostGtk::setNonCompositedContentsNeedDisplayInRect(const IntRect& rect)
</span><span class="cx"> {
</span><span class="cx"> m_nonCompositedContentLayer->setNeedsDisplayInRect(rect);
</span><del>-
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
- it->value->setNeedsDisplayInRect(rect);
-
</del><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -223,10 +212,6 @@
</span><span class="cx"> m_nonCompositedContentLayer->setNeedsDisplayInRect(FloatRect(0, oldSize.height(), newSize.width(), newSize.height() - oldSize.height()));
</span><span class="cx"> m_nonCompositedContentLayer->setNeedsDisplay();
</span><span class="cx">
</span><del>- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
- it->value->setSize(newSize);
-
</del><span class="cx"> compositeLayersToContext(ForResize);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -243,12 +228,8 @@
</span><span class="cx">
</span><span class="cx"> void LayerTreeHostGtk::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
</span><span class="cx"> {
</span><del>- if (graphicsLayer == m_nonCompositedContentLayer.get()) {
</del><ins>+ if (graphicsLayer == m_nonCompositedContentLayer.get())
</ins><span class="cx"> m_webPage->drawRect(graphicsContext, enclosingIntRect(clipRect));
</span><del>- return;
- }
-
- // FIXME: Draw page overlays. https://bugs.webkit.org/show_bug.cgi?id=131433.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool shouldSkipNextFrameBecauseOfContinousImmediateFlushes(double current, double lastImmediateFlushTime)
</span><span class="lines">@@ -296,13 +277,12 @@
</span><span class="cx"> m_rootLayer->flushCompositingStateForThisLayerOnly();
</span><span class="cx"> m_nonCompositedContentLayer->flushCompositingStateForThisLayerOnly();
</span><span class="cx">
</span><del>- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
- it->value->flushCompositingStateForThisLayerOnly();
-
</del><span class="cx"> if (!m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (m_viewOverlayRootLayer)
+ m_viewOverlayRootLayer->flushCompositingState(FloatRect(FloatPoint(), m_rootLayer->size()));
+
</ins><span class="cx"> downcast<GraphicsLayerTextureMapper>(*m_rootLayer).updateBackingStoreIncludingSubLayers();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -358,31 +338,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LayerTreeHostGtk::createPageOverlayLayer(WebCore::PageOverlay* pageOverlay)
-{
- std::unique_ptr<GraphicsLayer> layer = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
- layer->setName("LayerTreeHost page overlay content");
-#endif
-
- layer->setAcceleratesDrawing(m_webPage->corePage()->settings().acceleratedDrawingEnabled());
- layer->setDrawsContent(true);
- layer->setSize(m_webPage->size());
- layer->setShowDebugBorder(m_webPage->corePage()->settings().showDebugBorders());
- layer->setShowRepaintCounter(m_webPage->corePage()->settings().showRepaintCounter());
-
- m_rootLayer->addChild(layer.get());
- m_pageOverlayLayers.add(pageOverlay, WTF::move(layer));
-}
-
-void LayerTreeHostGtk::destroyPageOverlayLayer(WebCore::PageOverlay* pageOverlay)
-{
- std::unique_ptr<GraphicsLayer> layer = m_pageOverlayLayers.take(pageOverlay);
- ASSERT(layer);
-
- layer->removeFromParent();
-}
-
</del><span class="cx"> void LayerTreeHostGtk::scheduleLayerFlush()
</span><span class="cx"> {
</span><span class="cx"> if (!m_layerFlushSchedulingEnabled)
</span><span class="lines">@@ -418,6 +373,13 @@
</span><span class="cx"> m_layerFlushTimerCallback.cancel();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void LayerTreeHostGtk::setViewOverlayRootLayer(WebCore::GraphicsLayer* viewOverlayRootLayer)
+{
+ m_viewOverlayRootLayer = viewOverlayRootLayer;
+ if (m_viewOverlayRootLayer)
+ m_rootLayer->addChild(m_viewOverlayRootLayer);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (179181 => 179182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2015-01-27 15:59:58 UTC (rev 179181)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2015-01-27 16:10:17 UTC (rev 179182)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> #include "TextureMapperLayer.h"
</span><span class="cx"> #include <WebCore/GLContext.h>
</span><span class="cx"> #include <WebCore/GraphicsLayerClient.h>
</span><del>-#include <WebCore/PageOverlay.h>
-#include <wtf/HashMap.h>
</del><span class="cx"> #include <wtf/gobject/GMainLoopSource.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -71,15 +69,13 @@
</span><span class="cx"> virtual void setNonCompositedContentsNeedDisplay() override;
</span><span class="cx"> virtual void setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect&) override;
</span><span class="cx"> virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect) override;
</span><ins>+ virtual void setViewOverlayRootLayer(WebCore::GraphicsLayer*) override;
</ins><span class="cx">
</span><span class="cx"> // GraphicsLayerClient
</span><span class="cx"> virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect) override;
</span><span class="cx">
</span><span class="cx"> bool flushPendingLayerChanges();
</span><span class="cx">
</span><del>- void createPageOverlayLayer(WebCore::PageOverlay*);
- void destroyPageOverlayLayer(WebCore::PageOverlay*);
-
</del><span class="cx"> enum CompositePurpose { ForResize, NotForResize };
</span><span class="cx"> void compositeLayersToContext(CompositePurpose = NotForResize);
</span><span class="cx">
</span><span class="lines">@@ -95,13 +91,12 @@
</span><span class="cx"> bool m_notifyAfterScheduledLayerFlush;
</span><span class="cx"> std::unique_ptr<WebCore::GraphicsLayer> m_rootLayer;
</span><span class="cx"> std::unique_ptr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
</span><del>- typedef HashMap<WebCore::PageOverlay*, std::unique_ptr<WebCore::GraphicsLayer>> PageOverlayLayerMap;
- PageOverlayLayerMap m_pageOverlayLayers;
</del><span class="cx"> std::unique_ptr<WebCore::TextureMapper> m_textureMapper;
</span><span class="cx"> std::unique_ptr<WebCore::GLContext> m_context;
</span><span class="cx"> double m_lastImmediateFlushTime;
</span><span class="cx"> bool m_layerFlushSchedulingEnabled;
</span><span class="cx"> GMainLoopSource m_layerFlushTimerCallback;
</span><ins>+ WebCore::GraphicsLayer* m_viewOverlayRootLayer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>