Cherry-pick: cc: Report only on active tiles in tracing.
Cherry-pick with conflict of chromium
crrev.com/d7de03c45e06e104e3ba022e240f7bc88315e753
Conflicts:
cc/layers/layer_impl.cc
cc/layers/layer_impl.h
cc/layers/picture_layer_impl.cc
cc/layers/picture_layer_impl.h
cc/resources/picture_layer_tiling.cc
cc/resources/picture_layer_tiling.h
cc/resources/tile_manager.cc
cc/resources/tile_manager.h
cc/trees/layer_tree_host_impl.cc
cc/trees/layer_tree_impl.cc
cc/trees/layer_tree_impl.h
BUG: 17315710
Original description:
This patch changes which tiles we report on. Previously, we logged
all of the available tiles. Now, we only log tiles that are active.
That is, only tiles that are on either active or pending trees are
logged.
The way this is done is as follows:
- Walk the tree, layers, tilings
- Insert all tiles from a tiling into a set
- Stuff those into a trace.
Change-Id: Ied16f30ee7e69873e12a2754054a39ecb7acc385
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 1c945f6..0e7b089 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -1389,6 +1389,9 @@
parent_->RemoveDependentNeedsPushProperties();
}
+void LayerImpl::GetAllTilesForTracing(std::set<const Tile*>* tiles) const {
+}
+
void LayerImpl::AsValueInto(base::DictionaryValue* state) const {
TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
TRACE_DISABLED_BY_DEFAULT("cc.debug"),
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index cb18604..ff09e30 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -508,6 +508,7 @@
virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl);
virtual void PushPropertiesTo(LayerImpl* layer);
+ virtual void GetAllTilesForTracing(std::set<const Tile*>* tiles) const;
scoped_ptr<base::Value> AsValue() const;
virtual size_t GPUMemoryUsageInBytes() const;
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 46739da..4a43c71 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -6,6 +6,7 @@
#include <algorithm>
#include <limits>
+#include <set>
#include "base/time/time.h"
#include "cc/base/math_util.h"
@@ -1357,6 +1358,15 @@
*width = DebugColors::TiledContentLayerBorderWidth(layer_tree_impl());
}
+void PictureLayerImpl::GetAllTilesForTracing(
+ std::set<const Tile*>* tiles) const {
+ if (!tilings_)
+ return;
+
+ for (size_t i = 0; i < tilings_->num_tilings(); ++i)
+ tilings_->tiling_at(i)->GetAllTilesForTracing(tiles);
+}
+
void PictureLayerImpl::AsValueInto(base::DictionaryValue* state) const {
const_cast<PictureLayerImpl*>(this)->DoPostCommitInitializationIfNeeded();
LayerImpl::AsValueInto(state);
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index df94b4b..7908148 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -5,6 +5,7 @@
#ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_
#define CC_LAYERS_PICTURE_LAYER_IMPL_H_
+#include <set>
#include <string>
#include <vector>
@@ -171,6 +172,8 @@
virtual void GetDebugBorderProperties(
SkColor* color, float* width) const OVERRIDE;
+ virtual void GetAllTilesForTracing(
+ std::set<const Tile*>* tiles) const OVERRIDE;
virtual void AsValueInto(base::DictionaryValue* dict) const OVERRIDE;
virtual void UpdateIdealScales();
diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index 9a7777d..f8f5443 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <cmath>
#include <limits>
+#include <set>
#include "base/debug/trace_event.h"
#include "cc/base/math_util.h"
@@ -622,6 +623,12 @@
}
}
+void PictureLayerTiling::GetAllTilesForTracing(
+ std::set<const Tile*>* tiles) const {
+ for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
+ tiles->insert(it->second.get());
+}
+
scoped_ptr<base::Value> PictureLayerTiling::AsValue() const {
scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
state->SetInteger("num_tiles", tiles_.size());
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index 9c85a0e..5b1201d 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -5,6 +5,7 @@
#ifndef CC_RESOURCES_PICTURE_LAYER_TILING_H_
#define CC_RESOURCES_PICTURE_LAYER_TILING_H_
+#include <set>
#include <utility>
#include <vector>
@@ -235,6 +236,7 @@
return frame_time_in_seconds != last_impl_frame_time_in_seconds_;
}
+ void GetAllTilesForTracing(std::set<const Tile*>* tiles) const;
scoped_ptr<base::Value> AsValue() const;
size_t GPUMemoryUsageInBytes() const;
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
index d508f6a..9b10d0b 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -701,14 +701,6 @@
return state.PassAs<base::Value>();
}
-scoped_ptr<base::Value> TileManager::AllTilesAsValue() const {
- scoped_ptr<base::ListValue> state(new base::ListValue());
- for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
- state->Append(it->second->AsValue().release());
-
- return state.PassAs<base::Value>();
-}
-
void TileManager::AssignGpuMemoryToTiles(
PrioritizedTileSet* tiles,
TileVector* tiles_that_need_to_be_rasterized) {
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index 5ad8091..9792b91 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -186,7 +186,6 @@
int flags);
scoped_ptr<base::Value> BasicStateAsValue() const;
- scoped_ptr<base::Value> AllTilesAsValue() const;
const MemoryHistory::Entry& memory_stats_from_last_assign() const {
return memory_stats_from_last_assign_;
}
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 9992904..48184e5 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -3027,8 +3027,19 @@
state->Set("activation_state", ActivationStateAsValue().release());
state->Set("device_viewport_size",
MathUtil::AsValue(device_viewport_size_).release());
+
+ std::set<const Tile*> tiles;
+ active_tree_->GetAllTilesForTracing(&tiles);
+ if (pending_tree_)
+ pending_tree_->GetAllTilesForTracing(&tiles);
+
+ scoped_ptr<base::ListValue> tile_state(new base::ListValue());
+ for (std::set<const Tile*>::const_iterator it = tiles.begin(); it != tiles.end(); ++it)
+ tile_state->Append((*it)->AsValue().release());
+
+ state->Set("active_tiles", tile_state.release());
+
if (tile_manager_) {
- state->Set("tiles", tile_manager_->AllTilesAsValue().release());
state->Set("tile_manager_basic_state", tile_manager_->BasicStateAsValue().release());
}
state->Set("active_tree", active_tree_->AsValue().release());
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 2988e14..e625360 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -790,6 +790,20 @@
return layer_tree_host_impl_->animation_registrar();
}
+void LayerTreeImpl::GetAllTilesForTracing(std::set<const Tile*>* tiles) const {
+ typedef LayerIterator<LayerImpl> LayerIteratorType;
+ LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_);
+ for (LayerIteratorType it =
+ LayerIteratorType::Begin(&render_surface_layer_list_);
+ it != end;
+ ++it) {
+ if (!it.represents_itself())
+ continue;
+ LayerImpl* layer_impl = *it;
+ layer_impl->GetAllTilesForTracing(tiles);
+ }
+}
+
scoped_ptr<base::Value> LayerTreeImpl::AsValue() const {
scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
TracedValue::MakeDictIntoImplicitSnapshot(
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
index 55e6fb1..0dd57cf 100644
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -6,6 +6,7 @@
#define CC_TREES_LAYER_TREE_IMPL_H_
#include <list>
+#include <set>
#include <string>
#include <vector>
@@ -104,6 +105,7 @@
const LayerTreeDebugState& debug_state() const;
float device_scale_factor() const;
DebugRectHistory* debug_rect_history() const;
+ void GetAllTilesForTracing(std::set<const Tile*>* tiles) const;
scoped_ptr<base::Value> AsValue() const;
// Other public methods
