cc: Enable rendering stats recording in browser compositor.

cc: Enable rendering stats recording in browser compositor.

This patch moves the kEnableGpuBenchmarking switch from
content switches to cc switches for it to be accessible from
ui/compositor/compositor.cc.

If the flag is set, the browser compositor enalbes recording of rendering
stats in its constructor. The recorded stats will be used by a follow-up patch
that switches smoothness benchmark to use time stamps from the browser
compositor when available.

R=piman@chromium.org,nduca@chromium.org
BUG=340747
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=249307

[ernstm, 2014-02-04 19:12:45]

PTAL

[danakj, 2014-02-04 19:16:26]

https://codereview.chromium.org/148983007/diff/1/chrome/browser/chromeos/logi...
File chrome/browser/chromeos/login/chrome_restart_request.cc (right):

https://codereview.chromium.org/148983007/diff/1/chrome/browser/chromeos/logi...
chrome/browser/chromeos/login/chrome_restart_request.cc:177:
cc::siwtches::kEnableGpuBenchmarking,
"switches"

[ernstm, 2014-02-04 19:22:01]

https://codereview.chromium.org/148983007/diff/1/chrome/browser/chromeos/logi...
File chrome/browser/chromeos/login/chrome_restart_request.cc (right):

https://codereview.chromium.org/148983007/diff/1/chrome/browser/chromeos/logi...
chrome/browser/chromeos/login/chrome_restart_request.cc:177:
cc::siwtches::kEnableGpuBenchmarking,
On 2014/02/04 19:16:27, danakj wrote:
> "switches"

Good catch! Fixed.

BTW: Was kEnableGpuBenchmarking intentionally not included in this list before?

[danakj, 2014-02-04 19:28:13]

https://codereview.chromium.org/148983007/diff/1/chrome/browser/chromeos/logi...
File chrome/browser/chromeos/login/chrome_restart_request.cc (right):

https://codereview.chromium.org/148983007/diff/1/chrome/browser/chromeos/logi...
chrome/browser/chromeos/login/chrome_restart_request.cc:177:
cc::siwtches::kEnableGpuBenchmarking,
On 2014/02/04 19:22:01, Manfred Ernst wrote:
> On 2014/02/04 19:16:27, danakj wrote:
> > "switches"
> 
> Good catch! Fixed.
> 
> BTW: Was kEnableGpuBenchmarking intentionally not included in this list
before?

Not AFAIK.

[piman, 2014-02-04 19:47:04]

lgtm

[ernstm, 2014-02-04 19:57:15]

The CQ bit was checked by ernstm@chromium.org

[commit-bot: I haz the power, 2014-02-04 20:01:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ernstm@chromium.org/148983007/60001

[commit-bot: I haz the power, 2014-02-04 20:01:49]

Failed to apply patch for
content/browser/renderer_host/render_widget_host_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/renderer_host/render_widget_host_impl.cc
  Hunk #2 FAILED at 2412.
  Hunk #3 FAILED at 2466.
  Hunk #4 succeeded at 2477 (offset -21 lines).
  2 out of 4 hunks FAILED -- saving rejects to file
content/browser/renderer_host/render_widget_host_impl.cc.rej

Patch:       content/browser/renderer_host/render_widget_host_impl.cc
Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc
b/content/browser/renderer_host/render_widget_host_impl.cc
index
663fd9ea8bb1cc8e3c07356df8180f89702ef84a..b7a6f0735c3708986e1e154a67e0903a977883c0
100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -21,6 +21,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
+#include "cc/base/switches.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
@@ -2411,7 +2412,7 @@ void RenderWidgetHostImpl::ComputeTouchLatency(
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGpuBenchmarking))
+          cc::switches::kEnableGpuBenchmarking))
     Send(new ViewMsg_SetBrowserRenderingStats(routing_id_, rendering_stats_));
 }
 
@@ -2465,7 +2466,7 @@ void RenderWidgetHostImpl::FrameSwapped(const
ui::LatencyInfo& latency_info) {
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGpuBenchmarking))
+          cc::switches::kEnableGpuBenchmarking))
     Send(new ViewMsg_SetBrowserRenderingStats(routing_id_, rendering_stats_));
 }
 
@@ -2497,7 +2498,7 @@ void RenderWidgetHostImpl::WindowSnapshotReachedScreen(int
snapshot_id) {
   // This feature is behind the kEnableGpuBenchmarking command line switch
   // because it poses security concerns and should only be used for testing.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kEnableGpuBenchmarking)) {
+  if (!command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking)) {
     Send(new ViewMsg_WindowSnapshotCompleted(
         GetRoutingID(), snapshot_id, gfx::Size(), png));
     return;

[commit-bot: I haz the power, 2014-02-04 20:13:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ernstm@chromium.org/148983007/60001

[commit-bot: I haz the power, 2014-02-04 20:13:36]

Failed to apply patch for
content/browser/renderer_host/render_widget_host_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/renderer_host/render_widget_host_impl.cc
  Hunk #2 FAILED at 2412.
  Hunk #3 FAILED at 2466.
  Hunk #4 succeeded at 2477 (offset -21 lines).
  2 out of 4 hunks FAILED -- saving rejects to file
content/browser/renderer_host/render_widget_host_impl.cc.rej

Patch:       content/browser/renderer_host/render_widget_host_impl.cc
Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc
b/content/browser/renderer_host/render_widget_host_impl.cc
index
663fd9ea8bb1cc8e3c07356df8180f89702ef84a..b7a6f0735c3708986e1e154a67e0903a977883c0
100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -21,6 +21,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
+#include "cc/base/switches.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
@@ -2411,7 +2412,7 @@ void RenderWidgetHostImpl::ComputeTouchLatency(
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGpuBenchmarking))
+          cc::switches::kEnableGpuBenchmarking))
     Send(new ViewMsg_SetBrowserRenderingStats(routing_id_, rendering_stats_));
 }
 
@@ -2465,7 +2466,7 @@ void RenderWidgetHostImpl::FrameSwapped(const
ui::LatencyInfo& latency_info) {
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGpuBenchmarking))
+          cc::switches::kEnableGpuBenchmarking))
     Send(new ViewMsg_SetBrowserRenderingStats(routing_id_, rendering_stats_));
 }
 
@@ -2497,7 +2498,7 @@ void RenderWidgetHostImpl::WindowSnapshotReachedScreen(int
snapshot_id) {
   // This feature is behind the kEnableGpuBenchmarking command line switch
   // because it poses security concerns and should only be used for testing.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kEnableGpuBenchmarking)) {
+  if (!command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking)) {
     Send(new ViewMsg_WindowSnapshotCompleted(
         GetRoutingID(), snapshot_id, gfx::Size(), png));
     return;

[commit-bot: I haz the power, 2014-02-04 20:26:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ernstm@chromium.org/148983007/60001

[commit-bot: I haz the power, 2014-02-04 20:26:49]

Failed to apply patch for
content/browser/renderer_host/render_widget_host_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/renderer_host/render_widget_host_impl.cc
  Hunk #2 FAILED at 2412.
  Hunk #3 FAILED at 2466.
  Hunk #4 succeeded at 2477 (offset -21 lines).
  2 out of 4 hunks FAILED -- saving rejects to file
content/browser/renderer_host/render_widget_host_impl.cc.rej

Patch:       content/browser/renderer_host/render_widget_host_impl.cc
Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc
b/content/browser/renderer_host/render_widget_host_impl.cc
index
663fd9ea8bb1cc8e3c07356df8180f89702ef84a..b7a6f0735c3708986e1e154a67e0903a977883c0
100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -21,6 +21,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
+#include "cc/base/switches.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
@@ -2411,7 +2412,7 @@ void RenderWidgetHostImpl::ComputeTouchLatency(
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGpuBenchmarking))
+          cc::switches::kEnableGpuBenchmarking))
     Send(new ViewMsg_SetBrowserRenderingStats(routing_id_, rendering_stats_));
 }
 
@@ -2465,7 +2466,7 @@ void RenderWidgetHostImpl::FrameSwapped(const
ui::LatencyInfo& latency_info) {
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGpuBenchmarking))
+          cc::switches::kEnableGpuBenchmarking))
     Send(new ViewMsg_SetBrowserRenderingStats(routing_id_, rendering_stats_));
 }
 
@@ -2497,7 +2498,7 @@ void RenderWidgetHostImpl::WindowSnapshotReachedScreen(int
snapshot_id) {
   // This feature is behind the kEnableGpuBenchmarking command line switch
   // because it poses security concerns and should only be used for testing.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kEnableGpuBenchmarking)) {
+  if (!command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking)) {
     Send(new ViewMsg_WindowSnapshotCompleted(
         GetRoutingID(), snapshot_id, gfx::Size(), png));
     return;

[commit-bot: I haz the power, 2014-02-04 20:45:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ernstm@chromium.org/148983007/60001

[commit-bot: I haz the power, 2014-02-04 20:45:14]

Failed to apply patch for
content/browser/renderer_host/render_widget_host_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/renderer_host/render_widget_host_impl.cc
  Hunk #2 FAILED at 2412.
  Hunk #3 FAILED at 2466.
  Hunk #4 succeeded at 2477 (offset -21 lines).
  2 out of 4 hunks FAILED -- saving rejects to file
content/browser/renderer_host/render_widget_host_impl.cc.rej

Patch:       content/browser/renderer_host/render_widget_host_impl.cc
Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc
b/content/browser/renderer_host/render_widget_host_impl.cc
index
663fd9ea8bb1cc8e3c07356df8180f89702ef84a..b7a6f0735c3708986e1e154a67e0903a977883c0
100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -21,6 +21,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
+#include "cc/base/switches.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
@@ -2411,7 +2412,7 @@ void RenderWidgetHostImpl::ComputeTouchLatency(
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGpuBenchmarking))
+          cc::switches::kEnableGpuBenchmarking))
     Send(new ViewMsg_SetBrowserRenderingStats(routing_id_, rendering_stats_));
 }
 
@@ -2465,7 +2466,7 @@ void RenderWidgetHostImpl::FrameSwapped(const
ui::LatencyInfo& latency_info) {
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGpuBenchmarking))
+          cc::switches::kEnableGpuBenchmarking))
     Send(new ViewMsg_SetBrowserRenderingStats(routing_id_, rendering_stats_));
 }
 
@@ -2497,7 +2498,7 @@ void RenderWidgetHostImpl::WindowSnapshotReachedScreen(int
snapshot_id) {
   // This feature is behind the kEnableGpuBenchmarking command line switch
   // because it poses security concerns and should only be used for testing.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kEnableGpuBenchmarking)) {
+  if (!command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking)) {
     Send(new ViewMsg_WindowSnapshotCompleted(
         GetRoutingID(), snapshot_id, gfx::Size(), png));
     return;

[ernstm, 2014-02-04 20:52:59]

The CQ bit was checked by ernstm@chromium.org

[commit-bot: I haz the power, 2014-02-04 20:59:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ernstm@chromium.org/148983007/130001

[commit-bot: I haz the power, 2014-02-05 00:58:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ernstm@chromium.org/148983007/130001

[ernstm, 2014-02-05 18:09:16]

The CQ bit was unchecked by ernstm@chromium.org

[ernstm, 2014-02-05 18:10:15]

The CQ bit was checked by ernstm@chromium.org

[commit-bot: I haz the power, 2014-02-06 09:20:58]

Change committed as 249307