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 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 0, 100, | 266 0, 100, |
267 &max_unused_resource_memory_percentage)) { | 267 &max_unused_resource_memory_percentage)) { |
268 settings.max_unused_resource_memory_percentage = | 268 settings.max_unused_resource_memory_percentage = |
269 max_unused_resource_memory_percentage; | 269 max_unused_resource_memory_percentage; |
270 } | 270 } |
271 } | 271 } |
272 | 272 |
273 settings.strict_layer_property_change_checking = | 273 settings.strict_layer_property_change_checking = |
274 cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking); | 274 cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking); |
275 | 275 |
| 276 settings.use_map_image = cmd->HasSwitch(cc::switches::kCCUseMapImage); |
| 277 |
276 #if defined(OS_ANDROID) | 278 #if defined(OS_ANDROID) |
277 // TODO(danakj): Move these to the android code. | 279 // TODO(danakj): Move these to the android code. |
278 settings.can_use_lcd_text = false; | 280 settings.can_use_lcd_text = false; |
279 settings.max_partial_texture_updates = 0; | 281 settings.max_partial_texture_updates = 0; |
280 settings.use_linear_fade_scrollbar_animator = true; | 282 settings.use_linear_fade_scrollbar_animator = true; |
281 settings.solid_color_scrollbars = true; | 283 settings.solid_color_scrollbars = true; |
282 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); | 284 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); |
283 settings.solid_color_scrollbar_thickness_dip = 3; | 285 settings.solid_color_scrollbar_thickness_dip = 3; |
284 settings.highp_threshold_min = 2048; | 286 settings.highp_threshold_min = 2048; |
285 #endif | 287 #endif |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
570 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); | 572 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); |
571 } | 573 } |
572 | 574 |
573 scoped_refptr<cc::ContextProvider> | 575 scoped_refptr<cc::ContextProvider> |
574 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { | 576 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { |
575 return RenderThreadImpl::current()-> | 577 return RenderThreadImpl::current()-> |
576 OffscreenContextProviderForCompositorThread(); | 578 OffscreenContextProviderForCompositorThread(); |
577 } | 579 } |
578 | 580 |
579 } // namespace content | 581 } // namespace content |
OLD | NEW |