Revert of Add builders for tracing event's structural arguments

cc/layers/picture_layer_impl.cc

 // Copyright 2012 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/layers/picture_layer_impl.h"
 
 #include <algorithm>
 #include <limits>
 
-#include "base/debug/trace_event_argument.h"
 #include "base/time/time.h"
 #include "cc/base/math_util.h"
 #include "cc/base/util.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/micro_benchmark_impl.h"
 #include "cc/debug/traced_value.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
@@ skipping 1308 matching lines @@
   ideal_source_scale_ = std::max(ideal_source_scale, min_source_scale);
 }
 
 void PictureLayerImpl::GetDebugBorderProperties(
     SkColor* color,
     float* width) const {
   *color = DebugColors::TiledContentLayerBorderColor();
   *width = DebugColors::TiledContentLayerBorderWidth(layer_tree_impl());
 }
 
-void PictureLayerImpl::AsValueInto(base::debug::TracedValue* state) const {
+void PictureLayerImpl::AsValueInto(base::DictionaryValue* state) const {
   const_cast<PictureLayerImpl*>(this)->DoPostCommitInitializationIfNeeded();
   LayerImpl::AsValueInto(state);
   state->SetDouble("ideal_contents_scale", ideal_contents_scale_);
   state->SetDouble("geometry_contents_scale", MaximumTilingContentsScale());
-  state->BeginArray("tilings");
-  tilings_->AsValueInto(state);
-  state->EndArray();
+  state->Set("tilings", tilings_->AsValue().release());
+  state->Set("pictures", pile_->AsValue().release());
+  state->Set("invalidation", invalidation_.AsValue().release());
 
-  state->BeginArray("pictures");
-  pile_->AsValueInto(state);
-  state->EndArray();
-
-  state->BeginArray("invalidation");
-  invalidation_.AsValueInto(state);
-  state->EndArray();
-
-  state->BeginArray("coverage_tiles");
+  scoped_ptr<base::ListValue> coverage_tiles(new base::ListValue);
   for (PictureLayerTilingSet::CoverageIterator iter(tilings_.get(),
                                                     contents_scale_x(),
                                                     gfx::Rect(content_bounds()),
                                                     ideal_contents_scale_);
        iter;
        ++iter) {
-    state->BeginDictionary();
+    scoped_ptr<base::DictionaryValue> tile_data(new base::DictionaryValue);
+    tile_data->Set("geometry_rect",
+                   MathUtil::AsValue(iter.geometry_rect()).release());
+    if (*iter)
+      tile_data->Set("tile", TracedValue::CreateIDRef(*iter).release());
 
-    state->BeginArray("geometry_rect");
-    MathUtil::AddToTracedValue(iter.geometry_rect(), state);
-    state->EndArray();
-
-    if (*iter)
-      TracedValue::SetIDRef(*iter, state, "tile");
-
-    state->EndDictionary();
+    coverage_tiles->Append(tile_data.release());
   }
-  state->EndArray();
+  state->Set("coverage_tiles", coverage_tiles.release());
 }
 
 size_t PictureLayerImpl::GPUMemoryUsageInBytes() const {
   const_cast<PictureLayerImpl*>(this)->DoPostCommitInitializationIfNeeded();
   return tilings_->GPUMemoryUsageInBytes();
 }
 
 void PictureLayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) {
   benchmark->RunOnLayer(this);
 }
@@ skipping 300 matching lines @@
   return iterator_index_ < iterators_.size();
 }
 
 bool PictureLayerImpl::LayerEvictionTileIterator::IsCorrectType(
     PictureLayerTiling::TilingEvictionTileIterator* it) const {
   return it->get_type() == iteration_stage_ &&
          (**it)->required_for_activation() == required_for_activation_;
 }
 
 }  // namespace cc