Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo.

cc/blink/web_layer_impl.cc

 // 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.
 
 #include "cc/blink/web_layer_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "cc/animation/animation.h"
 #include "cc/base/region.h"
 #include "cc/base/switches.h"
 #include "cc/blink/web_animation_impl.h"
 #include "cc/blink/web_blend_mode.h"
 #include "cc/blink/web_filter_operations_impl.h"
 #include "cc/blink/web_to_cc_animation_delegate_adapter.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "cc/trees/layer_tree_host.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
-#include "third_party/WebKit/public/platform/WebGraphicsLayerDebugInfo.h"
-#include "third_party/WebKit/public/platform/WebLayerClient.h"
 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 
 using cc::Animation;
 using cc::Layer;
 using blink::WebLayer;
 using blink::WebFloatPoint;
 using blink::WebVector;
 using blink::WebRect;
 using blink::WebSize;
 using blink::WebColor;
 using blink::WebFilterOperations;
 
 namespace cc_blink {
 namespace {
 
 base::LazyInstance<cc::LayerSettings> g_layer_settings =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 WebLayerImpl::WebLayerImpl()
     : layer_(Layer::Create(LayerSettings())), contents_opaque_is_fixed_(false) {
-  web_layer_client_ = nullptr;
-  layer_->SetLayerClient(this);
 }
 
 WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer)
     : layer_(layer), contents_opaque_is_fixed_(false) {
-  web_layer_client_ = nullptr;
-  layer_->SetLayerClient(this);
 }
 
 WebLayerImpl::~WebLayerImpl() {
   if (animation_delegate_adapter_.get())
     layer_->set_layer_animation_delegate(nullptr);
-  web_layer_client_ = nullptr;
   layer_->SetLayerClient(nullptr);
 }
 
 // static
 void WebLayerImpl::SetLayerSettings(const cc::LayerSettings& settings) {
   g_layer_settings.Get() = settings;
 }
 
 // static
 const cc::LayerSettings& WebLayerImpl::LayerSettings() {
@@ skipping 401 matching lines @@
                    base::Unretained(scroll_client)));
   } else {
     layer_->set_did_scroll_callback(base::Closure());
   }
 }
 
 bool WebLayerImpl::isOrphan() const {
   return !layer_->layer_tree_host();
 }
 
-void WebLayerImpl::setWebLayerClient(blink::WebLayerClient* client) {
-  web_layer_client_ = client;
+void WebLayerImpl::setLayerClient(cc::LayerClient* client) {
+  layer_->SetLayerClient(client);
 }
 
-class TracedDebugInfo : public base::trace_event::ConvertableToTraceFormat {
- public:
-  // This object takes ownership of the debug_info object.
-  explicit TracedDebugInfo(blink::WebGraphicsLayerDebugInfo* debug_info)
-      : debug_info_(debug_info) {}
-  void AppendAsTraceFormat(std::string* out) const override {
-    DCHECK(thread_checker_.CalledOnValidThread());
-    blink::WebString web_string;
-    debug_info_->appendAsTraceFormat(&web_string);
-    out->append(web_string.utf8());
-  }
-
- private:
-  ~TracedDebugInfo() override {}
-  scoped_ptr<blink::WebGraphicsLayerDebugInfo> debug_info_;
-  base::ThreadChecker thread_checker_;
-};
-
-scoped_refptr<base::trace_event::ConvertableToTraceFormat>
-WebLayerImpl::TakeDebugInfo() {
-  if (!web_layer_client_)
-    return nullptr;
-  blink::WebGraphicsLayerDebugInfo* debug_info =
-      web_layer_client_->takeDebugInfoFor(this);
-
-  if (debug_info)
-    return new TracedDebugInfo(debug_info);
-  else
-    return nullptr;
+const cc::Layer* WebLayerImpl::ccLayer() const {

[danakj, 2015/10/23 17:53:39]

part of me wonders if this should return void* to avoid things randomly skipping
thru the WebLayer while it exists, but then that might be a good transition path
actually to move things over a few CLs. maybe make it void* until you are
actively removing WebLayer?

[jbroman, 2015/10/23 17:58:59]

If people (including the whole of you) would like me to change this, I can.
Given it's no longer illegal for Blink to know about cc::Layer's existence, I
didn't see a reason to obscure the type, but I don't really have a reason to
make the type visible other than clarity.

[danakj, 2015/10/23 18:01:04]

It'll just be weird if the WebLayer API still exists but new cc::Layer apis
start just bypassing it, we'll get into an inconsistent code-spaghetti land is
my concern. This only matters if WebLayer is going to stick around for a long
time. (Hopefully not?)

+  return layer_.get();
 }
 
 void WebLayerImpl::setScrollParent(blink::WebLayer* parent) {
   cc::Layer* scroll_parent = nullptr;
   if (parent)
     scroll_parent = static_cast<WebLayerImpl*>(parent)->layer();
   layer_->SetScrollParent(scroll_parent);
 }
 
 void WebLayerImpl::setClipParent(blink::WebLayer* parent) {
   cc::Layer* clip_parent = nullptr;
   if (parent)
     clip_parent = static_cast<WebLayerImpl*>(parent)->layer();
   layer_->SetClipParent(clip_parent);
 }
 
 Layer* WebLayerImpl::layer() const {
   return layer_.get();
 }
 
 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) {
   contents_opaque_is_fixed_ = fixed;
 }
 
 }  // namespace cc_blink