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

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

Issue 1223713004: Cleanup viewport scrolling for future scroll customization work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix value of report_overscroll_only_for_scrollable_axes on Aura. Created 5 years, 5 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 <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 // Webview does not own the surface so should not clear it. 436 // Webview does not own the surface so should not clear it.
437 settings.renderer_settings.should_clear_root_render_pass = 437 settings.renderer_settings.should_clear_root_render_pass =
438 !synchronous_compositor_factory; 438 !synchronous_compositor_factory;
439 439
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 442
443 settings.use_external_begin_frame_source = true; 443 settings.use_external_begin_frame_source = true;
444 444
445 #elif !defined(OS_MACOSX) 445 #elif !defined(OS_MACOSX)
446 settings.report_overscroll_only_for_scrollable_axes = false;
tdresser 2015/07/06 15:22:44 This value was previously set incorrectly for aura
447
446 if (ui::IsOverlayScrollbarEnabled()) { 448 if (ui::IsOverlayScrollbarEnabled()) {
447 settings.scrollbar_animator = cc::LayerTreeSettings::THINNING; 449 settings.scrollbar_animator = cc::LayerTreeSettings::THINNING;
448 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); 450 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
449 } else { 451 } else {
450 settings.scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE; 452 settings.scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE;
451 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); 453 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
452 } 454 }
453 settings.scrollbar_fade_delay_ms = 500; 455 settings.scrollbar_fade_delay_ms = 500;
454 settings.scrollbar_fade_resize_delay_ms = 500; 456 settings.scrollbar_fade_resize_delay_ms = 500;
455 settings.scrollbar_fade_duration_ms = 300; 457 settings.scrollbar_fade_duration_ms = 300;
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 return; 1029 return;
1028 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); 1030 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
1029 } 1031 }
1030 1032
1031 void RenderWidgetCompositor::SetSurfaceIdNamespace( 1033 void RenderWidgetCompositor::SetSurfaceIdNamespace(
1032 uint32_t surface_id_namespace) { 1034 uint32_t surface_id_namespace) {
1033 layer_tree_host_->set_surface_id_namespace(surface_id_namespace); 1035 layer_tree_host_->set_surface_id_namespace(surface_id_namespace);
1034 } 1036 }
1035 1037
1036 } // namespace content 1038 } // namespace content
OLDNEW
« cc/trees/layer_tree_host_impl.cc ('K') | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698