Populate cc::LayerTreeSettings from command line instead of WebKit's values

This lets us get rid of a bunch of entries WebPreferences and, layer, from
WebSettings / WebSettingsImpl / WebViewImpl / WebLayerTreeViewSettings.


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

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

2 files changed, 0 insertions, 51 deletions

diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index ac7df1a..a0933a9 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -39,8 +39,6 @@ WebPreferences::WebPreferences()
       default_encoding("ISO-8859-1"),
       apply_default_device_scale_factor_in_compositor(false),
       apply_page_scale_factor_in_compositor(false),
-      per_tile_painting_enabled(false),
-      accelerated_animation_enabled(false),
       javascript_enabled(true),
       web_security_enabled(true),
       javascript_can_open_windows_automatically(true),
@@ -81,16 +79,12 @@ WebPreferences::WebPreferences()
       gl_multisampling_enabled(true),
       privileged_webgl_extensions_enabled(false),
       webgl_errors_to_console_enabled(true),
-      show_composited_layer_borders(false),
-      show_composited_layer_tree(false),
-      show_fps_counter(false),
       accelerated_compositing_for_overflow_scroll_enabled(false),
       accelerated_compositing_for_scrollable_frames_enabled(false),
       composited_scrolling_for_frames_enabled(false),
       mock_scrollbars_enabled(false),
       threaded_html_parser(true),
       show_paint_rects(false),
-      render_vsync_enabled(true),
       asynchronous_spell_checking_enabled(true),
       unified_textchecker_enabled(false),
       accelerated_compositing_enabled(false),
@@ -101,7 +95,6 @@ WebPreferences::WebPreferences()
       accelerated_2d_canvas_enabled(false),
       deferred_2d_canvas_enabled(false),
       antialiased_2d_canvas_disabled(false),
-      accelerated_painting_enabled(false),
       accelerated_filters_enabled(false),
       gesture_tap_highlight_enabled(false),
       accelerated_compositing_for_plugins_enabled(false),
@@ -122,10 +115,6 @@ WebPreferences::WebPreferences()
       device_supports_mouse(true),
       touch_adjustment_enabled(true),
       touch_drag_drop_enabled(false),
-      default_tile_width(256),
-      default_tile_height(256),
-      max_untiled_layer_width(512),
-      max_untiled_layer_height(512),
       fixed_position_creates_stacking_context(false),
       sync_xhr_in_documents_enabled(true),
       deferred_image_decoding_enabled(false),
@@ -145,7 +134,6 @@ WebPreferences::WebPreferences()
       supports_multiple_windows(true),
       viewport_enabled(false),
       initialize_at_minimum_page_scale(true),
-      record_rendering_stats(false),
       cookie_enabled(true)
 #if defined(OS_ANDROID)
       ,
@@ -281,8 +269,6 @@ void WebPreferences::Apply(WebView* web_view) const {
       apply_default_device_scale_factor_in_compositor);
   settings->setApplyPageScaleFactorInCompositor(
       apply_page_scale_factor_in_compositor);
-  settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
-  settings->setAcceleratedAnimationEnabled(accelerated_animation_enabled);
   settings->setJavaScriptEnabled(javascript_enabled);
   settings->setWebSecurityEnabled(web_security_enabled);
   settings->setJavaScriptCanOpenWindowsAutomatically(
@@ -357,13 +343,6 @@ void WebPreferences::Apply(WebView* web_view) const {
   // Enable WebGL errors to the JS console if requested.
   settings->setWebGLErrorsToConsoleEnabled(webgl_errors_to_console_enabled);
 
-  // Display colored borders around composited render layers if requested
-  // on command line.
-  settings->setShowDebugBorders(show_composited_layer_borders);
-
-  // Display an FPS indicator if requested on the command line.
-  settings->setShowFPSCounter(show_fps_counter);
-
   // Enables accelerated compositing for overflow scroll.
   settings->setAcceleratedCompositingForOverflowScrollEnabled(
       accelerated_compositing_for_overflow_scroll_enabled);
@@ -382,20 +361,10 @@ void WebPreferences::Apply(WebView* web_view) const {
 
   settings->setThreadedHTMLParser(threaded_html_parser);
 
-  // Display the current compositor tree as overlay if requested on
-  // the command line
-  settings->setShowPlatformLayerTree(show_composited_layer_tree);
-
   // Display visualization of what has changed on the screen using an
   // overlay of rects, if requested on the command line.
   settings->setShowPaintRects(show_paint_rects);
 
-  // Record rendering stats for benchmarks.
-  settings->setRecordRenderingStats(record_rendering_stats);
-
-  // Set whether to throttle framerate to Vsync.
-  settings->setRenderVSyncEnabled(render_vsync_enabled);
-
   // Enable gpu-accelerated compositing if requested on the command line.
   settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
 
@@ -408,9 +377,6 @@ void WebPreferences::Apply(WebView* web_view) const {
   // Disable antialiasing for 2d canvas if requested on the command line.
   settings->setAntialiased2dCanvasEnabled(!antialiased_2d_canvas_disabled);
 
-  // Enable gpu-accelerated painting if requested on the command line.
-  settings->setAcceleratedPaintingEnabled(accelerated_painting_enabled);
-
   // Enable gpu-accelerated filters if requested on the command line.
   settings->setAcceleratedFiltersEnabled(accelerated_filters_enabled);
 
@@ -471,11 +437,6 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setEnableTouchAdjustment(touch_adjustment_enabled);
   settings->setTouchDragDropEnabled(touch_drag_drop_enabled);
 
-  settings->setDefaultTileSize(
-      WebSize(default_tile_width, default_tile_height));
-  settings->setMaxUntiledLayerSize(
-      WebSize(max_untiled_layer_width, max_untiled_layer_height));
-
   settings->setFixedPositionCreatesStackingContext(
       fixed_position_creates_stacking_context);
 
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 87ab4ab..fe4acc8 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -56,8 +56,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   std::string default_encoding;
   bool apply_default_device_scale_factor_in_compositor;
   bool apply_page_scale_factor_in_compositor;
-  bool per_tile_painting_enabled;
-  bool accelerated_animation_enabled;
   bool javascript_enabled;
   bool web_security_enabled;
   bool javascript_can_open_windows_automatically;
@@ -105,16 +103,12 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool gl_multisampling_enabled;
   bool privileged_webgl_extensions_enabled;
   bool webgl_errors_to_console_enabled;
-  bool show_composited_layer_borders;
-  bool show_composited_layer_tree;
-  bool show_fps_counter;
   bool accelerated_compositing_for_overflow_scroll_enabled;
   bool accelerated_compositing_for_scrollable_frames_enabled;
   bool composited_scrolling_for_frames_enabled;
   bool mock_scrollbars_enabled;
   bool threaded_html_parser;
   bool show_paint_rects;
-  bool render_vsync_enabled;
   bool asynchronous_spell_checking_enabled;
   bool unified_textchecker_enabled;
   bool accelerated_compositing_enabled;
@@ -125,7 +119,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool accelerated_2d_canvas_enabled;
   bool deferred_2d_canvas_enabled;
   bool antialiased_2d_canvas_disabled;
-  bool accelerated_painting_enabled;
   bool accelerated_filters_enabled;
   bool gesture_tap_highlight_enabled;
   bool accelerated_compositing_for_plugins_enabled;
@@ -146,10 +139,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool device_supports_mouse;
   bool touch_adjustment_enabled;
   bool touch_drag_drop_enabled;
-  int default_tile_width;
-  int default_tile_height;
-  int max_untiled_layer_width;
-  int max_untiled_layer_height;
   bool fixed_position_creates_stacking_context;
   bool sync_xhr_in_documents_enabled;
   bool deferred_image_decoding_enabled;
@@ -159,7 +148,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool supports_multiple_windows;
   bool viewport_enabled;
   bool initialize_at_minimum_page_scale;
-  bool record_rendering_stats;
 
   // This flags corresponds to a Page's Settings' setCookieEnabled state. It
   // only controls whether or not the "document.cookie" field is properly