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, 6 insertions, 6 deletions

diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
index 3a8ef51..6e58663 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
@@ -27,7 +27,6 @@
 #ifndef GraphicsLayer_h
 #define GraphicsLayer_h
 
-#include "cc/layers/layer_client.h"
 #include "platform/PlatformExport.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/FloatPoint3D.h"
@@ -48,6 +47,7 @@
 #include "public/platform/WebCompositorAnimationDelegate.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebImageLayer.h"
+#include "public/platform/WebLayerClient.h"
 #include "public/platform/WebLayerScrollClient.h"
 #include "public/platform/WebScrollBlocksOn.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ -75,7 +75,7 @@ typedef Vector<GraphicsLayer*, 64> GraphicsLayerVector;
 // GraphicsLayer is an abstraction for a rendering surface with backing store,
 // which may have associated transformation and animations.
 
-class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public WebCompositorAnimationDelegate, public WebLayerScrollClient, public cc::LayerClient {
+class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public WebCompositorAnimationDelegate, public WebLayerScrollClient, public WebLayerClient {
     WTF_MAKE_NONCOPYABLE(GraphicsLayer); USING_FAST_MALLOC(GraphicsLayer);
 public:
     static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayerClient*);
@@ -84,6 +84,9 @@ public:
 
     GraphicsLayerClient* client() const { return m_client; }
 
+    // WebLayerClient implementation.
+    WebGraphicsLayerDebugInfo* takeDebugInfoFor(WebLayer*) override;
+
     GraphicsLayerDebugInfo& debugInfo();
 
     void setCompositingReasons(CompositingReasons);
@@ -252,9 +255,6 @@ public:
     // WebLayerScrollClient implementation.
     void didScroll() override;
 
-    // cc::LayerClient implementation.
-    scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo(cc::Layer*) override;
-
     PaintController* paintController() override;
 
     // Exposed for tests.
@@ -267,7 +267,7 @@ public:
     String debugName() const { return m_client->debugName(this); }
 
 protected:
-    String debugName(cc::Layer*) const;
+    String debugName(WebLayer*) const;
 
     explicit GraphicsLayer(GraphicsLayerClient*);
     // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends.