OLD | NEW |
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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
394 } else if (cmd->HasSwitch(cc::switches::kEnablePinchVirtualViewport)) { | 394 } else if (cmd->HasSwitch(cc::switches::kEnablePinchVirtualViewport)) { |
395 // use_pinch_zoom_scrollbars is only true on desktop when non-overlay | 395 // use_pinch_zoom_scrollbars is only true on desktop when non-overlay |
396 // scrollbars are in use. | 396 // scrollbars are in use. |
397 settings.use_pinch_zoom_scrollbars = true; | 397 settings.use_pinch_zoom_scrollbars = true; |
398 settings.scrollbar_animator = cc::LayerTreeSettings::LinearFade; | 398 settings.scrollbar_animator = cc::LayerTreeSettings::LinearFade; |
399 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); | 399 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); |
400 } | 400 } |
401 settings.scrollbar_fade_delay_ms = 500; | 401 settings.scrollbar_fade_delay_ms = 500; |
402 settings.scrollbar_fade_resize_delay_ms = 500; | 402 settings.scrollbar_fade_resize_delay_ms = 500; |
403 settings.scrollbar_fade_duration_ms = 300; | 403 settings.scrollbar_fade_duration_ms = 300; |
| 404 |
| 405 // When pinching in, only show the pinch-viewport overlay scrollbars if the |
| 406 // page scale is at least some threshold away from the minimum. i.e. don't |
| 407 // show the pinch scrollbars when at minimum scale. |
| 408 settings.scrollbar_show_scale_threshold = 1.05f; |
404 #endif | 409 #endif |
405 | 410 |
406 if (cmd->HasSwitch(switches::kEnableLowResTiling)) | 411 if (cmd->HasSwitch(switches::kEnableLowResTiling)) |
407 settings.create_low_res_tiling = true; | 412 settings.create_low_res_tiling = true; |
408 if (cmd->HasSwitch(switches::kDisableLowResTiling)) | 413 if (cmd->HasSwitch(switches::kDisableLowResTiling)) |
409 settings.create_low_res_tiling = false; | 414 settings.create_low_res_tiling = false; |
410 | 415 |
411 scoped_refptr<base::SingleThreadTaskRunner> compositor_thread_task_runner = | 416 scoped_refptr<base::SingleThreadTaskRunner> compositor_thread_task_runner = |
412 compositor_deps_->GetCompositorImplThreadTaskRunner(); | 417 compositor_deps_->GetCompositorImplThreadTaskRunner(); |
413 scoped_refptr<base::SingleThreadTaskRunner> | 418 scoped_refptr<base::SingleThreadTaskRunner> |
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
870 widget_->OnSwapBuffersAborted(); | 875 widget_->OnSwapBuffersAborted(); |
871 } | 876 } |
872 | 877 |
873 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { | 878 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { |
874 cc::ContextProvider* provider = | 879 cc::ContextProvider* provider = |
875 compositor_deps_->GetSharedMainThreadContextProvider(); | 880 compositor_deps_->GetSharedMainThreadContextProvider(); |
876 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); | 881 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); |
877 } | 882 } |
878 | 883 |
879 } // namespace content | 884 } // namespace content |
OLD | NEW |