diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 19:37:54 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 19:37:54 +0000 |
| commit | 1d7a31166d86343e364471e7809637124f7e57b9 (patch) | |
| tree | 9398892d2ed46f5ae0489d09fd9c028ea943a391 | |
| parent | c2575be10fd39de8ee674ac21a2c5d0f29cdebe9 (diff) | |
| download | chromium_src-1d7a31166d86343e364471e7809637124f7e57b9.zip chromium_src-1d7a31166d86343e364471e7809637124f7e57b9.tar.gz chromium_src-1d7a31166d86343e364471e7809637124f7e57b9.tar.bz2 | |
Fix about:tracing import errors with cc::Tiles
Tiles can be used in either cc.debug or cc.debug.quads. Update their category
accordingly. Tracing importers currently require that the category for a tile
when it is snapshotted match the category when it is deleted. We might relax
that in the long run, but thats anther discussion for another time.
R=danakj@chromium.org
CC=danakj
Review URL: https://codereview.chromium.org/23461047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222834 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | cc/resources/tile.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc index 7142038..d7e1d2c 100644 --- a/cc/resources/tile.cc +++ b/cc/resources/tile.cc @@ -37,7 +37,9 @@ Tile::Tile(TileManager* tile_manager, Tile::~Tile() { TRACE_EVENT_OBJECT_DELETED_WITH_ID( - TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::Tile", this); + TRACE_DISABLED_BY_DEFAULT("cc.debug") "," + TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"), + "cc::Tile", this); tile_manager_->UnregisterTile(this); } |