Commit 92c7287a authored by sunnyps's avatar sunnyps Committed by Commit bot

cc: Remove unused use_pinch_zoom_scrollbars flag.

The use_pinch_zoom_scrollbars flag is dead.

Review URL: https://codereview.chromium.org/1136843009

Cr-Commit-Position: refs/heads/master@{#329945}
parent 73e7b9a8
...@@ -51,7 +51,6 @@ LayerTreeSettings::LayerTreeSettings() ...@@ -51,7 +51,6 @@ LayerTreeSettings::LayerTreeSettings()
max_untiled_layer_size(gfx::Size(512, 512)), max_untiled_layer_size(gfx::Size(512, 512)),
default_tile_grid_size(gfx::Size(256, 256)), default_tile_grid_size(gfx::Size(256, 256)),
minimum_occlusion_tracking_size(gfx::Size(160, 160)), minimum_occlusion_tracking_size(gfx::Size(160, 160)),
use_pinch_zoom_scrollbars(false),
use_pinch_virtual_viewport(false), use_pinch_virtual_viewport(false),
tiling_interest_area_viewport_multiplier(9.0f), tiling_interest_area_viewport_multiplier(9.0f),
skewport_target_time_in_seconds(1.0f), skewport_target_time_in_seconds(1.0f),
......
...@@ -64,7 +64,6 @@ class CC_EXPORT LayerTreeSettings { ...@@ -64,7 +64,6 @@ class CC_EXPORT LayerTreeSettings {
gfx::Size max_untiled_layer_size; gfx::Size max_untiled_layer_size;
gfx::Size default_tile_grid_size; gfx::Size default_tile_grid_size;
gfx::Size minimum_occlusion_tracking_size; gfx::Size minimum_occlusion_tracking_size;
bool use_pinch_zoom_scrollbars;
bool use_pinch_virtual_viewport; bool use_pinch_virtual_viewport;
float tiling_interest_area_viewport_multiplier; float tiling_interest_area_viewport_multiplier;
float skewport_target_time_in_seconds; float skewport_target_time_in_seconds;
......
...@@ -425,10 +425,7 @@ void RenderWidgetCompositor::Initialize() { ...@@ -425,10 +425,7 @@ void RenderWidgetCompositor::Initialize() {
if (ui::IsOverlayScrollbarEnabled()) { if (ui::IsOverlayScrollbarEnabled()) {
settings.scrollbar_animator = cc::LayerTreeSettings::THINNING; settings.scrollbar_animator = cc::LayerTreeSettings::THINNING;
settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
} else if (cmd->HasSwitch(cc::switches::kEnablePinchVirtualViewport)) { } else if (settings.use_pinch_virtual_viewport) {
// use_pinch_zoom_scrollbars is only true on desktop when non-overlay
// scrollbars are in use.
settings.use_pinch_zoom_scrollbars = true;
settings.scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE; settings.scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE;
settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
} }
......
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