Chromium Code Reviews| 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..aa8e902a7c6c0bf6ac4e25690f65d721f4d5a885 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( |
| @@ -117,9 +121,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() OVERRIDE; |
|
enne (OOO)
2013/08/02 17:58:17
Please don't use OVERRIDE here even though it is a
qiankun
2013/08/05 06:54:15
Done.
|
| protected: |
| scoped_refptr<cc::Layer> layer_; |
| + WebKit::WebLayerClient* web_layer_client_; |
| private: |
| scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; |