Index: WebKit/chromium/src/WebViewImpl.h |
=================================================================== |
--- WebKit/chromium/src/WebViewImpl.h (revision 55428) |
+++ WebKit/chromium/src/WebViewImpl.h (working copy) |
@@ -43,9 +43,16 @@ |
#include "ContextMenuClientImpl.h" |
#include "DragClientImpl.h" |
#include "EditorClientImpl.h" |
+#include "GraphicsLayer.h" |
#include "InspectorClientImpl.h" |
#include "NotificationPresenterImpl.h" |
+#if USE(ACCELERATED_COMPOSITING) |
+#if WEBKIT_USING_SKIA |
+#include "skia/LayerRendererSkia.h" |
+#endif |
+#endif |
+ |
#include <wtf/OwnPtr.h> |
#include <wtf/RefCounted.h> |
@@ -296,6 +303,11 @@ |
return m_currentInputEvent; |
} |
+#if USE(ACCELERATED_COMPOSITING) |
+ void setRootLayerNeedsDisplay(); |
+ void setRootGraphicsLayer(WebCore::PlatformLayer* layer); |
+#endif |
+ |
private: |
friend class WebView; // So WebView::Create can call our constructor |
friend class WTF::RefCounted<WebViewImpl>; |
@@ -321,6 +333,12 @@ |
// the HitTestResult for it. |
WebCore::HitTestResult hitTestResultForWindowPos(const WebCore::IntPoint&); |
+#if USE(ACCELERATED_COMPOSITING) |
+ void setAcceleratedCompositing(bool); |
+ bool isAcceleratedCompositing() { return m_isAcceleratedCompositing; } |
+ void updateRootLayerContents(const WebRect& rect); |
+#endif |
+ |
WebViewClient* m_client; |
BackForwardListClientImpl m_backForwardListClientImpl; |
@@ -446,9 +464,14 @@ |
NotificationPresenterImpl m_notificationPresenter; |
#endif |
+#if USE(ACCELERATED_COMPOSITING) |
+ OwnPtr<WebCore::LayerRendererSkia> m_layerRenderer; |
+ bool m_isAcceleratedCompositing; |
+#endif |
+ |
static const WebInputEvent* m_currentInputEvent; |
}; |
} // namespace WebKit |
-#endif |
+#endif |