Add command line switches and about:flag to enable FPS indicator and compositor layer tree.

Intentionally did not add a flag for compositor-layer-tree. Can add one if we feel it is truly useful.

BUG=
TEST=

Review URL: http://codereview.chromium.org/6581004

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

6 files changed, 30 insertions, 0 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 734a0f7..929c73d 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4082,6 +4082,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION" desc="Description of the 'Composited layer borders' lab.">
         Renders a border around composited Render Layers to help debug and study layer compositing.
       </message>
+      <message name="IDS_FLAGS_SHOW_FPS_COUNTER" desc="Name of the 'Show FPS counter' lab.">
+        FPS counter.
+      </message>
+      <message name="IDS_FLAGS_SHOW_FPS_COUNTER_DESCRIPTION" desc="Description of the 'Show FPS counter' lab.">
+        Shows a page's actual frame rate, in frames per second, when hardware acceleration is active.
+      </message>
       <message name="IDS_FLAGS_COMPOSITE_TO_TEXTURE_NAME" desc="Name of the 'Offscreen Compositing' lab.">
         Composite to Texture
       </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 4d59c635..b492c49 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -156,6 +156,13 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kShowCompositedLayerBorders)
   },
   {
+    "show-fps-counter",
+    IDS_FLAGS_SHOW_FPS_COUNTER,
+    IDS_FLAGS_SHOW_FPS_COUNTER_DESCRIPTION,
+    kOsAll,
+    SINGLE_VALUE_TYPE(switches::kShowFPSCounter)
+  },
+  {
     "gpu-canvas-2d",  // FLAGS:RECORD_UMA
     IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME,
     IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION,
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 76bde5a..45b38d8 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -285,6 +285,10 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
         command_line.HasSwitch(switches::kAllowFileAccessFromFiles);
     web_prefs.show_composited_layer_borders =
         command_line.HasSwitch(switches::kShowCompositedLayerBorders);
+    web_prefs.show_composited_layer_tree =
+        command_line.HasSwitch(switches::kShowCompositedLayerTree);
+    web_prefs.show_fps_counter =
+        command_line.HasSwitch(switches::kShowFPSCounter);
     web_prefs.accelerated_compositing_enabled =
         gpu_enabled() &&
         !command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index cd560e3..aefed69 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -988,6 +988,13 @@ const char kShowIcons[]                     = "show-icons";
 // layer compositing.
 const char kShowCompositedLayerBorders[]    = "show-composited-layer-borders";
 
+// Draws a textual dump of the compositor layer tree to help debug and study
+// layer compositing.
+const char kShowCompositedLayerTree[]       = "show-composited-layer-tree";
+
+// Draws a FPS indicator
+const char kShowFPSCounter[]                = "show-fps-counter";
+
 // Visibly render a border around paint rects in the web page to help debug
 // and study painting behavior.
 const char kShowPaintRects[]                = "show-paint-rects";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 9880f7f..5a2c4e3 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -272,6 +272,8 @@ extern const char kSearchInOmniboxHint[];
 extern const char kServiceProcess[];
 extern const char kServiceAccountLsid[];
 extern const char kShowCompositedLayerBorders[];
+extern const char kShowCompositedLayerTree[];
+extern const char kShowFPSCounter[];
 extern const char kShowIcons[];
 extern const char kShowPaintRects[];
 extern const char kSilentDumpOnDCHECK[];
diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index 1ee9fbf..7836cd3 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -403,6 +403,8 @@ void ParamTraits<WebPreferences>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.experimental_webgl_enabled);
   WriteParam(m, p.gl_multisampling_enabled);
   WriteParam(m, p.show_composited_layer_borders);
+  WriteParam(m, p.show_composited_layer_tree);
+  WriteParam(m, p.show_fps_counter);
   WriteParam(m, p.accelerated_compositing_enabled);
   WriteParam(m, p.composite_to_texture_enabled);
   WriteParam(m, p.accelerated_2d_canvas_enabled);
@@ -461,6 +463,8 @@ bool ParamTraits<WebPreferences>::Read(const Message* m, void** iter,
       ReadParam(m, iter, &p->experimental_webgl_enabled) &&
       ReadParam(m, iter, &p->gl_multisampling_enabled) &&
       ReadParam(m, iter, &p->show_composited_layer_borders) &&
+      ReadParam(m, iter, &p->show_composited_layer_tree) &&
+      ReadParam(m, iter, &p->show_fps_counter) &&
       ReadParam(m, iter, &p->accelerated_compositing_enabled) &&
       ReadParam(m, iter, &p->composite_to_texture_enabled) &&
       ReadParam(m, iter, &p->accelerated_2d_canvas_enabled) &&