| 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 } | 270 } |
| 271 | 271 |
| 272 #if defined(OS_ANDROID) | 272 #if defined(OS_ANDROID) |
| 273 // TODO(danakj): Move these to the android code. | 273 // TODO(danakj): Move these to the android code. |
| 274 settings.can_use_lcd_text = false; | 274 settings.can_use_lcd_text = false; |
| 275 settings.max_partial_texture_updates = 0; | 275 settings.max_partial_texture_updates = 0; |
| 276 settings.use_linear_fade_scrollbar_animator = true; | 276 settings.use_linear_fade_scrollbar_animator = true; |
| 277 settings.solid_color_scrollbars = true; | 277 settings.solid_color_scrollbars = true; |
| 278 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); | 278 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); |
| 279 settings.solid_color_scrollbar_thickness_dip = 3; | 279 settings.solid_color_scrollbar_thickness_dip = 3; |
| 280 settings.highp_threshold_min = 2048; |
| 280 #endif | 281 #endif |
| 281 | 282 |
| 282 if (!compositor->initialize(settings)) | 283 if (!compositor->initialize(settings)) |
| 283 return scoped_ptr<RenderWidgetCompositor>(); | 284 return scoped_ptr<RenderWidgetCompositor>(); |
| 284 | 285 |
| 285 return compositor.Pass(); | 286 return compositor.Pass(); |
| 286 } | 287 } |
| 287 | 288 |
| 288 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget) | 289 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget) |
| 289 : suppress_schedule_composite_(false), | 290 : suppress_schedule_composite_(false), |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); | 552 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); |
| 552 } | 553 } |
| 553 | 554 |
| 554 scoped_refptr<cc::ContextProvider> | 555 scoped_refptr<cc::ContextProvider> |
| 555 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { | 556 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { |
| 556 return RenderThreadImpl::current()-> | 557 return RenderThreadImpl::current()-> |
| 557 OffscreenContextProviderForCompositorThread(); | 558 OffscreenContextProviderForCompositorThread(); |
| 558 } | 559 } |
| 559 | 560 |
| 560 } // namespace content | 561 } // namespace content |
| OLD | NEW |