| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 if (GetSwitchValueAsInt( | 258 if (GetSwitchValueAsInt( |
| 259 *cmd, | 259 *cmd, |
| 260 cc::switches::kMaxUnusedResourceMemoryUsagePercentage, | 260 cc::switches::kMaxUnusedResourceMemoryUsagePercentage, |
| 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 = |
| 269 cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking); |
| 270 |
| 268 #if defined(OS_ANDROID) | 271 #if defined(OS_ANDROID) |
| 269 // TODO(danakj): Move these to the android code. | 272 // TODO(danakj): Move these to the android code. |
| 270 settings.can_use_lcd_text = false; | 273 settings.can_use_lcd_text = false; |
| 271 settings.max_partial_texture_updates = 0; | 274 settings.max_partial_texture_updates = 0; |
| 272 settings.use_linear_fade_scrollbar_animator = true; | 275 settings.use_linear_fade_scrollbar_animator = true; |
| 273 settings.solid_color_scrollbars = true; | 276 settings.solid_color_scrollbars = true; |
| 274 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); | 277 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); |
| 275 settings.solid_color_scrollbar_thickness_dip = 3; | 278 settings.solid_color_scrollbar_thickness_dip = 3; |
| 276 settings.highp_threshold_min = 2048; | 279 settings.highp_threshold_min = 2048; |
| 277 #endif | 280 #endif |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); | 551 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); |
| 549 } | 552 } |
| 550 | 553 |
| 551 scoped_refptr<cc::ContextProvider> | 554 scoped_refptr<cc::ContextProvider> |
| 552 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { | 555 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { |
| 553 return RenderThreadImpl::current()-> | 556 return RenderThreadImpl::current()-> |
| 554 OffscreenContextProviderForCompositorThread(); | 557 OffscreenContextProviderForCompositorThread(); |
| 555 } | 558 } |
| 556 | 559 |
| 557 } // namespace content | 560 } // namespace content |
| OLD | NEW |