Chromium Code Reviews| 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 // TODO(danakj): Move these to the android code. | 270 // TODO(danakj): Move these to the android code. |
| 271 settings.can_use_lcd_text = false; | 271 settings.can_use_lcd_text = false; |
| 272 settings.max_partial_texture_updates = 0; | 272 settings.max_partial_texture_updates = 0; |
| 273 settings.use_linear_fade_scrollbar_animator = true; | 273 settings.use_linear_fade_scrollbar_animator = true; |
| 274 settings.solid_color_scrollbars = true; | 274 settings.solid_color_scrollbars = true; |
| 275 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); | 275 settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); |
| 276 settings.solid_color_scrollbar_thickness_dip = 3; | 276 settings.solid_color_scrollbar_thickness_dip = 3; |
| 277 settings.highp_threshold_min = 2048; | 277 settings.highp_threshold_min = 2048; |
| 278 #endif | 278 #endif |
| 279 | 279 |
| 280 settings.disable_optimizations_for_synchronous_compositor = | |
|
Sami
2013/05/03 17:02:55
Forgot to rename this setting?
boliu
2013/05/03 17:20:39
Oh darn! Only compiled cc_unittests to check. Fixe
| |
| 281 widget->EnableSynchronousCompositing(); | |
| 282 | |
| 280 if (!compositor->initialize(settings)) | 283 if (!compositor->initialize(settings)) |
| 281 return scoped_ptr<RenderWidgetCompositor>(); | 284 return scoped_ptr<RenderWidgetCompositor>(); |
| 282 | 285 |
| 283 return compositor.Pass(); | 286 return compositor.Pass(); |
| 284 } | 287 } |
| 285 | 288 |
| 286 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget) | 289 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget) |
| 287 : suppress_schedule_composite_(false), | 290 : suppress_schedule_composite_(false), |
| 288 widget_(widget) { | 291 widget_(widget) { |
| 289 } | 292 } |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 558 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); | 561 return RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); |
| 559 } | 562 } |
| 560 | 563 |
| 561 scoped_refptr<cc::ContextProvider> | 564 scoped_refptr<cc::ContextProvider> |
| 562 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { | 565 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() { |
| 563 return RenderThreadImpl::current()-> | 566 return RenderThreadImpl::current()-> |
| 564 OffscreenContextProviderForCompositorThread(); | 567 OffscreenContextProviderForCompositorThread(); |
| 565 } | 568 } |
| 566 | 569 |
| 567 } // namespace content | 570 } // namespace content |
| OLD | NEW |