Index: cc/blink/web_layer_impl.h |
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h |
index 44ef02e2210c8b70c015ac1ed6958ab2adbc1297..867ca7a59eab6bec56cc7eadf9f2496cd56bf49a 100644 |
--- a/cc/blink/web_layer_impl.h |
+++ b/cc/blink/web_layer_impl.h |
@@ -27,7 +27,6 @@ |
namespace blink { |
class WebFilterOperations; |
-class WebLayerClient; |
struct WebFloatRect; |
} |
@@ -46,7 +45,7 @@ namespace cc_blink { |
class WebToCCAnimationDelegateAdapter; |
-class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { |
+class WebLayerImpl : public blink::WebLayer { |
public: |
CC_BLINK_EXPORT WebLayerImpl(); |
CC_BLINK_EXPORT explicit WebLayerImpl(scoped_refptr<cc::Layer>); |
@@ -145,18 +144,14 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { |
blink::WebLayerPositionConstraint positionConstraint() const override; |
void setScrollClient(blink::WebLayerScrollClient* client) override; |
bool isOrphan() const override; |
- void setWebLayerClient(blink::WebLayerClient* client) override; |
- |
- // LayerClient implementation. |
- scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo() |
- override; |
+ void setLayerClient(cc::LayerClient* client) override; |
+ const cc::Layer* ccLayer() const override; |
void setScrollParent(blink::WebLayer* parent) override; |
void setClipParent(blink::WebLayer* parent) override; |
protected: |
scoped_refptr<cc::Layer> layer_; |
- blink::WebLayerClient* web_layer_client_; |
bool contents_opaque_is_fixed_; |