Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 8b1f8e985466a3194a7968a1ae47141fa6bdb2d3..ed2ff96259c8d0a0c3611454013fc6b9a6aa5070 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -647,21 +647,8 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh, |
prefs.max_untiled_layer_height = |
GetSwitchValueAsInt(command_line, switches::kMaxUntiledLayerHeight, 1); |
- // TODO(scottmg): Probably Native is wrong: http://crbug.com/133312 |
- if (gfx::Screen::GetNativeScreen()->IsDIPEnabled()) { |
- // Only apply when using DIP coordinate system as this setting interferes |
- // with fixed layout mode. |
- // TODO(danakj): Fixed layout mode is going away, so turn this on always. |
- prefs.apply_default_device_scale_factor_in_compositor = true; |
- } |
- |
- prefs.apply_page_scale_factor_in_compositor = |
- command_line.HasSwitch(switches::kEnablePinch); |
- |
- if (command_line.HasSwitch(switches::kEnableCssTransformPinch)) { |
- prefs.apply_default_device_scale_factor_in_compositor = false; |
- prefs.apply_page_scale_factor_in_compositor = false; |
- } |
+ prefs.apply_default_device_scale_factor_in_compositor = true; |
+ prefs.apply_page_scale_factor_in_compositor = true; |
piman
2013/02/01 00:25:09
apply_page_scale_factor_in_compositor was only set
|
prefs.per_tile_painting_enabled = |
command_line.HasSwitch(cc::switches::kEnablePerTilePainting); |