Index: ui/compositor/compositor.cc |
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc |
index 607a8ea8efc933e5aeda34a5497f19560fd2814e..6971f32fad0c6272d9aad3314635d5c40923b25f 100644 |
--- a/ui/compositor/compositor.cc |
+++ b/ui/compositor/compositor.cc |
@@ -94,15 +94,14 @@ Compositor::Compositor(gfx::AcceleratedWidget widget, |
// can have LCD text, to match the previous behaviour with ContentLayers, |
// where LCD-not-allowed notifications were ignored. |
settings.layers_always_allowed_lcd_text = true; |
- settings.refresh_rate = |
- context_factory_->DoesCreateTestContexts() |
- ? kTestRefreshRate |
- : kDefaultRefreshRate; |
+ settings.renderer_settings.refresh_rate = |
+ context_factory_->DoesCreateTestContexts() ? kTestRefreshRate |
+ : kDefaultRefreshRate; |
settings.main_frame_before_activation_enabled = false; |
settings.throttle_frame_production = |
!command_line->HasSwitch(switches::kDisableGpuVsync); |
#if !defined(OS_MACOSX) |
- settings.partial_swap_enabled = |
+ settings.renderer_settings.partial_swap_enabled = |
!command_line->HasSwitch(cc::switches::kUIDisablePartialSwap); |
#endif |
#if defined(OS_CHROMEOS) |
@@ -421,6 +420,10 @@ void Compositor::SetLayerTreeDebugState( |
host_->SetDebugState(debug_state); |
} |
+const cc::RendererSettings& Compositor::GetRendererSettings() const { |
+ return host_->settings().renderer_settings; |
+} |
+ |
scoped_refptr<CompositorLock> Compositor::GetCompositorLock() { |
if (!compositor_lock_) { |
compositor_lock_ = new CompositorLock(this); |