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

6 files changed, 67 insertions, 131 deletions

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 1edc136..fd370f4 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -803,9 +803,15 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kEnableCompositingForFixedPosition,
     switches::kEnableHighDpiCompositingForFixedPosition,
     switches::kDisableCompositingForFixedPosition,
+    switches::kEnableAcceleratedPainting,
     switches::kEnableTouchDragDrop,
     switches::kDisableThreadedCompositing,
     switches::kDisableTouchAdjustment,
+    switches::kDefaultTileWidth,
+    switches::kDefaultTileHeight,
+    switches::kMaxUntiledLayerWidth,
+    switches::kMaxUntiledLayerHeight,
+    switches::kShowFPSCounter,
     switches::kEnableViewport,
     switches::kEnableOpusPlayback,
     switches::kEnableVp9Playback,
@@ -836,6 +842,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
 #endif
     switches::kRendererStartupDialog,
     switches::kShowPaintRects,
+    switches::kShowCompositedLayerBorders,
+    switches::kShowCompositedLayerTree,
     switches::kSitePerProcess,
     switches::kTestSandbox,
     switches::kTouchEvents,
@@ -850,27 +858,29 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kVModule,
     switches::kWebCoreLogChannels,
     cc::switches::kBackgroundColorInsteadOfCheckerboard,
-    cc::switches::kEnableCompositorFrameMessage,
     cc::switches::kDisableImplSidePainting,
+    cc::switches::kDisableThreadedAnimation,
+    cc::switches::kEnableCompositorFrameMessage,
     cc::switches::kEnableImplSidePainting,
     cc::switches::kEnablePartialSwap,
+    cc::switches::kEnablePerTilePainting,
     cc::switches::kEnableRightAlignedScheduling,
     cc::switches::kEnableTopControlsPositionCalculation,
+    cc::switches::kLowResolutionContentsScaleFactor,
     cc::switches::kNumRasterThreads,
-    cc::switches::kShowPropertyChangedRects,
-    cc::switches::kShowSurfaceDamageRects,
-    cc::switches::kShowScreenSpaceRects,
-    cc::switches::kShowReplicaScreenSpaceRects,
     cc::switches::kShowNonOccludingRects,
     cc::switches::kShowOccludingRects,
-    cc::switches::kTraceAllRenderedFrames,
-    cc::switches::kTraceOverdraw,
+    cc::switches::kShowPropertyChangedRects,
+    cc::switches::kShowReplicaScreenSpaceRects,
+    cc::switches::kShowScreenSpaceRects,
+    cc::switches::kShowSurfaceDamageRects,
+    cc::switches::kSlowDownRasterScaleFactor,
     cc::switches::kTopControlsHeight,
-    cc::switches::kTopControlsShowThreshold,
     cc::switches::kTopControlsHideThreshold,
-    cc::switches::kSlowDownRasterScaleFactor,
+    cc::switches::kTopControlsShowThreshold,
+    cc::switches::kTraceAllRenderedFrames,
+    cc::switches::kTraceOverdraw,
     cc::switches::kUseCheapnessEstimator,
-    cc::switches::kLowResolutionContentsScaleFactor,
   };
   renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
                                  arraysize(kSwitchNames));
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9e42d3d..5e97e77 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -242,18 +242,6 @@ void MakeNavigateParams(const NavigationEntryImpl& entry,
     delegate->AddNavigationHeaders(params->url, &params->extra_headers);
 }
 
-int GetSwitchValueAsInt(
-    const CommandLine& command_line,
-    const std::string& switch_string,
-    int min_value) {
-  std::string string_value = command_line.GetSwitchValueASCII(switch_string);
-  int int_value;
-  if (base::StringToInt(string_value, &int_value))
-    return std::max(min_value, int_value);
-  else
-    return min_value;
-}
-
 }  // namespace
 
 WebContents* WebContents::Create(const WebContents::CreateParams& params) {
@@ -476,12 +464,6 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);
   prefs.allow_file_access_from_file_urls =
       command_line.HasSwitch(switches::kAllowFileAccessFromFiles);
-  prefs.show_composited_layer_borders =
-      command_line.HasSwitch(switches::kShowCompositedLayerBorders);
-  prefs.show_composited_layer_tree =
-      command_line.HasSwitch(switches::kShowCompositedLayerTree);
-  prefs.show_fps_counter =
-      command_line.HasSwitch(switches::kShowFPSCounter);
 
   prefs.accelerated_compositing_for_overflow_scroll_enabled = false;
   if (command_line.HasSwitch(switches::kEnableAcceleratedOverflowScroll))
@@ -495,8 +477,6 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       command_line.HasSwitch(switches::kEnableCompositedScrollingForFrames);
   prefs.show_paint_rects =
       command_line.HasSwitch(switches::kShowPaintRects);
-  prefs.render_vsync_enabled =
-      !command_line.HasSwitch(switches::kDisableGpuVsync);
   prefs.accelerated_compositing_enabled =
       GpuProcessHost::gpu_enabled() &&
       !command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
@@ -510,9 +490,6 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       !command_line.HasSwitch(switches::kDisableDeferred2dCanvas);
   prefs.antialiased_2d_canvas_disabled =
       command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing);
-  prefs.accelerated_painting_enabled =
-      GpuProcessHost::gpu_enabled() &&
-      command_line.HasSwitch(switches::kEnableAcceleratedPainting);
   prefs.accelerated_filters_enabled =
       GpuProcessHost::gpu_enabled() &&
       command_line.HasSwitch(switches::kEnableAcceleratedFilters);
@@ -533,8 +510,6 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
   prefs.css_grid_layout_enabled =
       command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
-  prefs.record_rendering_stats =
-      command_line.HasSwitch(switches::kEnableGpuBenchmarking);
   prefs.threaded_html_parser =
       !command_line.HasSwitch(switches::kDisableThreadedHTMLParser);
 #if defined(OS_ANDROID)
@@ -635,30 +610,9 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
     prefs.accelerated_2d_canvas_enabled = false;
   }
 
-  if (url.SchemeIs(chrome::kChromeDevToolsScheme))
-    prefs.show_fps_counter = false;
-
-  if (command_line.HasSwitch(switches::kDefaultTileWidth))
-    prefs.default_tile_width =
-        GetSwitchValueAsInt(command_line, switches::kDefaultTileWidth, 1);
-  if (command_line.HasSwitch(switches::kDefaultTileHeight))
-    prefs.default_tile_height =
-        GetSwitchValueAsInt(command_line, switches::kDefaultTileHeight, 1);
-  if (command_line.HasSwitch(switches::kMaxUntiledLayerWidth))
-    prefs.max_untiled_layer_width =
-        GetSwitchValueAsInt(command_line, switches::kMaxUntiledLayerWidth, 1);
-  if (command_line.HasSwitch(switches::kMaxUntiledLayerHeight))
-    prefs.max_untiled_layer_height =
-        GetSwitchValueAsInt(command_line, switches::kMaxUntiledLayerHeight, 1);
-
   prefs.apply_default_device_scale_factor_in_compositor = true;
   prefs.apply_page_scale_factor_in_compositor = true;
 
-  prefs.per_tile_painting_enabled =
-      command_line.HasSwitch(cc::switches::kEnablePerTilePainting);
-  prefs.accelerated_animation_enabled =
-      !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation);
-
   prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch(
       switches::kDisableFixedPositionCreatesStackingContext);
 
diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h
index 37e24fd..57384b2 100644
--- a/content/public/common/common_param_traits_macros.h
+++ b/content/public/common/common_param_traits_macros.h
@@ -103,8 +103,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(default_fixed_font_size)
   IPC_STRUCT_TRAITS_MEMBER(apply_default_device_scale_factor_in_compositor)
   IPC_STRUCT_TRAITS_MEMBER(apply_page_scale_factor_in_compositor)
-  IPC_STRUCT_TRAITS_MEMBER(per_tile_painting_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(accelerated_animation_enabled)
   IPC_STRUCT_TRAITS_MEMBER(minimum_font_size)
   IPC_STRUCT_TRAITS_MEMBER(minimum_logical_font_size)
   IPC_STRUCT_TRAITS_MEMBER(default_encoding)
@@ -149,9 +147,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(gl_multisampling_enabled)
   IPC_STRUCT_TRAITS_MEMBER(privileged_webgl_extensions_enabled)
   IPC_STRUCT_TRAITS_MEMBER(webgl_errors_to_console_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(show_composited_layer_borders)
-  IPC_STRUCT_TRAITS_MEMBER(show_composited_layer_tree)
-  IPC_STRUCT_TRAITS_MEMBER(show_fps_counter)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_overflow_scroll_enabled)
   IPC_STRUCT_TRAITS_MEMBER(
       accelerated_compositing_for_scrollable_frames_enabled)
@@ -159,7 +154,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(mock_scrollbars_enabled)
   IPC_STRUCT_TRAITS_MEMBER(threaded_html_parser)
   IPC_STRUCT_TRAITS_MEMBER(show_paint_rects)
-  IPC_STRUCT_TRAITS_MEMBER(render_vsync_enabled)
   IPC_STRUCT_TRAITS_MEMBER(asynchronous_spell_checking_enabled)
   IPC_STRUCT_TRAITS_MEMBER(unified_textchecker_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_enabled)
@@ -167,7 +161,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_2d_canvas_enabled)
   IPC_STRUCT_TRAITS_MEMBER(deferred_2d_canvas_enabled)
   IPC_STRUCT_TRAITS_MEMBER(antialiased_2d_canvas_disabled)
-  IPC_STRUCT_TRAITS_MEMBER(accelerated_painting_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_filters_enabled)
   IPC_STRUCT_TRAITS_MEMBER(gesture_tap_highlight_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_plugins_enabled)
@@ -190,10 +183,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(device_supports_mouse)
   IPC_STRUCT_TRAITS_MEMBER(touch_adjustment_enabled)
   IPC_STRUCT_TRAITS_MEMBER(touch_drag_drop_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(default_tile_width)
-  IPC_STRUCT_TRAITS_MEMBER(default_tile_height)
-  IPC_STRUCT_TRAITS_MEMBER(max_untiled_layer_width)
-  IPC_STRUCT_TRAITS_MEMBER(max_untiled_layer_height)
   IPC_STRUCT_TRAITS_MEMBER(fixed_position_creates_stacking_context)
   IPC_STRUCT_TRAITS_MEMBER(sync_xhr_in_documents_enabled)
   IPC_STRUCT_TRAITS_MEMBER(deferred_image_decoding_enabled)
@@ -203,7 +192,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(supports_multiple_windows)
   IPC_STRUCT_TRAITS_MEMBER(viewport_enabled)
   IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
-  IPC_STRUCT_TRAITS_MEMBER(record_rendering_stats)
   IPC_STRUCT_TRAITS_MEMBER(cookie_enabled)
   IPC_STRUCT_TRAITS_MEMBER(apply_page_scale_factor_in_compositor)
 #if defined(OS_ANDROID)
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index e7e2216..1fc1321 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -4,6 +4,8 @@
 
 #include "content/renderer/gpu/render_widget_compositor.h"
 
+#include <limits>
+
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ -15,11 +17,13 @@
 #include "cc/layer_tree_host.h"
 #include "cc/switches.h"
 #include "cc/thread_impl.h"
+#include "content/public/common/content_switches.h"
 #include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
+#include "ui/gl/gl_switches.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/compositor_bindings/web_to_ccinput_handler_adapter.h"
 
@@ -86,14 +90,41 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
   CommandLine* cmd = CommandLine::ForCurrentProcess();
 
   cc::LayerTreeSettings settings;
-  settings.acceleratePainting = web_settings.acceleratePainting;
-  settings.renderVSyncEnabled = web_settings.renderVSyncEnabled;
-  settings.perTilePaintingEnabled = web_settings.perTilePaintingEnabled;
+  settings.acceleratePainting =
+      cmd->HasSwitch(switches::kEnableAcceleratedPainting);
+  settings.renderVSyncEnabled = !cmd->HasSwitch(switches::kDisableGpuVsync);
+  settings.perTilePaintingEnabled =
+      cmd->HasSwitch(cc::switches::kEnablePerTilePainting);
   settings.acceleratedAnimationEnabled =
-      web_settings.acceleratedAnimationEnabled;
-  settings.refreshRate = web_settings.refreshRate;
-  settings.defaultTileSize = web_settings.defaultTileSize;
-  settings.maxUntiledLayerSize = web_settings.maxUntiledLayerSize;
+      !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation);
+
+  int default_tile_width = settings.defaultTileSize.width();
+  if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
+    GetSwitchValueAsInt(*cmd, switches::kDefaultTileWidth, 1,
+                        std::numeric_limits<int>::max(), &default_tile_width);
+  }
+  int default_tile_height = settings.defaultTileSize.height();
+  if (cmd->HasSwitch(switches::kDefaultTileHeight)) {
+    GetSwitchValueAsInt(*cmd, switches::kDefaultTileHeight, 1,
+                        std::numeric_limits<int>::max(), &default_tile_height);
+  }
+  settings.defaultTileSize = gfx::Size(default_tile_width, default_tile_height);
+
+  int max_untiled_layer_width = settings.maxUntiledLayerSize.width();
+  if (cmd->HasSwitch(switches::kMaxUntiledLayerWidth)) {
+    GetSwitchValueAsInt(*cmd, switches::kMaxUntiledLayerWidth, 1,
+                        std::numeric_limits<int>::max(),
+                        &max_untiled_layer_width);
+  }
+  int max_untiled_layer_height = settings.maxUntiledLayerSize.height();
+  if (cmd->HasSwitch(switches::kMaxUntiledLayerHeight)) {
+    GetSwitchValueAsInt(*cmd, switches::kMaxUntiledLayerHeight, 1,
+                        std::numeric_limits<int>::max(),
+                        &max_untiled_layer_height);
+  }
+
+  settings.maxUntiledLayerSize = gfx::Size(max_untiled_layer_width,
+                                           max_untiled_layer_height);
 
   settings.rightAlignedSchedulingEnabled =
       cmd->HasSwitch(cc::switches::kEnableRightAlignedScheduling);
@@ -147,11 +178,15 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
   settings.showOverdrawInTracing =
       cmd->HasSwitch(cc::switches::kTraceOverdraw);
 
-  settings.initialDebugState.showFPSCounter = web_settings.showFPSCounter;
-  settings.initialDebugState.showPaintRects = web_settings.showPaintRects;
+  settings.initialDebugState.showFPSCounter =
+      cmd->HasSwitch(switches::kShowFPSCounter);
+  settings.initialDebugState.showPaintRects =
+      cmd->HasSwitch(switches::kShowPaintRects);
+  settings.initialDebugState.showDebugBorders =
+      cmd->HasSwitch(switches::kShowCompositedLayerBorders);
   settings.initialDebugState.showPlatformLayerTree =
-      web_settings.showPlatformLayerTree;
-  settings.initialDebugState.showDebugBorders = web_settings.showDebugBorders;
+      cmd->HasSwitch(switches::kShowCompositedLayerTree);
+
   settings.initialDebugState.showPropertyChangedRects =
       cmd->HasSwitch(cc::switches::kShowPropertyChangedRects);
   settings.initialDebugState.showSurfaceDamageRects =
@@ -165,7 +200,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
   settings.initialDebugState.showNonOccludingRects =
       cmd->HasSwitch(cc::switches::kShowNonOccludingRects);
   settings.initialDebugState.setRecordRenderingStats(
-      web_settings.recordRenderingStats);
+      cmd->HasSwitch(switches::kEnableGpuBenchmarking));
   settings.initialDebugState.traceAllRenderedFrames =
       cmd->HasSwitch(cc::switches::kTraceAllRenderedFrames);
 
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