Index: webkit/renderer/compositor_bindings/web_compositor_support_impl.h |
diff --git a/webkit/renderer/compositor_bindings/web_compositor_support_impl.h b/webkit/renderer/compositor_bindings/web_compositor_support_impl.h |
index 8e6e2cde6ff598797a91c7b15657bb53e0a306ff..276a59069d0821b4b465d80267c52f0131720947 100644 |
--- a/webkit/renderer/compositor_bindings/web_compositor_support_impl.h |
+++ b/webkit/renderer/compositor_bindings/web_compositor_support_impl.h |
@@ -11,41 +11,41 @@ |
#include "third_party/WebKit/public/platform/WebLayer.h" |
#include "third_party/WebKit/public/platform/WebTransformOperations.h" |
-namespace WebKit { |
+namespace blink { |
class WebGraphicsContext3D; |
} |
namespace webkit { |
-class WebCompositorSupportImpl : public WebKit::WebCompositorSupport { |
+class WebCompositorSupportImpl : public blink::WebCompositorSupport { |
public: |
WebCompositorSupportImpl(); |
virtual ~WebCompositorSupportImpl(); |
- virtual WebKit::WebLayer* createLayer(); |
- virtual WebKit::WebContentLayer* createContentLayer( |
- WebKit::WebContentLayerClient* client); |
- virtual WebKit::WebExternalTextureLayer* createExternalTextureLayer( |
- WebKit::WebExternalTextureLayerClient* client); |
- virtual WebKit::WebImageLayer* createImageLayer(); |
- virtual WebKit::WebNinePatchLayer* createNinePatchLayer(); |
- virtual WebKit::WebSolidColorLayer* createSolidColorLayer(); |
- virtual WebKit::WebScrollbarLayer* createScrollbarLayer( |
- WebKit::WebScrollbar* scrollbar, |
- WebKit::WebScrollbarThemePainter painter, |
- WebKit::WebScrollbarThemeGeometry*); |
- virtual WebKit::WebScrollbarLayer* createSolidColorScrollbarLayer( |
- WebKit::WebScrollbar::Orientation orientation, int thumb_thickness, |
+ virtual blink::WebLayer* createLayer(); |
+ virtual blink::WebContentLayer* createContentLayer( |
+ blink::WebContentLayerClient* client); |
+ virtual blink::WebExternalTextureLayer* createExternalTextureLayer( |
+ blink::WebExternalTextureLayerClient* client); |
+ virtual blink::WebImageLayer* createImageLayer(); |
+ virtual blink::WebNinePatchLayer* createNinePatchLayer(); |
+ virtual blink::WebSolidColorLayer* createSolidColorLayer(); |
+ virtual blink::WebScrollbarLayer* createScrollbarLayer( |
+ blink::WebScrollbar* scrollbar, |
+ blink::WebScrollbarThemePainter painter, |
+ blink::WebScrollbarThemeGeometry*); |
+ virtual blink::WebScrollbarLayer* createSolidColorScrollbarLayer( |
+ blink::WebScrollbar::Orientation orientation, int thumb_thickness, |
bool is_left_side_vertical_scrollbar); |
- virtual WebKit::WebAnimation* createAnimation( |
- const WebKit::WebAnimationCurve& curve, |
- WebKit::WebAnimation::TargetProperty target, |
+ virtual blink::WebAnimation* createAnimation( |
+ const blink::WebAnimationCurve& curve, |
+ blink::WebAnimation::TargetProperty target, |
int animation_id); |
- virtual WebKit::WebFilterAnimationCurve* createFilterAnimationCurve(); |
- virtual WebKit::WebFloatAnimationCurve* createFloatAnimationCurve(); |
- virtual WebKit::WebTransformAnimationCurve* createTransformAnimationCurve(); |
- virtual WebKit::WebTransformOperations* createTransformOperations(); |
- virtual WebKit::WebFilterOperations* createFilterOperations(); |
+ virtual blink::WebFilterAnimationCurve* createFilterAnimationCurve(); |
+ virtual blink::WebFloatAnimationCurve* createFloatAnimationCurve(); |
+ virtual blink::WebTransformAnimationCurve* createTransformAnimationCurve(); |
+ virtual blink::WebTransformOperations* createTransformOperations(); |
+ virtual blink::WebFilterOperations* createFilterOperations(); |
private: |
DISALLOW_COPY_AND_ASSIGN(WebCompositorSupportImpl); |