cc: Chromify LayerTreeDebugState

R=jamesr@chromium.org
BUG=none


Review URL: https://chromiumcodereview.appspot.com/12700010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188788 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 98 insertions, 90 deletions

diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
index dd29d1e..e7e7814 100644
--- a/cc/debug/debug_rect_history.cc
+++ b/cc/debug/debug_rect_history.cc
@@ -30,22 +30,22 @@ void DebugRectHistory::SaveDebugRectsForCurrentFrame(
   // store all debug rects for a history of many frames.
   debug_rects_.clear();
 
-  if (debug_state.showPaintRects)
+  if (debug_state.show_paint_rects)
     SavePaintRects(root_layer);
 
-  if (debug_state.showPropertyChangedRects)
+  if (debug_state.show_property_changed_rects)
     SavePropertyChangedRects(render_surface_layer_list);
 
-  if (debug_state.showSurfaceDamageRects)
+  if (debug_state.show_surface_damage_rects)
     SaveSurfaceDamageRects(render_surface_layer_list);
 
-  if (debug_state.showScreenSpaceRects)
+  if (debug_state.show_screen_space_rects)
     SaveScreenSpaceRects(render_surface_layer_list);
 
-  if (debug_state.showOccludingRects)
+  if (debug_state.show_occluding_rects)
     SaveOccludingRects(occluding_screen_space_rects);
 
-  if (debug_state.showNonOccludingRects)
+  if (debug_state.show_non_occluding_rects)
     SaveNonOccludingRects(non_occluding_screen_space_rects);
 }
 
diff --git a/cc/debug/layer_tree_debug_state.cc b/cc/debug/layer_tree_debug_state.cc
index 86f4848..41b53e3 100644
--- a/cc/debug/layer_tree_debug_state.cc
+++ b/cc/debug/layer_tree_debug_state.cc
@@ -8,86 +8,92 @@
 
 namespace cc {
 
-// IMPORTANT: new fields must be added to equal() and unite()
+// IMPORTANT: new fields must be added to Equal() and Unite()
 LayerTreeDebugState::LayerTreeDebugState()
-  : showFPSCounter(false)
-  , showPlatformLayerTree(false)
-  , showDebugBorders(false)
-  , continuousPainting(false)
-  , showPaintRects(false)
-  , showPropertyChangedRects(false)
-  , showSurfaceDamageRects(false)
-  , showScreenSpaceRects(false)
-  , showReplicaScreenSpaceRects(false)
-  , showOccludingRects(false)
-  , showNonOccludingRects(false)
-  , slowDownRasterScaleFactor(0)
-  , m_recordRenderingStats(false)
-  , traceAllRenderedFrames(false) { }
-
-LayerTreeDebugState::~LayerTreeDebugState() {
+    : show_fps_counter(false),
+      show_platform_layer_tree(false),
+      show_debug_borders(false),
+      continuous_painting(false),
+      show_paint_rects(false),
+      show_property_changed_rects(false),
+      show_surface_damage_rects(false),
+      show_screen_space_rects(false),
+      show_replica_screen_space_rects(false),
+      show_occluding_rects(false),
+      show_non_occluding_rects(false),
+      slow_down_raster_scale_factor(0),
+      record_rendering_stats_(false),
+      trace_all_rendered_frames(false) {}
+
+LayerTreeDebugState::~LayerTreeDebugState() {}
+
+void LayerTreeDebugState::SetRecordRenderingStats(bool enabled) {
+  record_rendering_stats_ = enabled;
 }
 
-void LayerTreeDebugState::setRecordRenderingStats(bool enabled) {
-    m_recordRenderingStats = enabled;
+bool LayerTreeDebugState::RecordRenderingStats() const {
+  return record_rendering_stats_ || continuous_painting;
 }
 
-bool LayerTreeDebugState::recordRenderingStats() const {
-    return m_recordRenderingStats || continuousPainting;
+bool LayerTreeDebugState::ShowHudInfo() const {
+  return show_fps_counter || show_platform_layer_tree || continuous_painting ||
+         ShowHudRects();
 }
 
-bool LayerTreeDebugState::showHudInfo() const {
-    return showFPSCounter || showPlatformLayerTree || continuousPainting || showHudRects();
+bool LayerTreeDebugState::ShowHudRects() const {
+  return show_paint_rects || show_property_changed_rects ||
+         show_surface_damage_rects || show_screen_space_rects ||
+         show_replica_screen_space_rects || show_occluding_rects ||
+         show_non_occluding_rects;
 }
 
-bool LayerTreeDebugState::showHudRects() const {
-    return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects || showNonOccludingRects;
+bool LayerTreeDebugState::ShowMemoryStats() const {
+  return show_fps_counter || continuous_painting;
 }
 
-bool LayerTreeDebugState::showMemoryStats() const {
-    return showFPSCounter || continuousPainting;
+bool LayerTreeDebugState::Equal(const LayerTreeDebugState& a,
+                                const LayerTreeDebugState& b) {
+  return (a.show_fps_counter == b.show_fps_counter &&
+          a.show_platform_layer_tree == b.show_platform_layer_tree &&
+          a.show_debug_borders == b.show_debug_borders &&
+          a.continuous_painting == b.continuous_painting &&
+          a.show_paint_rects == b.show_paint_rects &&
+          a.show_property_changed_rects == b.show_property_changed_rects &&
+          a.show_surface_damage_rects == b.show_surface_damage_rects &&
+          a.show_screen_space_rects == b.show_screen_space_rects &&
+          a.show_replica_screen_space_rects ==
+          b.show_replica_screen_space_rects &&
+          a.show_occluding_rects == b.show_occluding_rects &&
+          a.show_non_occluding_rects == b.show_non_occluding_rects &&
+          a.slow_down_raster_scale_factor == b.slow_down_raster_scale_factor &&
+          a.record_rendering_stats_ == b.record_rendering_stats_ &&
+          a.trace_all_rendered_frames == b.trace_all_rendered_frames);
 }
 
-bool LayerTreeDebugState::equal(const LayerTreeDebugState& a, const LayerTreeDebugState& b) {
-    return (a.showFPSCounter == b.showFPSCounter &&
-            a.showPlatformLayerTree == b.showPlatformLayerTree &&
-            a.showDebugBorders == b.showDebugBorders &&
-            a.continuousPainting == b.continuousPainting &&
-            a.showPaintRects == b.showPaintRects &&
-            a.showPropertyChangedRects == b.showPropertyChangedRects &&
-            a.showSurfaceDamageRects == b.showSurfaceDamageRects &&
-            a.showScreenSpaceRects == b.showScreenSpaceRects &&
-            a.showReplicaScreenSpaceRects == b.showReplicaScreenSpaceRects &&
-            a.showOccludingRects == b.showOccludingRects &&
-            a.showNonOccludingRects == b.showNonOccludingRects &&
-            a.slowDownRasterScaleFactor == b.slowDownRasterScaleFactor &&
-            a.m_recordRenderingStats == b.m_recordRenderingStats &&
-            a.traceAllRenderedFrames == b.traceAllRenderedFrames);
-}
-
-LayerTreeDebugState LayerTreeDebugState::unite(const LayerTreeDebugState& a, const LayerTreeDebugState& b) {
-    LayerTreeDebugState r(a);
+LayerTreeDebugState LayerTreeDebugState::Unite(const LayerTreeDebugState& a,
+                                               const LayerTreeDebugState& b) {
+  LayerTreeDebugState r(a);
 
-    r.showFPSCounter |= b.showFPSCounter;
-    r.showPlatformLayerTree |= b.showPlatformLayerTree;
-    r.showDebugBorders |= b.showDebugBorders;
-    r.continuousPainting |= b.continuousPainting;
+  r.show_fps_counter |= b.show_fps_counter;
+  r.show_platform_layer_tree |= b.show_platform_layer_tree;
+  r.show_debug_borders |= b.show_debug_borders;
+  r.continuous_painting |= b.continuous_painting;
 
-    r.showPaintRects |= b.showPaintRects;
-    r.showPropertyChangedRects |= b.showPropertyChangedRects;
-    r.showSurfaceDamageRects |= b.showSurfaceDamageRects;
-    r.showScreenSpaceRects |= b.showScreenSpaceRects;
-    r.showReplicaScreenSpaceRects |= b.showReplicaScreenSpaceRects;
-    r.showOccludingRects |= b.showOccludingRects;
-    r.showNonOccludingRects |= b.showNonOccludingRects;
+  r.show_paint_rects |= b.show_paint_rects;
+  r.show_property_changed_rects |= b.show_property_changed_rects;
+  r.show_surface_damage_rects |= b.show_surface_damage_rects;
+  r.show_screen_space_rects |= b.show_screen_space_rects;
+  r.show_replica_screen_space_rects |= b.show_replica_screen_space_rects;
+  r.show_occluding_rects |= b.show_occluding_rects;
+  r.show_non_occluding_rects |= b.show_non_occluding_rects;
 
-    if (b.slowDownRasterScaleFactor)
-      r.slowDownRasterScaleFactor = b.slowDownRasterScaleFactor;
+  if (b.slow_down_raster_scale_factor)
+    r.slow_down_raster_scale_factor = b.slow_down_raster_scale_factor;
 
-    r.m_recordRenderingStats |= b.m_recordRenderingStats;
-    r.traceAllRenderedFrames |= b.traceAllRenderedFrames;
+  r.record_rendering_stats_ |= b.record_rendering_stats_;
+  r.trace_all_rendered_frames |= b.trace_all_rendered_frames;
 
-    return r;
+  return r;
 }
 
 }  // namespace cc
diff --git a/cc/debug/layer_tree_debug_state.h b/cc/debug/layer_tree_debug_state.h
index c3a4bae..c276aadb 100644
--- a/cc/debug/layer_tree_debug_state.h
+++ b/cc/debug/layer_tree_debug_state.h
@@ -5,6 +5,7 @@
 #ifndef CC_DEBUG_LAYER_TREE_DEBUG_STATE_H_
 #define CC_DEBUG_LAYER_TREE_DEBUG_STATE_H_
 
+#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 
 namespace cc {
@@ -14,35 +15,36 @@ class CC_EXPORT LayerTreeDebugState {
   LayerTreeDebugState();
   ~LayerTreeDebugState();
 
-  bool showFPSCounter;
-  bool showPlatformLayerTree;
-  bool showDebugBorders;
-  bool continuousPainting;
+  bool show_fps_counter;
+  bool show_platform_layer_tree;
+  bool show_debug_borders;
+  bool continuous_painting;
 
-  bool showPaintRects;
-  bool showPropertyChangedRects;
-  bool showSurfaceDamageRects;
-  bool showScreenSpaceRects;
-  bool showReplicaScreenSpaceRects;
-  bool showOccludingRects;
-  bool showNonOccludingRects;
+  bool show_paint_rects;
+  bool show_property_changed_rects;
+  bool show_surface_damage_rects;
+  bool show_screen_space_rects;
+  bool show_replica_screen_space_rects;
+  bool show_occluding_rects;
+  bool show_non_occluding_rects;
 
-  int slowDownRasterScaleFactor;
+  int slow_down_raster_scale_factor;
 
-  void setRecordRenderingStats(bool);
-  bool recordRenderingStats() const;
+  void SetRecordRenderingStats(bool enabled);
+  bool RecordRenderingStats() const;
 
-  bool traceAllRenderedFrames;
+  bool trace_all_rendered_frames;
 
-  bool showHudInfo() const;
-  bool showHudRects() const;
-  bool showMemoryStats() const;
+  bool ShowHudInfo() const;
+  bool ShowHudRects() const;
+  bool ShowMemoryStats() const;
 
-  static bool equal(const LayerTreeDebugState& a, const LayerTreeDebugState& b);
-  static LayerTreeDebugState unite(const LayerTreeDebugState& a, const LayerTreeDebugState& b);
+  static bool Equal(const LayerTreeDebugState& a, const LayerTreeDebugState& b);
+  static LayerTreeDebugState Unite(const LayerTreeDebugState& a,
+                                   const LayerTreeDebugState& b);
 
-private:
-  bool m_recordRenderingStats;
+ private:
+  bool record_rendering_stats_;
 };
 
 }  // namespace cc