cc: Delete LayerTreeAsText / ShowPlatformLayerTree

CC currently has three (3) ways to dump layers: LayerTreeAsText,
LayerTreeAsJSON, and AsValue.

LayerTreeAsText is the least useful due to the fact that if you have
more than a few layers it falls off the bottom of the screen.  Its layer
printing abilities have been entirely replaced (in my opinion) with
TraceViewer's ability to capture frames.

R=nduca@chromium.org
BUG=none

Review URL: https://chromiumcodereview.appspot.com/17351009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207596 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 2 insertions, 260 deletions

diff --git a/cc/base/switches.cc b/cc/base/switches.cc
index 2470d5e..77682e6 100644
--- a/cc/base/switches.cc
+++ b/cc/base/switches.cc
@@ -90,11 +90,6 @@ const char kUIEnablePerTilePainting[] = "ui-enable-per-tile-painting";
 const char kShowCompositedLayerBorders[] = "show-composited-layer-borders";
 const char kUIShowCompositedLayerBorders[] = "ui-show-layer-borders";
 
-// Draws a textual dump of the compositor layer tree to help debug and study
-// layer compositing.
-const char kShowCompositedLayerTree[] = "show-composited-layer-tree";
-const char kUIShowCompositedLayerTree[] = "ui-show-layer-tree";
-
 // Draws a FPS indicator
 const char kShowFPSCounter[] = "show-fps-counter";
 const char kUIShowFPSCounter[] = "ui-show-fps-counter";
diff --git a/cc/base/switches.h b/cc/base/switches.h
index 7089e17..9c35a3f 100644
--- a/cc/base/switches.h
+++ b/cc/base/switches.h
@@ -47,8 +47,6 @@ CC_EXPORT extern const char kUIEnablePerTilePainting[];
 // Debug visualizations.
 CC_EXPORT extern const char kShowCompositedLayerBorders[];
 CC_EXPORT extern const char kUIShowCompositedLayerBorders[];
-CC_EXPORT extern const char kShowCompositedLayerTree[];
-CC_EXPORT extern const char kUIShowCompositedLayerTree[];
 CC_EXPORT extern const char kShowFPSCounter[];
 CC_EXPORT extern const char kUIShowFPSCounter[];
 CC_EXPORT extern const char kShowPropertyChangedRects[];
diff --git a/cc/debug/layer_tree_debug_state.cc b/cc/debug/layer_tree_debug_state.cc
index f6e61b7..897d692 100644
--- a/cc/debug/layer_tree_debug_state.cc
+++ b/cc/debug/layer_tree_debug_state.cc
@@ -11,7 +11,6 @@ namespace cc {
 // IMPORTANT: new fields must be added to Equal() and Unite()
 LayerTreeDebugState::LayerTreeDebugState()
     : show_fps_counter(false),
-      show_platform_layer_tree(false),
       show_debug_borders(false),
       continuous_painting(false),
       show_paint_rects(false),
@@ -37,7 +36,7 @@ bool LayerTreeDebugState::RecordRenderingStats() const {
 }
 
 bool LayerTreeDebugState::ShowHudInfo() const {
-  return show_fps_counter || show_platform_layer_tree || continuous_painting ||
+  return show_fps_counter || continuous_painting ||
          ShowHudRects();
 }
 
@@ -55,7 +54,6 @@ bool LayerTreeDebugState::ShowMemoryStats() const {
 bool LayerTreeDebugState::Equal(const LayerTreeDebugState& a,
                                 const LayerTreeDebugState& b) {
   return (a.show_fps_counter == b.show_fps_counter &&
-          a.show_platform_layer_tree == b.show_platform_layer_tree &&
           a.show_debug_borders == b.show_debug_borders &&
           a.continuous_painting == b.continuous_painting &&
           a.show_paint_rects == b.show_paint_rects &&
@@ -78,7 +76,6 @@ LayerTreeDebugState LayerTreeDebugState::Unite(const LayerTreeDebugState& a,
   LayerTreeDebugState r(a);
 
   r.show_fps_counter |= b.show_fps_counter;
-  r.show_platform_layer_tree |= b.show_platform_layer_tree;
   r.show_debug_borders |= b.show_debug_borders;
   r.continuous_painting |= b.continuous_painting;
 
diff --git a/cc/debug/layer_tree_debug_state.h b/cc/debug/layer_tree_debug_state.h
index b7e44a0..f367364 100644
--- a/cc/debug/layer_tree_debug_state.h
+++ b/cc/debug/layer_tree_debug_state.h
@@ -16,7 +16,6 @@ class CC_EXPORT LayerTreeDebugState {
   ~LayerTreeDebugState();
 
   bool show_fps_counter;
-  bool show_platform_layer_tree;
   bool show_debug_borders;
   bool continuous_painting;
 
diff --git a/cc/layers/heads_up_display_layer.cc b/cc/layers/heads_up_display_layer.cc
index 76016b5..7822516 100644
--- a/cc/layers/heads_up_display_layer.cc
+++ b/cc/layers/heads_up_display_layer.cc
@@ -40,7 +40,7 @@ void HeadsUpDisplayLayer::Update(ResourceUpdateQueue*,
   gfx::Transform matrix;
   matrix.MakeIdentity();
 
-  if (debug_state.show_platform_layer_tree || debug_state.ShowHudRects()) {
+  if (debug_state.ShowHudRects()) {
     int width =
         std::min(max_texture_size, device_viewport_in_layout_pixels_width);
     int height =
diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index ffadad5..98487b4 100644
--- a/cc/layers/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.cc
@@ -220,9 +220,6 @@ void HeadsUpDisplayLayerImpl::DrawHudContents(SkCanvas* canvas) const {
   if (debug_state.ShowHudRects())
     DrawDebugRects(canvas, layer_tree_impl()->debug_rect_history());
 
-  if (debug_state.show_platform_layer_tree)
-    DrawPlatformLayerTree(canvas);
-
   SkRect area = SkRect::MakeEmpty();
   if (debug_state.continuous_painting) {
     // Don't show the FPS display when continuous painting is enabled, because
@@ -301,33 +298,6 @@ void HeadsUpDisplayLayerImpl::DrawGraphLines(SkCanvas* canvas,
   paint->setXfermode(NULL);
 }
 
-void HeadsUpDisplayLayerImpl::DrawPlatformLayerTree(SkCanvas* canvas) const {
-  const int kFontHeight = 14;
-  SkPaint paint = CreatePaint();
-  DrawGraphBackground(
-      canvas,
-      &paint,
-      SkRect::MakeXYWH(0, 0, bounds().width(), bounds().height()));
-
-  std::string layer_tree = layer_tree_impl()->layer_tree_as_text();
-  std::vector<std::string> lines;
-  base::SplitString(layer_tree, '\n', &lines);
-
-  paint.setColor(DebugColors::PlatformLayerTreeTextColor());
-  for (size_t i = 0;
-       i < lines.size() &&
-           static_cast<int>(2 + i * kFontHeight) < bounds().height();
-       ++i) {
-    DrawText(canvas,
-             &paint,
-             lines[i],
-             SkPaint::kLeft_Align,
-             kFontHeight,
-             2,
-             2 + (i + 1) * kFontHeight);
-  }
-}
-
 SkRect HeadsUpDisplayLayerImpl::DrawFPSDisplay(
     SkCanvas* canvas,
     const FrameRateCounter* fps_counter,
diff --git a/cc/layers/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h
index b8f8267..28202d4 100644
--- a/cc/layers/heads_up_display_layer_impl.h
+++ b/cc/layers/heads_up_display_layer_impl.h
@@ -93,7 +93,6 @@ class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
                       const SkRect& bounds,
                       const Graph& graph) const;
 
-  void DrawPlatformLayerTree(SkCanvas* canvas) const;
   SkRect DrawFPSDisplay(SkCanvas* canvas,
                         const FrameRateCounter* fps_counter,
                         int right,
diff --git a/cc/layers/io_surface_layer_impl.cc b/cc/layers/io_surface_layer_impl.cc
index 4e9bb2d..b888e23 100644
--- a/cc/layers/io_surface_layer_impl.cc
+++ b/cc/layers/io_surface_layer_impl.cc
@@ -122,16 +122,6 @@ void IOSurfaceLayerImpl::AppendQuads(QuadSink* quad_sink,
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 }
 
-void IOSurfaceLayerImpl::DumpLayerProperties(std::string* str,
-                                             int indent) const {
-  str->append(IndentString(indent));
-  base::StringAppendF(str,
-                      "iosurface id: %u texture id: %u\n",
-                      io_surface_id_,
-                      io_surface_texture_id_);
-  LayerImpl::DumpLayerProperties(str, indent);
-}
-
 void IOSurfaceLayerImpl::DidLoseOutputSurface() {
   // We don't have a valid texture ID in the new context; however,
   // the IOSurface is still valid.
diff --git a/cc/layers/io_surface_layer_impl.h b/cc/layers/io_surface_layer_impl.h
index 52e007b..356f5f2 100644
--- a/cc/layers/io_surface_layer_impl.h
+++ b/cc/layers/io_surface_layer_impl.h
@@ -34,8 +34,6 @@ class CC_EXPORT IOSurfaceLayerImpl : public LayerImpl {
                         ResourceProvider* resource_provider) OVERRIDE;
   virtual void DidLoseOutputSurface() OVERRIDE;
 
-  virtual void DumpLayerProperties(std::string* str, int indent) const OVERRIDE;
-
  private:
   IOSurfaceLayerImpl(LayerTreeImpl* tree_impl, int id);
 
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 8aecda1..254a17f 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -413,85 +413,6 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
   update_rect_ = gfx::RectF();
 }
 
-std::string LayerImpl::IndentString(int indent) {
-  std::string str;
-  for (int i = 0; i != indent; ++i)
-    str.append("  ");
-  return str;
-}
-
-void LayerImpl::DumpLayerProperties(std::string* str, int indent) const {
-  std::string indent_str = IndentString(indent);
-  str->append(indent_str);
-  base::StringAppendF(str, "layer ID: %d\n", layer_id_);
-
-  str->append(indent_str);
-  base::StringAppendF(
-      str, "bounds: %d, %d\n", bounds().width(), bounds().height());
-
-  if (draw_properties_.render_target) {
-    str->append(indent_str);
-    base::StringAppendF(
-        str, "renderTarget: %d\n", draw_properties_.render_target->layer_id_);
-  }
-
-  str->append(indent_str);
-  base::StringAppendF(str, "position: %f, %f\n", position_.x(), position_.y());
-
-  str->append(indent_str);
-  base::StringAppendF(str, "contentsOpaque: %d\n", contents_opaque_);
-
-  str->append(indent_str);
-  const gfx::Transform& transform = draw_properties_.target_space_transform;
-  base::StringAppendF(str,
-                      "drawTransform: %f, %f, %f, %f  //  %f, %f, %f, %f"
-                      "  //  %f, %f, %f, %f  //  %f, %f, %f, %f\n",
-                      transform.matrix().getDouble(0, 0),
-                      transform.matrix().getDouble(0, 1),
-                      transform.matrix().getDouble(0, 2),
-                      transform.matrix().getDouble(0, 3),
-                      transform.matrix().getDouble(1, 0),
-                      transform.matrix().getDouble(1, 1),
-                      transform.matrix().getDouble(1, 2),
-                      transform.matrix().getDouble(1, 3),
-                      transform.matrix().getDouble(2, 0),
-                      transform.matrix().getDouble(2, 1),
-                      transform.matrix().getDouble(2, 2),
-                      transform.matrix().getDouble(2, 3),
-                      transform.matrix().getDouble(3, 0),
-                      transform.matrix().getDouble(3, 1),
-                      transform.matrix().getDouble(3, 2),
-                      transform.matrix().getDouble(3, 3));
-
-  str->append(indent_str);
-  base::StringAppendF(
-      str, "draws_content: %s\n", draws_content_ ? "yes" : "no");
-}
-
-std::string LayerImpl::LayerTreeAsText() const {
-  std::string str;
-  DumpLayer(&str, 0);
-  return str;
-}
-
-void LayerImpl::DumpLayer(std::string* str, int indent) const {
-  str->append(IndentString(indent));
-  base::StringAppendF(str, "%s(%s)\n", LayerTypeAsString(), debug_name_.data());
-  DumpLayerProperties(str, indent+2);
-  if (replica_layer_) {
-    str->append(IndentString(indent+2));
-    str->append("Replica:\n");
-    replica_layer_->DumpLayer(str, indent+3);
-  }
-  if (mask_layer_) {
-    str->append(IndentString(indent+2));
-    str->append("Mask:\n");
-    mask_layer_->DumpLayer(str, indent+3);
-  }
-  for (size_t i = 0; i < children_.size(); ++i)
-    children_[i]->DumpLayer(str, indent+1);
-}
-
 base::DictionaryValue* LayerImpl::LayerTreeAsJson() const {
   base::ListValue* list;
   base::DictionaryValue* result = new base::DictionaryValue;
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 170fc78..3f2cae2 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -379,7 +379,6 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
   }
   const gfx::RectF& update_rect() const { return update_rect_; }
 
-  std::string LayerTreeAsText() const;
   virtual base::DictionaryValue* LayerTreeAsJson() const;
 
   void SetStackingOrderChanged(bool stacking_order_changed);
@@ -453,9 +452,6 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
                              SkColor color,
                              float width) const;
 
-  virtual void DumpLayerProperties(std::string* str, int indent) const;
-  static std::string IndentString(int indent);
-
   virtual void AsValueInto(base::DictionaryValue* dict) const;
 
   void NoteLayerSurfacePropertyChanged();
@@ -470,8 +466,6 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
 
   virtual const char* LayerTypeAsString() const;
 
-  void DumpLayer(std::string* str, int indent) const;
-
   // Properties internal to LayerImpl
   LayerImpl* parent_;
   OwnedLayerImplList children_;
diff --git a/cc/layers/nine_patch_layer_impl.cc b/cc/layers/nine_patch_layer_impl.cc
index cc109a8..57723a0 100644
--- a/cc/layers/nine_patch_layer_impl.cc
+++ b/cc/layers/nine_patch_layer_impl.cc
@@ -274,16 +274,6 @@ const char* NinePatchLayerImpl::LayerTypeAsString() const {
   return "cc::NinePatchLayerImpl";
 }
 
-void NinePatchLayerImpl::DumpLayerProperties(std::string* str, int indent)
-    const {
-  str->append(IndentString(indent));
-  base::StringAppendF(
-      str, "imageAperture: %s\n", image_aperture_.ToString().c_str());
-  base::StringAppendF(
-      str, "image_bounds: %s\n", image_bounds_.ToString().c_str());
-  LayerImpl::DumpLayerProperties(str, indent);
-}
-
 base::DictionaryValue* NinePatchLayerImpl::LayerTreeAsJson() const {
   base::DictionaryValue* result = LayerImpl::LayerTreeAsJson();
 
diff --git a/cc/layers/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h
index d0ac5a4..bc442d4 100644
--- a/cc/layers/nine_patch_layer_impl.h
+++ b/cc/layers/nine_patch_layer_impl.h
@@ -39,7 +39,6 @@ class CC_EXPORT NinePatchLayerImpl : public LayerImpl {
   virtual void AppendQuads(QuadSink* quad_sink,
                            AppendQuadsData* append_quads_data) OVERRIDE;
   virtual ResourceProvider::ResourceId ContentsResourceId() const OVERRIDE;
-  virtual void DumpLayerProperties(std::string* str, int indent) const OVERRIDE;
   virtual void DidLoseOutputSurface() OVERRIDE;
 
   virtual base::DictionaryValue* LayerTreeAsJson() const OVERRIDE;
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 84a7d9c..f0edaa6 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -299,10 +299,6 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
   CleanUpTilingsOnActiveLayer(seen_tilings);
 }
 
-void PictureLayerImpl::DumpLayerProperties(std::string*, int indent) const {
-  // TODO(enne): implement me
-}
-
 void PictureLayerImpl::UpdateTilePriorities() {
   if (!tilings_->num_tilings())
     return;
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index ad96c6f..cc56c01 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -38,7 +38,6 @@ class CC_EXPORT PictureLayerImpl
   virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
   virtual void AppendQuads(QuadSink* quad_sink,
                            AppendQuadsData* append_quads_data) OVERRIDE;
-  virtual void DumpLayerProperties(std::string* str, int indent) const OVERRIDE;
   virtual void UpdateTilePriorities() OVERRIDE;
   virtual void DidBecomeActive() OVERRIDE;
   virtual void DidBeginTracing() OVERRIDE;
diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc
index 8437ce6..fbf224b 100644
--- a/cc/layers/render_surface_impl.cc
+++ b/cc/layers/render_surface_impl.cc
@@ -58,60 +58,6 @@ std::string RenderSurfaceImpl::Name() const {
                             owning_layer_->debug_name().data());
 }
 
-static std::string IndentString(int indent) {
-  std::string str;
-  for (int i = 0; i != indent; ++i)
-    str.append("  ");
-  return str;
-}
-
-void RenderSurfaceImpl::DumpSurface(std::string* str, int indent) const {
-  std::string indent_str = IndentString(indent);
-  str->append(indent_str);
-  base::StringAppendF(str, "%s\n", Name().data());
-
-  indent_str.append("  ");
-  str->append(indent_str);
-  base::StringAppendF(str,
-                      "content_rect: (%d, %d, %d, %d)\n",
-                      content_rect_.x(),
-                      content_rect_.y(),
-                      content_rect_.width(),
-                      content_rect_.height());
-
-  str->append(indent_str);
-  base::StringAppendF(str,
-                      "draw_transform: "
-                      "%f, %f, %f, %f, "
-                      "%f, %f, %f, %f, "
-                      "%f, %f, %f, %f, "
-                      "%f, %f, %f, %f\n",
-                      draw_transform_.matrix().getDouble(0, 0),
-                      draw_transform_.matrix().getDouble(0, 1),
-                      draw_transform_.matrix().getDouble(0, 2),
-                      draw_transform_.matrix().getDouble(0, 3),
-                      draw_transform_.matrix().getDouble(1, 0),
-                      draw_transform_.matrix().getDouble(1, 1),
-                      draw_transform_.matrix().getDouble(1, 2),
-                      draw_transform_.matrix().getDouble(1, 3),
-                      draw_transform_.matrix().getDouble(2, 0),
-                      draw_transform_.matrix().getDouble(2, 1),
-                      draw_transform_.matrix().getDouble(2, 2),
-                      draw_transform_.matrix().getDouble(2, 3),
-                      draw_transform_.matrix().getDouble(3, 0),
-                      draw_transform_.matrix().getDouble(3, 1),
-                      draw_transform_.matrix().getDouble(3, 2),
-                      draw_transform_.matrix().getDouble(3, 3));
-
-  str->append(indent_str);
-  base::StringAppendF(str,
-                      "current_damage_rect is pos(%f, %f), size(%f, %f)\n",
-                      damage_tracker_->current_damage_rect().x(),
-                      damage_tracker_->current_damage_rect().y(),
-                      damage_tracker_->current_damage_rect().width(),
-                      damage_tracker_->current_damage_rect().height());
-}
-
 int RenderSurfaceImpl::OwningLayerId() const {
   return owning_layer_ ? owning_layer_->id() : 0;
 }
diff --git a/cc/layers/render_surface_impl.h b/cc/layers/render_surface_impl.h
index 8a7f73f..6f3e752 100644
--- a/cc/layers/render_surface_impl.h
+++ b/cc/layers/render_surface_impl.h
@@ -34,7 +34,6 @@ class CC_EXPORT RenderSurfaceImpl {
   virtual ~RenderSurfaceImpl();
 
   std::string Name() const;
-  void DumpSurface(std::string* str, int indent) const;
 
   gfx::PointF ContentRectCenter() const {
     return gfx::RectF(content_rect_).CenterPoint();
diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc
index 87f12fd..0c70ba7 100644
--- a/cc/layers/texture_layer_impl.cc
+++ b/cc/layers/texture_layer_impl.cc
@@ -118,15 +118,6 @@ void TextureLayerImpl::DidDraw(ResourceProvider* resource_provider) {
   external_texture_resource_ = 0;
 }
 
-void TextureLayerImpl::DumpLayerProperties(std::string* str, int indent) const {
-  str->append(IndentString(indent));
-  base::StringAppendF(str,
-                      "texture layer texture id: %u premultiplied: %d\n",
-                      texture_id_,
-                      premultiplied_alpha_);
-  LayerImpl::DumpLayerProperties(str, indent);
-}
-
 void TextureLayerImpl::DidLoseOutputSurface() {
   if (external_texture_resource_ && !uses_mailbox_) {
     ResourceProvider* resource_provider =
diff --git a/cc/layers/texture_layer_impl.h b/cc/layers/texture_layer_impl.h
index 2cb5422..b23498e 100644
--- a/cc/layers/texture_layer_impl.h
+++ b/cc/layers/texture_layer_impl.h
@@ -34,7 +34,6 @@ class CC_EXPORT TextureLayerImpl : public LayerImpl {
 
   virtual void DidLoseOutputSurface() OVERRIDE;
 
-  virtual void DumpLayerProperties(std::string* str, int indent) const OVERRIDE;
   virtual void DidBecomeActive() OVERRIDE;
 
   unsigned texture_id() const { return texture_id_; }
diff --git a/cc/layers/tiled_layer_impl.cc b/cc/layers/tiled_layer_impl.cc
index 11a679e..e3852129 100644
--- a/cc/layers/tiled_layer_impl.cc
+++ b/cc/layers/tiled_layer_impl.cc
@@ -71,12 +71,6 @@ ResourceProvider::ResourceId TiledLayerImpl::ContentsResourceId() const {
   return resource_id;
 }
 
-void TiledLayerImpl::DumpLayerProperties(std::string* str, int indent) const {
-  str->append(IndentString(indent));
-  base::StringAppendF(str, "skipsDraw: %d\n", (!tiler_ || skips_draw_));
-  LayerImpl::DumpLayerProperties(str, indent);
-}
-
 bool TiledLayerImpl::HasTileAt(int i, int j) const {
   return !!tiler_->TileAt(i, j);
 }
diff --git a/cc/layers/tiled_layer_impl.h b/cc/layers/tiled_layer_impl.h
index 23dfe89..939842b 100644
--- a/cc/layers/tiled_layer_impl.h
+++ b/cc/layers/tiled_layer_impl.h
@@ -33,8 +33,6 @@ class CC_EXPORT TiledLayerImpl : public LayerImpl {
 
   virtual ResourceProvider::ResourceId ContentsResourceId() const OVERRIDE;
 
-  virtual void DumpLayerProperties(std::string* str, int indent) const OVERRIDE;
-
   void set_skips_draw(bool skips_draw) { skips_draw_ = skips_draw; }
   void SetTilingData(const LayerTilingData& tiler);
   void PushTileProperties(int i,
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index eb079c9..5096b66f 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2168,16 +2168,6 @@ void LayerTreeHostImpl::ClearRenderSurfaces() {
     pending_tree_->ClearRenderSurfaces();
 }
 
-std::string LayerTreeHostImpl::LayerTreeAsText() const {
-  std::string str;
-  if (active_tree_->root_layer()) {
-    str = active_tree_->root_layer()->LayerTreeAsText();
-    str +=  "RenderSurfaces:\n";
-    DumpRenderSurfaces(&str, 1, active_tree_->root_layer());
-  }
-  return str;
-}
-
 std::string LayerTreeHostImpl::LayerTreeAsJson() const {
   std::string str;
   if (active_tree_->root_layer()) {
@@ -2188,16 +2178,6 @@ std::string LayerTreeHostImpl::LayerTreeAsJson() const {
   return str;
 }
 
-void LayerTreeHostImpl::DumpRenderSurfaces(std::string* str,
-                                           int indent,
-                                           const LayerImpl* layer) const {
-  if (layer->render_surface())
-    layer->render_surface()->DumpSurface(str, indent);
-
-  for (size_t i = 0; i < layer->children().size(); ++i)
-    DumpRenderSurfaces(str, indent, layer->children()[i]);
-}
-
 int LayerTreeHostImpl::SourceAnimationFrameNumber() const {
   return fps_counter_->current_frame_number();
 }
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 3f1b11b..678d2d0 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -216,7 +216,6 @@ class CC_EXPORT LayerTreeHostImpl
   bool CanDraw();
   OutputSurface* output_surface() const { return output_surface_.get(); }
 
-  std::string LayerTreeAsText() const;
   std::string LayerTreeAsJson() const;
 
   void FinishAllRendering();
@@ -434,10 +433,6 @@ class CC_EXPORT LayerTreeHostImpl
   void AnimateScrollbarsRecursive(LayerImpl* layer,
                                   base::TimeTicks time);
 
-  void DumpRenderSurfaces(std::string* str,
-                          int indent,
-                          const LayerImpl* layer) const;
-
   static LayerImpl* GetNonCompositedContentLayerRecursive(LayerImpl* layer);
 
   void UpdateCurrentFrameTime(base::TimeTicks* ticks, base::Time* now) const;
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index f959d8e..3061626 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -496,10 +496,6 @@ gfx::Size LayerTreeImpl::device_viewport_size() const {
   return layer_tree_host_impl_->device_viewport_size();
 }
 
-std::string LayerTreeImpl::layer_tree_as_text() const {
-  return layer_tree_host_impl_->LayerTreeAsText();
-}
-
 DebugRectHistory* LayerTreeImpl::debug_rect_history() const {
   return layer_tree_host_impl_->debug_rect_history();
 }
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
index 57b7edf..2f85f1d 100644
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -80,7 +80,6 @@ class CC_EXPORT LayerTreeImpl {
   const LayerTreeDebugState& debug_state() const;
   float device_scale_factor() const;
   gfx::Size device_viewport_size() const;
-  std::string layer_tree_as_text() const;
   DebugRectHistory* debug_rect_history() const;
   scoped_ptr<base::Value> AsValue() const;