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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 0, 100, | 261 0, 100, |
262 &max_unused_resource_memory_percentage)) { | 262 &max_unused_resource_memory_percentage)) { |
263 settings.max_unused_resource_memory_percentage = | 263 settings.max_unused_resource_memory_percentage = |
264 max_unused_resource_memory_percentage; | 264 max_unused_resource_memory_percentage; |
265 } | 265 } |
266 } | 266 } |
267 | 267 |
268 settings.strict_layer_property_change_checking = | 268 settings.strict_layer_property_change_checking = |
269 cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking); | 269 cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking); |
270 | 270 |
| 271 settings.use_map_image = cmd->HasSwitch(cc::switches::kUseMapImage); |
| 272 |
271 #if defined(OS_ANDROID) | 273 #if defined(OS_ANDROID) |
272 // TODO(danakj): Move these to the android code. | 274 // TODO(danakj): Move these to the android code. |
273 settings.can_use_lcd_text = false; | 275 settings.can_use_lcd_text = false; |
274 settings.max_partial_texture_updates = 0; | 276 settings.max_partial_texture_updates = 0; |
275 settings.use_linear_fade_scrollbar_animator = true; | 277 settings.use_linear_fade_scrollbar_animator = true; |
276 settings.solid_color_scrollbars = true; | 278 settings.solid_color_scrollbars = true; |
277 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); | 279 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); |
278 settings.solid_color_scrollbar_thickness_dip = 3; | 280 settings.solid_color_scrollbar_thickness_dip = 3; |
279 settings.highp_threshold_min = 2048; | 281 settings.highp_threshold_min = 2048; |
280 #endif | 282 #endif |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
567 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); | 569 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); |
568 } | 570 } |
569 | 571 |
570 scoped_refptr<cc::ContextProvider> | 572 scoped_refptr<cc::ContextProvider> |
571 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { | 573 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { |
572 return RenderThreadImpl::current()-> | 574 return RenderThreadImpl::current()-> |
573 OffscreenContextProviderForCompositorThread(); | 575 OffscreenContextProviderForCompositorThread(); |
574 } | 576 } |
575 | 577 |
576 } // namespace content | 578 } // namespace content |
OLD | NEW |