Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(721)

Side by Side Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 2816923002: change overlay scrollbar hover show to hover fade in (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/gpu/render_widget_compositor.h" 5 #include "content/renderer/gpu/render_widget_compositor.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <limits> 10 #include <limits>
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 // TODO(danakj): Only do this on low end devices. 440 // TODO(danakj): Only do this on low end devices.
441 settings.create_low_res_tiling = true; 441 settings.create_low_res_tiling = true;
442 #else // defined(OS_ANDROID) 442 #else // defined(OS_ANDROID)
443 #if !defined(OS_MACOSX) 443 #if !defined(OS_MACOSX)
444 if (ui::IsOverlayScrollbarEnabled()) { 444 if (ui::IsOverlayScrollbarEnabled()) {
445 settings.scrollbar_animator = cc::LayerTreeSettings::AURA_OVERLAY; 445 settings.scrollbar_animator = cc::LayerTreeSettings::AURA_OVERLAY;
446 settings.scrollbar_show_delay = ui::kOverlayScrollbarShowDelay; 446 settings.scrollbar_show_delay = ui::kOverlayScrollbarShowDelay;
447 settings.scrollbar_fade_out_delay = ui::kOverlayScrollbarFadeOutDelay; 447 settings.scrollbar_fade_out_delay = ui::kOverlayScrollbarFadeOutDelay;
448 settings.scrollbar_fade_out_resize_delay = 448 settings.scrollbar_fade_out_resize_delay =
449 ui::kOverlayScrollbarFadeOutDelay; 449 ui::kOverlayScrollbarFadeOutDelay;
450 settings.scrollbar_fade_in_duration = ui::kOverlayScrollbarFadeInDuration;
450 settings.scrollbar_fade_out_duration = ui::kOverlayScrollbarFadeOutDuration; 451 settings.scrollbar_fade_out_duration = ui::kOverlayScrollbarFadeOutDuration;
451 settings.scrollbar_thinning_duration = 452 settings.scrollbar_thinning_duration =
452 ui::kOverlayScrollbarThinningDuration; 453 ui::kOverlayScrollbarThinningDuration;
453 } else { 454 } else {
454 // TODO(bokan): This section is probably unneeded? We don't use scrollbar 455 // TODO(bokan): This section is probably unneeded? We don't use scrollbar
455 // animations for non overlay scrollbars. 456 // animations for non overlay scrollbars.
456 settings.scrollbar_animator = cc::LayerTreeSettings::ANDROID_OVERLAY; 457 settings.scrollbar_animator = cc::LayerTreeSettings::ANDROID_OVERLAY;
457 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); 458 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
458 settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(500); 459 settings.scrollbar_fade_out_delay = base::TimeDelta::FromMilliseconds(500);
459 settings.scrollbar_fade_out_resize_delay = 460 settings.scrollbar_fade_out_resize_delay =
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 void RenderWidgetCompositor::SetContentSourceId(uint32_t id) { 1148 void RenderWidgetCompositor::SetContentSourceId(uint32_t id) {
1148 layer_tree_host_->SetContentSourceId(id); 1149 layer_tree_host_->SetContentSourceId(id);
1149 } 1150 }
1150 1151
1151 void RenderWidgetCompositor::SetLocalSurfaceId( 1152 void RenderWidgetCompositor::SetLocalSurfaceId(
1152 const cc::LocalSurfaceId& local_surface_id) { 1153 const cc::LocalSurfaceId& local_surface_id) {
1153 layer_tree_host_->SetLocalSurfaceId(local_surface_id); 1154 layer_tree_host_->SetLocalSurfaceId(local_surface_id);
1154 } 1155 }
1155 1156
1156 } // namespace content 1157 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698