diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /WebKit/win/WebView.h | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'WebKit/win/WebView.h')
| -rw-r--r-- | WebKit/win/WebView.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h index 424b03a..192c05c 100644 --- a/WebKit/win/WebView.h +++ b/WebKit/win/WebView.h @@ -40,7 +40,7 @@ #include <wtf/RefPtr.h> #if USE(ACCELERATED_COMPOSITING) -#include <WebCore/WKCACFLayer.h> +#include <WebCore/PlatformCALayer.h> #include <WebCore/WKCACFLayerRenderer.h> #endif @@ -904,8 +904,12 @@ public: void downloadURL(const WebCore::KURL&); #if USE(ACCELERATED_COMPOSITING) - void setRootLayerNeedsDisplay() { if (m_layerRenderer) m_layerRenderer->setNeedsDisplay(); } - void setRootChildLayer(WebCore::WKCACFLayer* layer); + void setRootLayerNeedsDisplay(bool sync = false) + { + if (m_layerRenderer) + m_layerRenderer->setNeedsDisplay(sync); + } + void setRootChildLayer(WebCore::PlatformCALayer*); #endif void enterFullscreenForNode(WebCore::Node*); @@ -941,6 +945,8 @@ private: #if USE(ACCELERATED_COMPOSITING) // WKCACFLayerRendererClient virtual bool shouldRender() const; + virtual void animationsStarted(CFTimeInterval); + virtual void syncCompositingState(); #endif protected: |