Index: content/renderer/render_widget.cc |
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc |
index 14e1f0b373523e6d3ea5c9ead7c7197f661dbd08..28e7e97dac19dae38964a3486aa846676441621a 100644 |
--- a/content/renderer/render_widget.cc |
+++ b/content/renderer/render_widget.cc |
@@ -906,7 +906,8 @@ |
} |
uint32 output_surface_id = next_output_surface_id_++; |
- if (command_line.HasSwitch(switches::kEnableDelegatedRenderer)) { |
+ if (command_line.HasSwitch(switches::kEnableDelegatedRenderer) && |
+ !command_line.HasSwitch(switches::kDisableDelegatedRenderer)) { |
DCHECK(is_threaded_compositing_enabled_); |
return scoped_ptr<cc::OutputSurface>( |
new DelegatedCompositorOutputSurface( |