Reland of Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo.

cc/blink/web_layer_impl.h

Index: cc/blink/web_layer_impl.h
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
index e9f79c0286f13f6e4323962f616496b72760d543..eb5be7ed2600fc37608a2ce1dc71ce0f21c4791b 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_;