Reland of Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo.

cc/blink/web_layer_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_BLINK_WEB_LAYER_IMPL_H_
 #define CC_BLINK_WEB_LAYER_IMPL_H_
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "cc/layers/layer_client.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
 #include "third_party/WebKit/public/platform/WebDoublePoint.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebLayer.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 
 namespace blink {
 class WebFilterOperations;
-class WebLayerClient;
 struct WebFloatRect;
 }
 
 namespace base {
 namespace trace_event {
 class ConvertableToTraceFormat;
 }
 }
 
 namespace cc {
 class Layer;
 class LayerSettings;
 }
 
 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>);
   ~WebLayerImpl() override;
 
   CC_BLINK_EXPORT static void SetLayerSettings(
       const cc::LayerSettings& settings);
   CC_BLINK_EXPORT static const cc::LayerSettings& LayerSettings();
 
   CC_BLINK_EXPORT cc::Layer* layer() const;
@@ skipping 79 matching lines @@
       override;
   blink::WebVector<std::pair<int64_t, blink::WebRect>> frameTimingRequests()
       const override;
   void setIsContainerForFixedPositionLayers(bool is_container) override;
   bool isContainerForFixedPositionLayers() const override;
   void setPositionConstraint(
       const blink::WebLayerPositionConstraint& constraint) override;
   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_;
 
  private:
   scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_;
 
   DISALLOW_COPY_AND_ASSIGN(WebLayerImpl);
 };
 
 }  // namespace cc_blink
 
 #endif  // CC_BLINK_WEB_LAYER_IMPL_H_