Commit a8d0b378 authored by philn@webkit.org's avatar philn@webkit.org
Browse files

Unreviewed GTK build fix after r156560.

Source/WebKit/gtk:

* WebCoreSupport/AcceleratedCompositingContext.h:

Source/WebKit2:

* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::paintContents):
(WebKit::LayerTreeHostGtk::createPageOverlayLayer):
(WebKit::LayerTreeHostGtk::destroyPageOverlayLayer):
* WebProcess/WebPage/gtk/LayerTreeHostGtk.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 20d6f9c1
2013-09-28 Philippe Normand <pnormand@igalia.com>
Unreviewed GTK build fix after r156560.
* WebCoreSupport/AcceleratedCompositingContext.h:
2013-09-26 Darin Adler <darin@apple.com>
rename KURL to URL
......
......@@ -77,8 +77,8 @@ private:
#if USE(TEXTURE_MAPPER_GL)
OwnPtr<WebCore::RedirectedXCompositeWindow> m_redirectedWindow;
OwnPtr<WebCore::GraphicsLayer> m_rootLayer;
OwnPtr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
std::unique_ptr<WebCore::GraphicsLayer> m_rootLayer;
std::unique_ptr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
OwnPtr<WebCore::TextureMapper> m_textureMapper;
double m_lastFlushTime;
double m_redrawPendingTime;
......@@ -92,7 +92,7 @@ private:
void clearEverywhere();
#elif USE(TEXTURE_MAPPER)
WebCore::TextureMapperLayer* m_rootTextureMapperLayer;
OwnPtr<WebCore::GraphicsLayer> m_rootGraphicsLayer;
std::unique_ptr<WebCore::GraphicsLayer> m_rootGraphicsLayer;
OwnPtr<WebCore::TextureMapper> m_textureMapper;
#endif
......
2013-09-28 Philippe Normand <pnormand@igalia.com>
Unreviewed GTK build fix after r156560.
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::paintContents):
(WebKit::LayerTreeHostGtk::createPageOverlayLayer):
(WebKit::LayerTreeHostGtk::destroyPageOverlayLayer):
* WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
2013-09-28 Mark Rowe <mrowe@apple.com>
 
WebKit2 fails to build with newer versions of clang.
......
......@@ -274,15 +274,14 @@ void LayerTreeHostGtk::notifyFlushRequired(const WebCore::GraphicsLayer*)
void LayerTreeHostGtk::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const IntRect& clipRect)
{
if (graphicsLayer == m_nonCompositedContentLayer) {
if (graphicsLayer == m_nonCompositedContentLayer.get()) {
m_webPage->drawRect(graphicsContext, clipRect);
return;
}
PageOverlayLayerMap::iterator end = m_pageOverlayLayers.end();
for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it) {
if (it->value == graphicsLayer) {
m_webPage->drawPageOverlay(it->key, graphicsContext, clipRect);
for (auto& pageOverlayLayer : m_pageOverlayLayers) {
if (pageOverlayLayer.value.get() == graphicsLayer) {
m_webPage->drawPageOverlay(pageOverlayLayer.key, graphicsContext, clipRect);
break;
}
}
......@@ -374,7 +373,7 @@ void LayerTreeHostGtk::flushAndRenderLayers()
void LayerTreeHostGtk::createPageOverlayLayer(PageOverlay* pageOverlay)
{
OwnPtr<GraphicsLayer> layer = GraphicsLayer::create(graphicsLayerFactory(), this);
std::unique_ptr<GraphicsLayer> layer = GraphicsLayer::create(graphicsLayerFactory(), this);
#ifndef NDEBUG
layer->setName("LayerTreeHost page overlay content");
#endif
......@@ -386,12 +385,12 @@ void LayerTreeHostGtk::createPageOverlayLayer(PageOverlay* pageOverlay)
layer->setShowRepaintCounter(m_webPage->corePage()->settings().showRepaintCounter());
m_rootLayer->addChild(layer.get());
m_pageOverlayLayers.add(pageOverlay, layer.release());
m_pageOverlayLayers.add(pageOverlay, std::move(layer));
}
void LayerTreeHostGtk::destroyPageOverlayLayer(PageOverlay* pageOverlay)
{
OwnPtr<GraphicsLayer> layer = m_pageOverlayLayers.take(pageOverlay);
std::unique_ptr<GraphicsLayer> layer = m_pageOverlayLayers.take(pageOverlay);
ASSERT(layer);
layer->removeFromParent();
......
......@@ -99,9 +99,9 @@ private:
LayerTreeContext m_layerTreeContext;
bool m_isValid;
bool m_notifyAfterScheduledLayerFlush;
OwnPtr<WebCore::GraphicsLayer> m_rootLayer;
OwnPtr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
typedef HashMap<PageOverlay*, OwnPtr<WebCore::GraphicsLayer> > PageOverlayLayerMap;
std::unique_ptr<WebCore::GraphicsLayer> m_rootLayer;
std::unique_ptr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
typedef HashMap<PageOverlay*, std::unique_ptr<WebCore::GraphicsLayer>> PageOverlayLayerMap;
PageOverlayLayerMap m_pageOverlayLayers;
OwnPtr<WebCore::TextureMapper> m_textureMapper;
OwnPtr<WebCore::GLContext> m_context;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment