| Index: content/renderer/gpu/render_widget_compositor.cc
|
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
|
| index 8eeeb9944bb852d4586b9b79f0491bd8120e7cd5..5ed284ea5960f612c11b789a2caa2b47403d175b 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -126,10 +126,19 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
|
| settings.max_untiled_layer_size = gfx::Size(max_untiled_layer_width,
|
| max_untiled_layer_height);
|
|
|
| - settings.impl_side_painting = cc::switches::IsImplSidePaintingEnabled();
|
| - settings.gpu_rasterization =
|
| - cc::switches::IsGpuRasterizationEnabled() ||
|
| - cmd->HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths);
|
| + settings.impl_side_painting =
|
| + RenderThreadImpl::current()->is_impl_side_painting_enabled();
|
| + if (RenderThreadImpl::current()->is_gpu_rasterization_forced()) {
|
| + settings.gpu_rasterization_state =
|
| + cc::LayerTreeSettings::GpuRasterizationForced;
|
| + }
|
| + else if (RenderThreadImpl::current()->is_gpu_rasterization_enabled()) {
|
| + settings.gpu_rasterization_state =
|
| + cc::LayerTreeSettings::GpuRasterizationEnabled;
|
| + } else {
|
| + settings.gpu_rasterization_state =
|
| + cc::LayerTreeSettings::GpuRasterizationDisabled;
|
| + }
|
|
|
| settings.calculate_top_controls_position =
|
| cmd->HasSwitch(cc::switches::kEnableTopControlsPositionCalculation);
|
| @@ -171,7 +180,8 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
|
| cmd->HasSwitch(cc::switches::kBackgroundColorInsteadOfCheckerboard);
|
| settings.show_overdraw_in_tracing =
|
| cmd->HasSwitch(cc::switches::kTraceOverdraw);
|
| - settings.can_use_lcd_text = cc::switches::IsLCDTextEnabled();
|
| + settings.can_use_lcd_text =
|
| + RenderThreadImpl::current()->is_lcd_text_enabled();
|
| settings.use_pinch_virtual_viewport =
|
| cmd->HasSwitch(cc::switches::kEnablePinchVirtualViewport);
|
| settings.allow_antialiasing &=
|
| @@ -237,7 +247,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
|
| settings.strict_layer_property_change_checking =
|
| cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking);
|
|
|
| - settings.use_map_image = cc::switches::IsMapImageEnabled();
|
| + settings.use_map_image = RenderThreadImpl::current()->is_map_image_enabled();
|
|
|
| #if defined(OS_ANDROID)
|
| // TODO(danakj): Move these to the android code.
|
|
|