diff options
author | jbroman <jbroman@chromium.org> | 2015-11-23 13:51:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-23 21:52:53 +0000 |
commit | 60b29f0509636a9c6b34cc770a0347d46422f5a7 (patch) | |
tree | a569e618b721ef1cdbb12ed1c234703b5b00baaf /cc/blink/web_layer_impl.h | |
parent | 7736b6981249800392e4fdde226cd4cab2c1835e (diff) | |
download | chromium_src-60b29f0509636a9c6b34cc770a0347d46422f5a7.zip chromium_src-60b29f0509636a9c6b34cc770a0347d46422f5a7.tar.gz chromium_src-60b29f0509636a9c6b34cc770a0347d46422f5a7.tar.bz2 |
Reland of Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo.
It is now legal for Blink to provide an implementation of cc::LayerClient.
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/1468753002
Cr-Commit-Position: refs/heads/master@{#361195}
Diffstat (limited to 'cc/blink/web_layer_impl.h')
-rw-r--r-- | cc/blink/web_layer_impl.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index e9f79c0..eb5be7e 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>); @@ -146,18 +145,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_; |