diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebKit/win/WebView.h | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebKit/win/WebView.h')
| -rw-r--r-- | Source/WebKit/win/WebView.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/WebKit/win/WebView.h b/Source/WebKit/win/WebView.h index f775eaf..1a993c6 100644 --- a/Source/WebKit/win/WebView.h +++ b/Source/WebKit/win/WebView.h @@ -40,8 +40,8 @@ #include <wtf/RefPtr.h> #if USE(ACCELERATED_COMPOSITING) +#include <WebCore/CACFLayerTreeHost.h> #include <WebCore/PlatformCALayer.h> -#include <WebCore/WKCACFLayerRenderer.h> #endif class FullscreenVideoController; @@ -71,7 +71,7 @@ class WebView , WebCore::WindowMessageListener #if USE(ACCELERATED_COMPOSITING) , WebCore::GraphicsLayerClient - , WebCore::WKCACFLayerRendererClient + , WebCore::CACFLayerTreeHostClient #endif { public: @@ -905,7 +905,7 @@ public: void downloadURL(const WebCore::KURL&); #if USE(ACCELERATED_COMPOSITING) - void scheduleCompositingLayerSync(); + void flushPendingGraphicsLayerChangesSoon(); void setRootChildLayer(WebCore::GraphicsLayer*); #endif @@ -947,9 +947,8 @@ private: virtual bool showDebugBorders() const; virtual bool showRepaintCounter() const; - // WKCACFLayerRendererClient - virtual bool shouldRender() const; - virtual void syncCompositingState(); + // CACFLayerTreeHostClient + virtual void flushPendingGraphicsLayerChanges(); #endif protected: @@ -1056,7 +1055,7 @@ protected: bool isAcceleratedCompositing() const { return m_isAcceleratedCompositing; } void setAcceleratedCompositing(bool); - OwnPtr<WebCore::WKCACFLayerRenderer> m_layerRenderer; + RefPtr<WebCore::CACFLayerTreeHost> m_layerTreeHost; OwnPtr<WebCore::GraphicsLayer> m_backingLayer; bool m_isAcceleratedCompositing; #endif |