Upstream version 10.38.220.0

[platform/framework/web/crosswalk.git] / src / cc / trees / layer_tree_host_impl.cc

diff --git a/src/cc/trees/layer_tree_host_impl.cc b/src/cc/trees/layer_tree_host_impl.cc
index dd01600..3ae833b 100644 (file)
--- a/src/cc/trees/layer_tree_host_impl.cc
+++ b/src/cc/trees/layer_tree_host_impl.cc
@@ -3219,11 +3219,25 @@ void LayerTreeHostImpl::AsValueWithFrameInto(
   state->BeginDictionary("device_viewport_size");
   MathUtil::AddToTracedValue(device_viewport_size_, state);
   state->EndDictionary();
-  if (tile_manager_) {
-    state->BeginArray("tiles");
-    tile_manager_->AllTilesAsValueInto(state);
-    state->EndArray();
 
+  std::set<const Tile*> tiles;
+  active_tree_->GetAllTilesForTracing(&tiles);
+  if (pending_tree_)
+    pending_tree_->GetAllTilesForTracing(&tiles);
+
+  state->BeginArray("active_tiles");
+  for (std::set<const Tile*>::const_iterator it = tiles.begin();
+       it != tiles.end();
+       ++it) {
+    const Tile* tile = *it;
+
+    state->BeginDictionary();
+    tile->AsValueInto(state);
+    state->EndDictionary();
+  }
+  state->EndArray();
+
+  if (tile_manager_) {
     state->BeginDictionary("tile_manager_basic_state");
     tile_manager_->BasicStateAsValueInto(state);
     state->EndDictionary();