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

webkit/glue/webpreferences.cc

Index: webkit/glue/webpreferences.cc
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 03c87bf093c5f88848d6b8991732a2808452b3a4..4235093a401cbddeeb5638854e3bb533f8219826 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -64,6 +64,8 @@ WebPreferences::WebPreferences()
       experimental_webgl_enabled(false),
       gl_multisampling_enabled(true),
       show_composited_layer_borders(false),
+      show_composited_layer_tree(false),
+      show_fps_counter(false),
       accelerated_compositing_enabled(false),
       accelerated_layers_enabled(false),
       accelerated_video_enabled(false),
@@ -160,6 +162,13 @@ void WebPreferences::Apply(WebView* web_view) const {
   // on command line.
   settings->setShowDebugBorders(show_composited_layer_borders);
 
+  // Display an FPS indicator if requested on the command line.
+  settings->setShowFPSCounter(show_fps_counter);
+
+  // Display the current compositor tree as overlay if requested on
+  // the command line
+  settings->setShowPlatformLayerTree(show_composited_layer_tree);
+
   // Enable gpu-accelerated compositing if requested on the command line.
   settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);