Revert of Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo. (patchset #10 id:200001 of https://codereview.chromium.org/1419913002/ )

Reason for revert:
Looks to be causing bot failures for ContextLost.WebGLContextLostInHiddenTab

Original issue's description:
> 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
>
> Committed: https://crrev.com/69698f992d3c6b2badd01f718c71df7a52b099fb
> Cr-Commit-Position: refs/heads/master@{#360855}

TBR=chrishtr@chromium.org,danakj@chromium.org,enne@chromium.org,esprehn@chromium.org,pdr@chromium.org,jbroman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1461423002

Cr-Commit-Position: refs/heads/master@{#360892}

1 files changed, 8 insertions, 3 deletions

diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
index eb5be7e..e9f79c0 100644
--- a/cc/blink/web_layer_impl.h
+++ b/cc/blink/web_layer_impl.h
@@ -27,6 +27,7 @@
 
 namespace blink {
 class WebFilterOperations;
+class WebLayerClient;
 struct WebFloatRect;
 }
 
@@ -45,7 +46,7 @@ namespace cc_blink {
 
 class WebToCCAnimationDelegateAdapter;
 
-class WebLayerImpl : public blink::WebLayer {
+class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
  public:
   CC_BLINK_EXPORT WebLayerImpl();
   CC_BLINK_EXPORT explicit WebLayerImpl(scoped_refptr<cc::Layer>);
@@ -145,14 +146,18 @@ class WebLayerImpl : public blink::WebLayer {
   blink::WebLayerPositionConstraint positionConstraint() const override;
   void setScrollClient(blink::WebLayerScrollClient* client) override;
   bool isOrphan() const override;
-  void setLayerClient(cc::LayerClient* client) override;
-  const cc::Layer* ccLayer() const override;
+  void setWebLayerClient(blink::WebLayerClient* client) override;
+
+  // LayerClient implementation.
+  scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo()
+      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_;