- Revision
- 179182
- Author
- [email protected]
- Date
- 2015-01-27 08:10:17 -0800 (Tue, 27 Jan 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179181 => 179182)
--- 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)
@@ -1,3 +1,36 @@
+2015-01-27 Carlos Garcia Campos <[email protected]>
+
+ 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.
+
2015-01-27 Sungmann Cho <[email protected]>
Remove remaining PLUGIN_ARCHITECTURE(WIN) code blocks from WebKit2.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (179181 => 179182)
--- 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)
@@ -70,7 +70,7 @@
virtual void scheduleAnimation() override;
#endif
- void setViewOverlayRootLayer(WebCore::GraphicsLayer*);
+ virtual void setViewOverlayRootLayer(WebCore::GraphicsLayer*) override;
static PassRefPtr<WebCore::CoordinatedSurface> createCoordinatedSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (179181 => 179182)
--- 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)
@@ -39,10 +39,6 @@
#include <WebCore/Page.h>
#include <WebCore/Settings.h>
-#if USE(COORDINATED_GRAPHICS_THREADED)
-#include "ThreadedCoordinatedLayerTreeHost.h"
-#endif
-
using namespace WebCore;
namespace WebKit {
@@ -654,12 +650,9 @@
graphicsContext->translate(-bounds.x(), -bounds.y());
- 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]);
+ for (const auto& rect : rects) {
+ m_webPage.drawRect(*graphicsContext, rect);
+ updateInfo.updateRects.append(rect);
}
// Layout can trigger more calls to setNeedsDisplay and we don't want to process them
@@ -669,19 +662,13 @@
void DrawingAreaImpl::attachViewOverlayGraphicsLayer(WebCore::Frame* frame, WebCore::GraphicsLayer* viewOverlayRootLayer)
{
-#if USE(COORDINATED_GRAPHICS_THREADED)
if (!frame->isMainFrame())
return;
if (!m_layerTreeHost)
return;
- ThreadedCoordinatedLayerTreeHost* coordinatedLayerTreeHost = static_cast<ThreadedCoordinatedLayerTreeHost*>(m_layerTreeHost.get());
- coordinatedLayerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
-#else
- UNUSED_PARAM(frame);
- UNUSED_PARAM(viewOverlayRootLayer);
-#endif
+ m_layerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
}
#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (179181 => 179182)
--- 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)
@@ -93,6 +93,8 @@
virtual void scheduleAnimation() = 0;
#endif
+ virtual void setViewOverlayRootLayer(WebCore::GraphicsLayer*) = 0;
+
protected:
explicit LayerTreeHost(WebPage*);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (179181 => 179182)
--- 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)
@@ -74,6 +74,7 @@
, m_notifyAfterScheduledLayerFlush(false)
, m_lastImmediateFlushTime(0)
, m_layerFlushSchedulingEnabled(true)
+ , m_viewOverlayRootLayer(nullptr)
{
}
@@ -125,8 +126,6 @@
static_cast<TextureMapperGL*>(m_textureMapper.get())->setEnableEdgeDistanceAntialiasing(true);
downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTextureMapper(m_textureMapper.get());
- // FIXME: Cretae page olverlay layers. https://bugs.webkit.org/show_bug.cgi?id=131433.
-
scheduleLayerFlush();
}
@@ -179,22 +178,12 @@
void LayerTreeHostGtk::setNonCompositedContentsNeedDisplay()
{
m_nonCompositedContentLayer->setNeedsDisplay();
-
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
- it->value->setNeedsDisplay();
-
scheduleLayerFlush();
}
void LayerTreeHostGtk::setNonCompositedContentsNeedDisplayInRect(const IntRect& rect)
{
m_nonCompositedContentLayer->setNeedsDisplayInRect(rect);
-
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
- it->value->setNeedsDisplayInRect(rect);
-
scheduleLayerFlush();
}
@@ -223,10 +212,6 @@
m_nonCompositedContentLayer->setNeedsDisplayInRect(FloatRect(0, oldSize.height(), newSize.width(), newSize.height() - oldSize.height()));
m_nonCompositedContentLayer->setNeedsDisplay();
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
- it->value->setSize(newSize);
-
compositeLayersToContext(ForResize);
}
@@ -243,12 +228,8 @@
void LayerTreeHostGtk::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
{
- if (graphicsLayer == m_nonCompositedContentLayer.get()) {
+ if (graphicsLayer == m_nonCompositedContentLayer.get())
m_webPage->drawRect(graphicsContext, enclosingIntRect(clipRect));
- return;
- }
-
- // FIXME: Draw page overlays. https://bugs.webkit.org/show_bug.cgi?id=131433.
}
static inline bool shouldSkipNextFrameBecauseOfContinousImmediateFlushes(double current, double lastImmediateFlushTime)
@@ -296,13 +277,12 @@
m_rootLayer->flushCompositingStateForThisLayerOnly();
m_nonCompositedContentLayer->flushCompositingStateForThisLayerOnly();
- PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
- for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
- it->value->flushCompositingStateForThisLayerOnly();
-
if (!m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes())
return false;
+ if (m_viewOverlayRootLayer)
+ m_viewOverlayRootLayer->flushCompositingState(FloatRect(FloatPoint(), m_rootLayer->size()));
+
downcast<GraphicsLayerTextureMapper>(*m_rootLayer).updateBackingStoreIncludingSubLayers();
return true;
}
@@ -358,31 +338,6 @@
}
}
-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();
-}
-
void LayerTreeHostGtk::scheduleLayerFlush()
{
if (!m_layerFlushSchedulingEnabled)
@@ -418,6 +373,13 @@
m_layerFlushTimerCallback.cancel();
}
+void LayerTreeHostGtk::setViewOverlayRootLayer(WebCore::GraphicsLayer* viewOverlayRootLayer)
+{
+ m_viewOverlayRootLayer = viewOverlayRootLayer;
+ if (m_viewOverlayRootLayer)
+ m_rootLayer->addChild(m_viewOverlayRootLayer);
+}
+
} // namespace WebKit
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (179181 => 179182)
--- 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)
@@ -34,8 +34,6 @@
#include "TextureMapperLayer.h"
#include <WebCore/GLContext.h>
#include <WebCore/GraphicsLayerClient.h>
-#include <WebCore/PageOverlay.h>
-#include <wtf/HashMap.h>
#include <wtf/gobject/GMainLoopSource.h>
namespace WebKit {
@@ -71,15 +69,13 @@
virtual void setNonCompositedContentsNeedDisplay() override;
virtual void setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect&) override;
virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect) override;
+ virtual void setViewOverlayRootLayer(WebCore::GraphicsLayer*) override;
// GraphicsLayerClient
virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect) override;
bool flushPendingLayerChanges();
- void createPageOverlayLayer(WebCore::PageOverlay*);
- void destroyPageOverlayLayer(WebCore::PageOverlay*);
-
enum CompositePurpose { ForResize, NotForResize };
void compositeLayersToContext(CompositePurpose = NotForResize);
@@ -95,13 +91,12 @@
bool m_notifyAfterScheduledLayerFlush;
std::unique_ptr<WebCore::GraphicsLayer> m_rootLayer;
std::unique_ptr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
- typedef HashMap<WebCore::PageOverlay*, std::unique_ptr<WebCore::GraphicsLayer>> PageOverlayLayerMap;
- PageOverlayLayerMap m_pageOverlayLayers;
std::unique_ptr<WebCore::TextureMapper> m_textureMapper;
std::unique_ptr<WebCore::GLContext> m_context;
double m_lastImmediateFlushTime;
bool m_layerFlushSchedulingEnabled;
GMainLoopSource m_layerFlushTimerCallback;
+ WebCore::GraphicsLayer* m_viewOverlayRootLayer;
};
} // namespace WebKit
