Index: ui/compositor/layer.cc |
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc |
index 1aac1a1efc44b3e675fb5bece1851edea0026ce2..3dafa845acbc152cbc040ef0fd0a3dfea7cd7e35 100644 |
--- a/ui/compositor/layer.cc |
+++ b/ui/compositor/layer.cc |
@@ -12,6 +12,7 @@ |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
#include "cc/base/scoped_ptr_algorithm.h" |
+#include "cc/debug/layer_debug_info.h" |
#include "cc/layers/content_layer.h" |
#include "cc/layers/delegated_renderer_layer.h" |
#include "cc/layers/nine_patch_layer.h" |
@@ -739,9 +740,9 @@ void Layer::SetForceRenderSurface(bool force) { |
cc_layer_->SetForceRenderSurface(force_render_surface_); |
} |
-class LayerDebugInfo : public base::debug::ConvertableToTraceFormat { |
+class UILayerDebugInfo : public cc::LayerDebugInfo { |
public: |
- explicit LayerDebugInfo(std::string name) : name_(name) { } |
+ explicit UILayerDebugInfo(std::string name) : name_(name) {} |
virtual void AppendAsTraceFormat(std::string* out) const OVERRIDE { |
base::DictionaryValue dictionary; |
dictionary.SetString("layer_name", name_); |
@@ -749,12 +750,12 @@ class LayerDebugInfo : public base::debug::ConvertableToTraceFormat { |
} |
private: |
- virtual ~LayerDebugInfo() { } |
+ virtual ~UILayerDebugInfo() {} |
std::string name_; |
}; |
-scoped_refptr<base::debug::ConvertableToTraceFormat> Layer::TakeDebugInfo() { |
- return new LayerDebugInfo(name_); |
+scoped_refptr<cc::LayerDebugInfo> Layer::TakeDebugInfo() { |
+ return new UILayerDebugInfo(name_); |
} |
void Layer::OnAnimationStarted(const cc::AnimationEvent& event) { |