Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index cebb2b1d92863286da297b33a13c15dce40f9bfe..63b77c78387e0efe10893485302d181586a5ccf5 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -399,17 +399,12 @@ static bool DeviceScaleEnsuresTextQuality(float device_scale_factor) { |
} |
-static bool ShouldUseFixedPositionCompositing(float device_scale_factor) { |
- // Compositing for fixed-position elements is dependent on |
- // device_scale_factor if no flag is set. http://crbug.com/172738 |
+static bool PreferCompositingToLCDText(float device_scale_factor) { |
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
- |
- if (command_line.HasSwitch(switches::kDisableCompositingForFixedPosition)) |
+ if (command_line.HasSwitch(switches::kDisablePreferCompositingToLCDText)) |
return false; |
- |
- if (command_line.HasSwitch(switches::kEnableCompositingForFixedPosition)) |
+ if (command_line.HasSwitch(switches::kEnablePreferCompositingToLCDText)) |
return true; |
- |
return DeviceScaleEnsuresTextQuality(device_scale_factor); |
} |
@@ -796,8 +791,8 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) { |
g_view_map.Get().insert(std::make_pair(webview(), this)); |
g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this)); |
webview()->setDeviceScaleFactor(device_scale_factor_); |
- webview()->settings()->setAcceleratedCompositingForFixedPositionEnabled( |
- ShouldUseFixedPositionCompositing(device_scale_factor_)); |
+ webview()->settings()->setPreferCompositingToLCDTextEnabled( |
+ PreferCompositingToLCDText(device_scale_factor_)); |
webview()->settings()->setAcceleratedCompositingForOverflowScrollEnabled( |
ShouldUseAcceleratedCompositingForOverflowScroll(device_scale_factor_)); |
webview()->settings()->setAcceleratedCompositingForTransitionEnabled( |
@@ -3768,8 +3763,8 @@ void RenderViewImpl::SetDeviceScaleFactor(float device_scale_factor) { |
RenderWidget::SetDeviceScaleFactor(device_scale_factor); |
if (webview()) { |
webview()->setDeviceScaleFactor(device_scale_factor); |
- webview()->settings()->setAcceleratedCompositingForFixedPositionEnabled( |
- ShouldUseFixedPositionCompositing(device_scale_factor_)); |
+ webview()->settings()->setPreferCompositingToLCDTextEnabled( |
+ PreferCompositingToLCDText(device_scale_factor_)); |
webview()->settings()->setAcceleratedCompositingForOverflowScrollEnabled( |
ShouldUseAcceleratedCompositingForOverflowScroll(device_scale_factor_)); |
webview()->settings()->setAcceleratedCompositingForTransitionEnabled( |