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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 settings.can_use_lcd_text = false; | 267 settings.can_use_lcd_text = false; |
268 settings.max_partial_texture_updates = 0; | 268 settings.max_partial_texture_updates = 0; |
269 settings.use_linear_fade_scrollbar_animator = true; | 269 settings.use_linear_fade_scrollbar_animator = true; |
270 settings.solid_color_scrollbars = true; | 270 settings.solid_color_scrollbars = true; |
271 settings.solid_color_scrollbar_color = | 271 settings.solid_color_scrollbar_color = |
272 cmd->HasSwitch(switches::kHideScrollbars) | 272 cmd->HasSwitch(switches::kHideScrollbars) |
273 ? SK_ColorTRANSPARENT | 273 ? SK_ColorTRANSPARENT |
274 : SkColorSetARGB(128, 128, 128, 128); | 274 : SkColorSetARGB(128, 128, 128, 128); |
275 settings.solid_color_scrollbar_thickness_dip = 3; | 275 settings.solid_color_scrollbar_thickness_dip = 3; |
276 settings.highp_threshold_min = 2048; | 276 settings.highp_threshold_min = 2048; |
| 277 // Android WebView handles root layer flings itself. |
| 278 settings.ignore_root_layer_flings = |
| 279 widget->UsingSynchronousRendererCompositor(); |
277 #endif | 280 #endif |
278 | 281 |
279 if (!compositor->initialize(settings)) | 282 if (!compositor->initialize(settings)) |
280 return scoped_ptr<RenderWidgetCompositor>(); | 283 return scoped_ptr<RenderWidgetCompositor>(); |
281 | 284 |
282 return compositor.Pass(); | 285 return compositor.Pass(); |
283 } | 286 } |
284 | 287 |
285 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget, | 288 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget, |
286 bool threaded) | 289 bool threaded) |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); | 576 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); |
574 } | 577 } |
575 | 578 |
576 scoped_refptr<cc::ContextProvider> | 579 scoped_refptr<cc::ContextProvider> |
577 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { | 580 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { |
578 return RenderThreadImpl::current()-> | 581 return RenderThreadImpl::current()-> |
579 OffscreenContextProviderForCompositorThread(); | 582 OffscreenContextProviderForCompositorThread(); |
580 } | 583 } |
581 | 584 |
582 } // namespace content | 585 } // namespace content |
OLD | NEW |