Remove --trace-all-rendered-frames in favour of disabled-by-default.

With this CL the trace events that were previously behind the --trace-all-rendered-frames will now be available through the trace-event UI as disabled-by-default elements. They will only show up in the trace files if explicitly selected in the tracing UI. BUG= R=enne@chromium.org, nduca@chromium.org, piman@chromium.org Review URL: https://codereview.chromium.org/14886018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200339 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · May 15, 2013 · 9197dbc · 9197dbc
1 parent a1dae87
commit 9197dbc
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 45 deletions.
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
@@ -667,6 +667,17 @@
         category_group, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE)
 
 
+// Macro to efficiently determine if a given category group is enabled.
+#define TRACE_EVENT_CATEGORY_GROUP_ENABLED(category_group, ret) \
+    do { \
+      INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \
+      if (*INTERNAL_TRACE_EVENT_UID(catstatic)) { \
+        *ret = true; \
+      } else { \
+        *ret = false; \
+      } \
+    } while (0)
+
 ////////////////////////////////////////////////////////////////////////////////
 // Implementation specific tracing API definitions.
 

diff --git a/cc/base/switches.cc b/cc/base/switches.cc
@@ -54,9 +54,6 @@ const char kNumRasterThreads[] = "num-raster-threads";
 // of pixels culled, and the number of pixels drawn, for each frame.
 const char kTraceOverdraw[] = "trace-overdraw";
 
-// Logs all rendered frames.
-const char kTraceAllRenderedFrames[] = "trace-all-rendered-frames";
-
 // Re-rasters everything multiple times to simulate a much slower machine.
 // Give a scale factor to cause raster to take that many times longer to
 // complete, such as --slow-down-raster-scale-factor=25.

diff --git a/cc/base/switches.h b/cc/base/switches.h
@@ -31,7 +31,6 @@ CC_EXPORT extern const char kTopControlsHeight[];
 CC_EXPORT extern const char kTopControlsHideThreshold[];
 CC_EXPORT extern const char kTraceOverdraw[];
 CC_EXPORT extern const char kTopControlsShowThreshold[];
-CC_EXPORT extern const char kTraceAllRenderedFrames[];
 CC_EXPORT extern const char kSlowDownRasterScaleFactor[];
 CC_EXPORT extern const char kLowResolutionContentsScaleFactor[];
 CC_EXPORT extern const char kCompositeToMailbox[];

diff --git a/cc/debug/layer_tree_debug_state.cc b/cc/debug/layer_tree_debug_state.cc
@@ -23,7 +23,6 @@ LayerTreeDebugState::LayerTreeDebugState()
       show_non_occluding_rects(false),
       slow_down_raster_scale_factor(0),
       show_picture_borders(false),
-      trace_all_rendered_frames(false),
       record_rendering_stats_(false) {}
 
 LayerTreeDebugState::~LayerTreeDebugState() {}
@@ -68,8 +67,7 @@ bool LayerTreeDebugState::Equal(const LayerTreeDebugState& a,
           a.show_non_occluding_rects == b.show_non_occluding_rects &&
           a.slow_down_raster_scale_factor == b.slow_down_raster_scale_factor &&
           a.show_picture_borders == b.show_picture_borders &&
-          a.record_rendering_stats_ == b.record_rendering_stats_ &&
-          a.trace_all_rendered_frames == b.trace_all_rendered_frames);
+          a.record_rendering_stats_ == b.record_rendering_stats_);
 }
 
 LayerTreeDebugState LayerTreeDebugState::Unite(const LayerTreeDebugState& a,
@@ -94,7 +92,6 @@ LayerTreeDebugState LayerTreeDebugState::Unite(const LayerTreeDebugState& a,
   r.show_picture_borders |= b.show_picture_borders;
 
   r.record_rendering_stats_ |= b.record_rendering_stats_;
-  r.trace_all_rendered_frames |= b.trace_all_rendered_frames;
 
   return r;
 }

diff --git a/cc/debug/layer_tree_debug_state.h b/cc/debug/layer_tree_debug_state.h
@@ -34,8 +34,6 @@ class CC_EXPORT LayerTreeDebugState {
   void SetRecordRenderingStats(bool enabled);
   bool RecordRenderingStats() const;
 
-  bool trace_all_rendered_frames;
-
   bool ShowHudInfo() const;
   bool ShowHudRects() const;
   bool ShowMemoryStats() const;

diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
@@ -323,8 +323,6 @@ void PictureLayerImpl::UpdateTilePriorities() {
 
   WhichTree tree =
       layer_tree_impl()->IsActiveTree() ? ACTIVE_TREE : PENDING_TREE;
-  bool store_screen_space_quads_on_tiles =
-      layer_tree_impl()->debug_state().trace_all_rendered_frames;
   size_t max_tiles_for_interest_area =
       layer_tree_impl()->settings().max_tiles_for_interest_area;
   tilings_->UpdateTilePriorities(
@@ -339,7 +337,6 @@ void PictureLayerImpl::UpdateTilePriorities() {
       last_screen_space_transform_,
       current_screen_space_transform,
       current_frame_time_in_seconds,
-      store_screen_space_quads_on_tiles,
       max_tiles_for_interest_area);
 
   last_screen_space_transform_ = current_screen_space_transform;

diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
@@ -292,7 +292,6 @@ void PictureLayerTiling::UpdateTilePriorities(
     const gfx::Transform& last_screen_transform,
     const gfx::Transform& current_screen_transform,
     double current_frame_time_in_seconds,
-    bool store_screen_space_quads_on_tiles,
     size_t max_tiles_for_interest_area) {
   if (!NeedsUpdateForFrameAtTime(current_frame_time_in_seconds)) {
     // This should never be zero for the purposes of has_ever_been_updated().
@@ -338,6 +337,10 @@ void PictureLayerTiling::UpdateTilePriorities(
   float current_scale = current_layer_contents_scale / contents_scale_;
   float last_scale = last_layer_contents_scale / contents_scale_;
 
+  bool store_screen_space_quads_on_tiles;
+  TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
+                                     &store_screen_space_quads_on_tiles);
+
   // Fast path tile priority calculation when both transforms are translations.
   if (last_screen_transform.IsIdentityOrTranslation() &&
       current_screen_transform.IsIdentityOrTranslation()) {
@@ -415,8 +418,8 @@ void PictureLayerTiling::UpdateTilePriorities(
           time_to_visible_in_seconds,
           distance_to_visible_in_pixels);
       if (store_screen_space_quads_on_tiles) {
-          bool clipped;
-          priority.set_current_screen_quad(
+        bool clipped;
+        priority.set_current_screen_quad(
             MathUtil::MapQuad(current_screen_transform,
                               gfx::QuadF(current_layer_content_rect),
                               &clipped));

diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
@@ -138,7 +138,6 @@ class CC_EXPORT PictureLayerTiling {
       const gfx::Transform& last_screen_transform,
       const gfx::Transform& current_screen_transform,
       double current_frame_time_in_seconds,
-      bool store_screen_space_quads_on_tiles,
       size_t max_tiles_for_interest_area);
 
   // Copies the src_tree priority into the dst_tree priority for all tiles.

diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc
@@ -262,7 +262,6 @@ void PictureLayerTilingSet::UpdateTilePriorities(
     const gfx::Transform& last_screen_transform,
     const gfx::Transform& current_screen_transform,
     double current_frame_time_in_seconds,
-    bool store_screen_space_quads_on_tiles,
     size_t max_tiles_for_interest_area) {
   gfx::RectF viewport_in_layer_space = gfx::ScaleRect(
       viewport_in_content_space,
@@ -284,7 +283,6 @@ void PictureLayerTilingSet::UpdateTilePriorities(
         last_screen_transform,
         current_screen_transform,
         current_frame_time_in_seconds,
-        store_screen_space_quads_on_tiles,
         max_tiles_for_interest_area);
   }
 }

diff --git a/cc/resources/picture_layer_tiling_set.h b/cc/resources/picture_layer_tiling_set.h
@@ -56,7 +56,6 @@ class CC_EXPORT PictureLayerTilingSet {
       const gfx::Transform& last_screen_transform,
       const gfx::Transform& current_screen_transform,
       double current_frame_time_in_seconds,
-      bool store_screen_space_quads_on_tiles,
       size_t max_tiles_for_interest_area);
 
   void DidBecomeActive();

diff --git a/cc/resources/picture_layer_tiling_unittest.cc b/cc/resources/picture_layer_tiling_unittest.cc
@@ -482,7 +482,6 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExist) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
 
@@ -499,7 +498,6 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExist) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       2.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, false));
 }
@@ -524,7 +522,6 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExistGiantViewport) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
 
@@ -541,7 +538,6 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExistGiantViewport) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       2.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
 }
@@ -569,7 +565,6 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExistOutsideViewport) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
 }
@@ -606,7 +601,6 @@ TEST_F(PictureLayerTilingIteratorTest,
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       1);  // max tiles in tile manager
   VerifyTiles(1.f,
               gfx::Rect(layer_bounds),
@@ -639,7 +633,6 @@ TEST_F(PictureLayerTilingIteratorTest,
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       1);  // max tiles in tile manager
 
   int num_tiles = 0;
@@ -679,7 +672,6 @@ TEST_F(PictureLayerTilingIteratorTest, AddTilingsToMatchScale) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
 
   // The active tiling has tiles now.
@@ -712,7 +704,6 @@ TEST_F(PictureLayerTilingIteratorTest, AddTilingsToMatchScale) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
 
   VerifyTiles(pending_set.tiling_at(0),
@@ -740,7 +731,6 @@ TEST_F(PictureLayerTilingIteratorTest, LCDText) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
 
   VerifyTiles(tiling_.get(),
@@ -784,7 +774,6 @@ TEST_F(PictureLayerTilingIteratorTest, LCDText_CanRecreate) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
 
   VerifyTiles(tiling_.get(),
@@ -841,7 +830,6 @@ TEST_F(PictureLayerTilingIteratorTest, LCDText_WithTwin) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   twin_tiling->UpdateTilePriorities(
       PENDING_TREE,
@@ -855,7 +843,6 @@ TEST_F(PictureLayerTilingIteratorTest, LCDText_WithTwin) {
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
       1.0,  // current frame time
-      false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
 
   VerifyTiles(tiling_.get(),

diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc
@@ -28,7 +28,8 @@ Tile::Tile(TileManager* tile_manager,
 }
 
 Tile::~Tile() {
-  TRACE_EVENT_OBJECT_DELETED_WITH_ID("cc.debug", "cc::Tile", this);
+  TRACE_EVENT_OBJECT_DELETED_WITH_ID(
+      TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::Tile", this);
   tile_manager_->UnregisterTile(this);
 }
 

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
@@ -200,13 +200,15 @@ LayerTreeHostImpl::LayerTreeHostImpl(
 
   // LTHI always has an active tree.
   active_tree_ = LayerTreeImpl::create(this);
-  TRACE_EVENT_OBJECT_CREATED_WITH_ID("cc.debug", "cc::LayerTreeHostImpl", this);
+  TRACE_EVENT_OBJECT_CREATED_WITH_ID(
+      TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerTreeHostImpl", this);
 }
 
 LayerTreeHostImpl::~LayerTreeHostImpl() {
   DCHECK(proxy_->IsImplThread());
   TRACE_EVENT0("cc", "LayerTreeHostImpl::~LayerTreeHostImpl()");
-  TRACE_EVENT_OBJECT_DELETED_WITH_ID("cc.debug", "cc::LayerTreeHostImpl", this);
+  TRACE_EVENT_OBJECT_DELETED_WITH_ID(
+      TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerTreeHostImpl", this);
 
   if (active_tree_->root_layer()) {
     ClearRenderSurfaces();
@@ -1103,11 +1105,9 @@ void LayerTreeHostImpl::DrawLayers(FrameData* frame,
     paint_time_counter_->SavePaintTime(stats.total_paint_time);
   }
 
-  if (debug_state_.trace_all_rendered_frames) {
-    TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
-        "cc.debug", "cc::LayerTreeHostImpl", this,
-        TracedValue::FromValue(AsValue().release()));
-  }
+  TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
+      TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerTreeHostImpl", this,
+      TracedValue::FromValue(AsValue().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

diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -157,7 +157,6 @@ std::string DeriveCommandLine(const GURL& start_url,
       cc::switches::kShowScreenSpaceRects,
       cc::switches::kShowSurfaceDamageRects,
       cc::switches::kSlowDownRasterScaleFactor,
-      cc::switches::kTraceAllRenderedFrames,
       cc::switches::kTraceOverdraw,
       cc::switches::kUIDisablePartialSwap,
       cc::switches::kUIEnablePerTilePainting,

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
@@ -972,7 +972,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     cc::switches::kTopControlsHeight,
     cc::switches::kTopControlsHideThreshold,
     cc::switches::kTopControlsShowThreshold,
-    cc::switches::kTraceAllRenderedFrames,
     cc::switches::kTraceOverdraw,
   };
   renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,

diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
@@ -218,8 +218,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
 
   settings.initial_debug_state.SetRecordRenderingStats(
       cmd->HasSwitch(switches::kEnableGpuBenchmarking));
-  settings.initial_debug_state.trace_all_rendered_frames =
-      cmd->HasSwitch(cc::switches::kTraceAllRenderedFrames);
 
   if (cmd->HasSwitch(cc::switches::kSlowDownRasterScaleFactor)) {
     const int kMinSlowDownScaleFactor = 0;