diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h index 1372f2a29..9beeb3d0c 100644 --- a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h +++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h @@ -73,6 +73,7 @@ public: virtual void setNonCompositedContentsNeedDisplay(const WebCore::IntRect&) = 0; virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset) = 0; virtual void forceRepaint() = 0; + virtual bool forceRepaintAsync(uint64_t callbackID) { return false; } virtual void sizeDidChange(const WebCore::IntSize& newSize) = 0; virtual void deviceScaleFactorDidChange() = 0; @@ -85,7 +86,7 @@ public: virtual void pauseRendering() { } virtual void resumeRendering() { } -#if USE(UI_SIDE_COMPOSITING) +#if USE(COORDINATED_GRAPHICS) virtual void setVisibleContentsRect(const WebCore::IntRect&, float scale, const WebCore::FloatPoint&) { } virtual void setVisibleContentsRectForLayer(int layerID, const WebCore::IntRect&) { } virtual void renderNextFrame() { } @@ -105,7 +106,7 @@ public: virtual WebCore::GraphicsDeviceAdapter* graphicsDeviceAdapter() const { return 0; } #endif -#if USE(UI_SIDE_COMPOSITING) +#if USE(COORDINATED_GRAPHICS) virtual void scheduleAnimation() = 0; #endif @@ -114,12 +115,12 @@ protected: WebPage* m_webPage; -#if USE(UI_SIDE_COMPOSITING) +#if USE(COORDINATED_GRAPHICS) bool m_waitingForUIProcess; #endif }; -#if !PLATFORM(WIN) && !PLATFORM(QT) +#if !PLATFORM(WIN) && !USE(COORDINATED_GRAPHICS) inline bool LayerTreeHost::supportsAcceleratedCompositing() { return true; |