| Index: webkit/renderer/compositor_bindings/web_layer_impl.h
|
| diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.h b/webkit/renderer/compositor_bindings/web_layer_impl.h
|
| index b92b0bfc08401c587e6d73a1be214b2c4941431e..a0a23008e3d3745e5b28f18d7b97baf2557fdbda 100644
|
| --- a/webkit/renderer/compositor_bindings/web_layer_impl.h
|
| +++ b/webkit/renderer/compositor_bindings/web_layer_impl.h
|
| @@ -5,9 +5,13 @@
|
| #ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
|
| #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
|
|
|
| +#include <string>
|
| +
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "cc/layers/layer_client.h"
|
| #include "third_party/WebKit/public/platform/WebAnimation.h"
|
| +#include "third_party/WebKit/public/platform/WebCString.h"
|
| #include "third_party/WebKit/public/platform/WebColor.h"
|
| #include "third_party/WebKit/public/platform/WebCompositingReasons.h"
|
| #include "third_party/WebKit/public/platform/WebFloatPoint.h"
|
| @@ -34,7 +38,7 @@ namespace webkit {
|
|
|
| class WebToCCAnimationDelegateAdapter;
|
|
|
| -class WebLayerImpl : public WebKit::WebLayer {
|
| +class WebLayerImpl : public WebKit::WebLayer, public cc::LayerClient {
|
| public:
|
| WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerImpl();
|
| WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerImpl(
|
| @@ -82,7 +86,6 @@ class WebLayerImpl : public WebKit::WebLayer {
|
| virtual void setFilter(SkImageFilter* filter);
|
| virtual void setFilters(const WebKit::WebFilterOperations& filters);
|
| virtual void setBackgroundFilters(const WebKit::WebFilterOperations& filters);
|
| - virtual void setDebugName(WebKit::WebString name);
|
| virtual void setCompositingReasons(WebKit::WebCompositingReasons);
|
| virtual void setAnimationDelegate(WebKit::WebAnimationDelegate* delegate);
|
| virtual bool addAnimation(WebKit::WebAnimation* animation);
|
| @@ -117,9 +120,14 @@ class WebLayerImpl : public WebKit::WebLayer {
|
| virtual WebKit::WebLayerPositionConstraint positionConstraint() const;
|
| virtual void setScrollClient(WebKit::WebLayerScrollClient* client);
|
| virtual bool isOrphan() const;
|
| + virtual void setWebLayerClient(WebKit::WebLayerClient* client);
|
| +
|
| + // LayerClient implementation.
|
| + virtual std::string DebugName();
|
|
|
| protected:
|
| scoped_refptr<cc::Layer> layer_;
|
| + WebKit::WebLayerClient* web_layer_client_;
|
|
|
| private:
|
| scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_;
|
|
|