diff options
| -rw-r--r-- | content/browser/renderer_host/render_view_host_impl.cc | 26 | ||||
| -rw-r--r-- | content/public/common/common_param_traits_macros.h | 4 | ||||
| -rw-r--r-- | content/renderer/web_preferences.cc | 13 | ||||
| -rw-r--r-- | webkit/common/webpreferences.cc | 4 | ||||
| -rw-r--r-- | webkit/common/webpreferences.h | 4 |
5 files changed, 0 insertions, 51 deletions
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index d377eba..05d75ab 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -401,38 +401,12 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) { prefs.allow_file_access_from_file_urls = command_line.HasSwitch(switches::kAllowFileAccessFromFiles); - prefs.accelerated_compositing_for_overflow_scroll_enabled = false; - if (command_line.HasSwitch(switches::kEnableAcceleratedOverflowScroll)) - prefs.accelerated_compositing_for_overflow_scroll_enabled = true; - if (command_line.HasSwitch(switches::kDisableAcceleratedOverflowScroll)) - prefs.accelerated_compositing_for_overflow_scroll_enabled = false; - prefs.layer_squashing_enabled = false; if (command_line.HasSwitch(switches::kEnableLayerSquashing)) prefs.layer_squashing_enabled = true; if (command_line.HasSwitch(switches::kDisableLayerSquashing)) prefs.layer_squashing_enabled = false; - prefs.accelerated_compositing_for_scrollable_frames_enabled = false; - if (command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames)) - prefs.accelerated_compositing_for_scrollable_frames_enabled = true; - if (command_line.HasSwitch(switches::kDisableAcceleratedScrollableFrames)) - prefs.accelerated_compositing_for_scrollable_frames_enabled = false; - - prefs.composited_scrolling_for_frames_enabled = false; - if (command_line.HasSwitch(switches::kEnableCompositedScrollingForFrames)) - prefs.composited_scrolling_for_frames_enabled = true; - if (command_line.HasSwitch(switches::kDisableCompositedScrollingForFrames)) - prefs.composited_scrolling_for_frames_enabled = false; - - prefs.universal_accelerated_compositing_for_overflow_scroll_enabled = false; - if (command_line.HasSwitch( - switches::kEnableUniversalAcceleratedOverflowScroll)) - prefs.universal_accelerated_compositing_for_overflow_scroll_enabled = true; - if (command_line.HasSwitch( - switches::kDisableUniversalAcceleratedOverflowScroll)) - prefs.universal_accelerated_compositing_for_overflow_scroll_enabled = false; - prefs.show_paint_rects = command_line.HasSwitch(switches::kShowPaintRects); prefs.accelerated_compositing_enabled = diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h index c59a0bb..fab6245 100644 --- a/content/public/common/common_param_traits_macros.h +++ b/content/public/common/common_param_traits_macros.h @@ -137,10 +137,6 @@ IPC_STRUCT_TRAITS_BEGIN(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(accelerated_compositing_for_overflow_scroll_enabled) - IPC_STRUCT_TRAITS_MEMBER( - accelerated_compositing_for_scrollable_frames_enabled) - IPC_STRUCT_TRAITS_MEMBER(composited_scrolling_for_frames_enabled) IPC_STRUCT_TRAITS_MEMBER(mock_scrollbars_enabled) IPC_STRUCT_TRAITS_MEMBER(layer_squashing_enabled) IPC_STRUCT_TRAITS_MEMBER(threaded_html_parser) diff --git a/content/renderer/web_preferences.cc b/content/renderer/web_preferences.cc index bbd79dc..d755b1f 100644 --- a/content/renderer/web_preferences.cc +++ b/content/renderer/web_preferences.cc @@ -198,19 +198,6 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) { settings->setWebGLErrorsToConsoleEnabled( prefs.webgl_errors_to_console_enabled); - // Enables accelerated compositing for overflow scroll. - settings->setAcceleratedCompositingForOverflowScrollEnabled( - prefs.accelerated_compositing_for_overflow_scroll_enabled); - - // Enables accelerated compositing for scrollable frames if requested on - // command line. - settings->setAcceleratedCompositingForScrollableFramesEnabled( - prefs.accelerated_compositing_for_scrollable_frames_enabled); - - // Enables composited scrolling for frames if requested on command line. - settings->setCompositedScrollingForFramesEnabled( - prefs.composited_scrolling_for_frames_enabled); - // Uses the mock theme engine for scrollbars. settings->setMockScrollbarsEnabled(prefs.mock_scrollbars_enabled); diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc index dc64e62..2eca63d 100644 --- a/webkit/common/webpreferences.cc +++ b/webkit/common/webpreferences.cc @@ -55,10 +55,6 @@ WebPreferences::WebPreferences() gl_multisampling_enabled(true), privileged_webgl_extensions_enabled(false), webgl_errors_to_console_enabled(true), - accelerated_compositing_for_overflow_scroll_enabled(false), - universal_accelerated_compositing_for_overflow_scroll_enabled(false), - accelerated_compositing_for_scrollable_frames_enabled(false), - composited_scrolling_for_frames_enabled(false), mock_scrollbars_enabled(false), layer_squashing_enabled(false), threaded_html_parser(true), diff --git a/webkit/common/webpreferences.h b/webkit/common/webpreferences.h index dcca29e..8a7f292 100644 --- a/webkit/common/webpreferences.h +++ b/webkit/common/webpreferences.h @@ -103,10 +103,6 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { bool gl_multisampling_enabled; bool privileged_webgl_extensions_enabled; bool webgl_errors_to_console_enabled; - bool accelerated_compositing_for_overflow_scroll_enabled; - bool universal_accelerated_compositing_for_overflow_scroll_enabled; - bool accelerated_compositing_for_scrollable_frames_enabled; - bool composited_scrolling_for_frames_enabled; bool mock_scrollbars_enabled; bool layer_squashing_enabled; bool threaded_html_parser; |