diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:15:52 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:16:06 +0100 |
| commit | de4f791e30be4e4239b381c11745ffa4d87ddb8b (patch) | |
| tree | 885e3a5d6670828b454cf676b4d42f78e28b1f0e /Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h | |
| parent | b022df48697d40cdabdeafb2c29bb14fe489b6fe (diff) | |
| download | qtwebkit-de4f791e30be4e4239b381c11745ffa4d87ddb8b.tar.gz | |
Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)
Revert back to an older snapshot that should build on ARM
Diffstat (limited to 'Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h b/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h index 1dccbbcf9..ebe4ca391 100644 --- a/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h +++ b/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h @@ -120,9 +120,6 @@ private: void renderNextFrame(); void purgeBackingStores(); - PassRefPtr<CoordinatedBackingStore> getBackingStore(WebLayerID); - void removeBackingStoreIfNeeded(WebLayerID, int tileID); - typedef HashMap<WebLayerID, WebCore::GraphicsLayer*> LayerMap; WebCore::FloatSize m_contentsSize; WebCore::FloatRect m_visibleContentsRect; @@ -131,10 +128,12 @@ private: Vector<Function<void()> > m_renderQueue; Mutex m_renderQueueMutex; +#if USE(TEXTURE_MAPPER) OwnPtr<WebCore::TextureMapper> m_textureMapper; + PassRefPtr<CoordinatedBackingStore> getBackingStore(WebLayerID); HashMap<int64_t, RefPtr<WebCore::TextureMapperBackingStore> > m_directlyCompositedImages; HashSet<RefPtr<CoordinatedBackingStore> > m_backingStoresWithPendingBuffers; - +#endif #if USE(GRAPHICS_SURFACE) typedef HashMap<WebLayerID, RefPtr<WebCore::TextureMapperSurfaceBackingStore> > SurfaceBackingStoreMap; SurfaceBackingStoreMap m_surfaceBackingStores; |