Reland of Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo.

third_party/WebKit/public/platform/WebLayer.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 24 matching lines @@
 #include "WebPoint.h"
 #include "WebRect.h"
 #include "WebScrollBlocksOn.h"
 #include "WebSize.h"
 #include "WebString.h"
 #include "WebVector.h"
 
 class SkMatrix44;
 class SkImageFilter;
 
+namespace cc {
+class Layer;
+class LayerClient;
+}
+
 namespace blink {
 class WebCompositorAnimationDelegate;
 class WebFilterOperations;
-class WebLayerClient;
 class WebLayerScrollClient;
 struct WebFloatPoint;
 struct WebLayerPositionConstraint;
 
 class WebLayer {
 public:
     virtual ~WebLayer() { }
 
     // Returns a positive ID that will be unique across all WebLayers allocated in this process.
     virtual int id() const = 0;
@@ skipping 172 matching lines @@
     // deleting the scroll client.
     virtual void setScrollClient(WebLayerScrollClient*) = 0;
 
     // Forces this layer to use a render surface. There is no benefit in doing
     // so, but this is to facilitate benchmarks and tests.
     virtual void setForceRenderSurface(bool) = 0;
 
     // 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
 
 #endif // WebLayer_h