summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcaseq@chromium.org <caseq@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-16 19:10:29 +0000
committercaseq@chromium.org <caseq@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-16 19:10:29 +0000
commita75441cea46a1566bfe605d1a3b94d81c9db42c6 (patch)
tree1c72fbdf4e2c2fa860d7e32ec118eeee6eb358b0
parentdbd0900dbbd679123cd5bd254df04620087309a5 (diff)
downloadchromium_src-a75441cea46a1566bfe605d1a3b94d81c9db42c6.zip
chromium_src-a75441cea46a1566bfe605d1a3b94d81c9db42c6.tar.gz
chromium_src-a75441cea46a1566bfe605d1a3b94d81c9db42c6.tar.bz2
Use LayerTreeHostImpl id instead of its address as id in trace events
This would let us link it to the inspected page in DevTools, as we already do with other events coming from LTHI. BUG=361045 Review URL: https://codereview.chromium.org/290083007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271074 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--cc/trees/layer_tree_host_impl.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 29b3f9c..b3911f8 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -276,14 +276,14 @@ LayerTreeHostImpl::LayerTreeHostImpl(
// LTHI always has an active tree.
active_tree_ = LayerTreeImpl::create(this);
TRACE_EVENT_OBJECT_CREATED_WITH_ID(
- TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerTreeHostImpl", this);
+ TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerTreeHostImpl", id_);
}
LayerTreeHostImpl::~LayerTreeHostImpl() {
DCHECK(proxy_->IsImplThread());
TRACE_EVENT0("cc", "LayerTreeHostImpl::~LayerTreeHostImpl()");
TRACE_EVENT_OBJECT_DELETED_WITH_ID(
- TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerTreeHostImpl", this);
+ TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerTreeHostImpl", id_);
if (input_handler_client_) {
input_handler_client_->WillShutdown();
@@ -1448,9 +1448,11 @@ void LayerTreeHostImpl::DrawLayers(FrameData* frame,
}
TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
- TRACE_DISABLED_BY_DEFAULT("cc.debug") ","
- TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"), "cc::LayerTreeHostImpl",
- this, TracedValue::FromValue(AsValueWithFrame(frame).release()));
+ TRACE_DISABLED_BY_DEFAULT("cc.debug") "," TRACE_DISABLED_BY_DEFAULT(
+ "cc.debug.quads"),
+ "cc::LayerTreeHostImpl",
+ id_,
+ TracedValue::FromValue(AsValueWithFrame(frame).release()));
// Because the contents of the HUD depend on everything else in the frame, the
// contents of its texture are updated as the last thing before the frame is