diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/DrawingAreaProxy.h')
-rw-r--r-- | Source/WebKit2/UIProcess/DrawingAreaProxy.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.h b/Source/WebKit2/UIProcess/DrawingAreaProxy.h index e78c3cdf0..8b8dc2b0d 100644 --- a/Source/WebKit2/UIProcess/DrawingAreaProxy.h +++ b/Source/WebKit2/UIProcess/DrawingAreaProxy.h @@ -74,6 +74,8 @@ public: // FIXME: These should be pure virtual. virtual void visibilityDidChange() { } + virtual void layerHostingModeDidChange() { } + virtual void setBackingStoreIsDiscardable(bool) { } virtual void waitForBackingStoreUpdateOnNextPaint() { } @@ -83,7 +85,7 @@ public: virtual void pageCustomRepresentationChanged() { } -#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) +#if USE(UI_SIDE_COMPOSITING) virtual void updateViewport(); virtual WebCore::IntRect viewportVisibleRect() const { return contentsRect(); } virtual WebCore::IntRect contentsRect() const; @@ -91,8 +93,6 @@ public: virtual void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float, const WebCore::FloatRect&) { } virtual void paintLayerTree(BackingStore::PlatformGraphicsContext) { } LayerTreeHostProxy* layerTreeHostProxy() const { return m_layerTreeHostProxy.get(); } - -#if USE(TILED_BACKING_STORE) virtual void setVisibleContentsRectForScaling(const WebCore::IntRect& visibleContentsRect, float scale) { } virtual void setVisibleContentsRectForPanning(const WebCore::IntRect& visibleContentsRect, const WebCore::FloatPoint& trajectoryVector) { } virtual void createTileForLayer(int layerID, int tileID, const WebKit::UpdateInfo&) { } @@ -102,7 +102,6 @@ public: WebPageProxy* page() { return m_webPageProxy; } #endif -#endif protected: explicit DrawingAreaProxy(DrawingAreaType, WebPageProxy*); @@ -112,7 +111,7 @@ protected: WebCore::IntSize m_size; WebCore::IntSize m_scrollOffset; -#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) +#if USE(UI_SIDE_COMPOSITING) OwnPtr<LayerTreeHostProxy> m_layerTreeHostProxy; #endif @@ -126,6 +125,7 @@ private: #if USE(ACCELERATED_COMPOSITING) virtual void enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) { } virtual void exitAcceleratedCompositingMode(uint64_t backingStoreStateID, const UpdateInfo&) { } + virtual void updateAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) { } #endif #if PLATFORM(MAC) virtual void didUpdateGeometry() { } |