Commit af367756 authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Commit Bot

Remove use_solid_color_scrollbars pref and settings (chrome side)

It didn't work by itself. It was just a redundant information of
whether the scrollbar theme supports solid color scrollbars.

Change-Id: I32c61c8337bb8546a05841723833905463e71457
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1896675Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarPhilip Rogers <pdr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712458}
parent 48eabcf5
...@@ -284,9 +284,9 @@ class ScrollLatencyScrollbarBrowserTest : public ScrollLatencyBrowserTest { ...@@ -284,9 +284,9 @@ class ScrollLatencyScrollbarBrowserTest : public ScrollLatencyBrowserTest {
// coordinates to manipulate the scrollbar is different from other // coordinates to manipulate the scrollbar is different from other
// platforms. // platforms.
// We could overcome the first limitation, by toggling various features // We could overcome the first limitation, by toggling various features
// and WebPreferences (e.g. kOverlayScrollbar feature, and // and WebPreferences (e.g. kOverlayScrollbar feature, and viewport_enabled
// viewport_enabled and use_solid_color_scrollbars WebPreferences) but at // WebPreferences) but at that point, we're not really testing a shipping
// that point, we're not really testing a shipping configuration. // configuration.
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// Click on the forward scrollbar button to induce a compositor thread // Click on the forward scrollbar button to induce a compositor thread
......
...@@ -501,16 +501,10 @@ const WebPreferences RenderViewHostImpl::ComputeWebPreferences() { ...@@ -501,16 +501,10 @@ const WebPreferences RenderViewHostImpl::ComputeWebPreferences() {
atoi(command_line.GetSwitchValueASCII( atoi(command_line.GetSwitchValueASCII(
switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); switches::kAcceleratedCanvas2dMSAASampleCount).c_str());
prefs.use_solid_color_scrollbars = false;
prefs.disable_ipc_flooding_protection = prefs.disable_ipc_flooding_protection =
command_line.HasSwitch(switches::kDisableIpcFloodingProtection) || command_line.HasSwitch(switches::kDisableIpcFloodingProtection) ||
command_line.HasSwitch(switches::kDisablePushStateThrottle); command_line.HasSwitch(switches::kDisablePushStateThrottle);
#if defined(OS_ANDROID)
prefs.use_solid_color_scrollbars = true;
#endif // defined(OS_ANDROID)
prefs.accelerated_video_decode_enabled = prefs.accelerated_video_decode_enabled =
!command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode); !command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode);
......
...@@ -139,7 +139,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) ...@@ -139,7 +139,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(webgl2_enabled) IPC_STRUCT_TRAITS_MEMBER(webgl2_enabled)
IPC_STRUCT_TRAITS_MEMBER(pepper_3d_enabled) IPC_STRUCT_TRAITS_MEMBER(pepper_3d_enabled)
IPC_STRUCT_TRAITS_MEMBER(record_whole_document) IPC_STRUCT_TRAITS_MEMBER(record_whole_document)
IPC_STRUCT_TRAITS_MEMBER(use_solid_color_scrollbars)
IPC_STRUCT_TRAITS_MEMBER(flash_3d_enabled) IPC_STRUCT_TRAITS_MEMBER(flash_3d_enabled)
IPC_STRUCT_TRAITS_MEMBER(flash_stage3d_enabled) IPC_STRUCT_TRAITS_MEMBER(flash_stage3d_enabled)
IPC_STRUCT_TRAITS_MEMBER(flash_stage3d_baseline_enabled) IPC_STRUCT_TRAITS_MEMBER(flash_stage3d_baseline_enabled)
......
...@@ -164,7 +164,6 @@ WebPreferences::WebPreferences() ...@@ -164,7 +164,6 @@ WebPreferences::WebPreferences()
#endif #endif
spatial_navigation_enabled(false), spatial_navigation_enabled(false),
caret_browsing_enabled(false), caret_browsing_enabled(false),
use_solid_color_scrollbars(false),
navigate_on_drag_drop(true), navigate_on_drag_drop(true),
v8_cache_options(blink::mojom::V8CacheOptions::kDefault), v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
record_whole_document(false), record_whole_document(false),
......
...@@ -179,7 +179,6 @@ struct CONTENT_EXPORT WebPreferences { ...@@ -179,7 +179,6 @@ struct CONTENT_EXPORT WebPreferences {
bool smart_insert_delete_enabled; bool smart_insert_delete_enabled;
bool spatial_navigation_enabled; bool spatial_navigation_enabled;
bool caret_browsing_enabled; bool caret_browsing_enabled;
bool use_solid_color_scrollbars;
bool navigate_on_drag_drop; bool navigate_on_drag_drop;
blink::mojom::V8CacheOptions v8_cache_options; blink::mojom::V8CacheOptions v8_cache_options;
bool record_whole_document; bool record_whole_document;
......
...@@ -888,8 +888,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, ...@@ -888,8 +888,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->SetMainFrameResizesAreOrientationChanges( settings->SetMainFrameResizesAreOrientationChanges(
prefs.main_frame_resizes_are_orientation_changes); prefs.main_frame_resizes_are_orientation_changes);
settings->SetUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
settings->SetShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); settings->SetShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up);
settings->SetAlwaysShowContextMenuOnTouch( settings->SetAlwaysShowContextMenuOnTouch(
prefs.always_show_context_menu_on_touch); prefs.always_show_context_menu_on_touch);
......
...@@ -260,8 +260,6 @@ class WebSettings { ...@@ -260,8 +260,6 @@ class WebSettings {
virtual void SetBarrelButtonForDragEnabled(bool) = 0; virtual void SetBarrelButtonForDragEnabled(bool) = 0;
virtual void SetUseLegacyBackgroundSizeShorthandBehavior(bool) = 0; virtual void SetUseLegacyBackgroundSizeShorthandBehavior(bool) = 0;
virtual void SetViewportStyle(WebViewportStyle) = 0; virtual void SetViewportStyle(WebViewportStyle) = 0;
// TODO(wangxianzhu): Remove this function when removing chrome side caller.
void SetUseSolidColorScrollbars(bool) {}
virtual void SetUseWideViewport(bool) = 0; virtual void SetUseWideViewport(bool) = 0;
virtual void SetV8CacheOptions(V8CacheOptions) = 0; virtual void SetV8CacheOptions(V8CacheOptions) = 0;
virtual void SetValidationMessageTimerMagnification(int) = 0; virtual void SetValidationMessageTimerMagnification(int) = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment