Reland of Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo.

third_party/WebKit/public/platform/WebLayer.h

Index: third_party/WebKit/public/platform/WebLayer.h
diff --git a/third_party/WebKit/public/platform/WebLayer.h b/third_party/WebKit/public/platform/WebLayer.h
index b0ebba54b2e20b0464e271333bc8e657f82a36ee..1e1f1ed4f907ff107ab33a4a3dcfd1f638303095 100644
--- a/third_party/WebKit/public/platform/WebLayer.h
+++ b/third_party/WebKit/public/platform/WebLayer.h
@@ -42,10 +42,14 @@
 class SkMatrix44;
 class SkImageFilter;
 
+namespace cc {
+class Layer;
+class LayerClient;
+}
+
 namespace blink {
 class WebCompositorAnimationDelegate;
 class WebFilterOperations;
-class WebLayerClient;
 class WebLayerScrollClient;
 struct WebFloatPoint;
 struct WebLayerPositionConstraint;
@@ -238,7 +242,11 @@ public:
     // True if the layer is not part of a tree attached to a WebLayerTreeView.
     virtual bool isOrphan() const = 0;
 
-    virtual void setWebLayerClient(WebLayerClient*) = 0;
+    // Sets the cc-side layer client.
+    virtual void setLayerClient(cc::LayerClient*) = 0;
+
+    // Gets the underlying cc layer.
+    virtual const cc::Layer* ccLayer() const = 0;
 };
 
 } // namespace blink