Revert "Revert "Enable composited iframes on hi-DPI.""
This was a speculative revert. It turned out not to be the problem. Relanding.
This reverts commit 9797adb04362cd267e9727c506deebade23446d8.
[email protected]
BUG=306566
Review URL: https://codereview.chromium.org/27709003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229126 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 7f68273..64a91f4 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -521,10 +521,18 @@
if (command_line.HasSwitch(switches::kDisableAcceleratedOverflowScroll))
prefs.accelerated_compositing_for_overflow_scroll_enabled = false;
- prefs.accelerated_compositing_for_scrollable_frames_enabled =
- command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames);
- prefs.composited_scrolling_for_frames_enabled =
- command_line.HasSwitch(switches::kEnableCompositedScrollingForFrames);
+ prefs.accelerated_compositing_for_scrollable_frames_enabled = false;
+ if (command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames))
+ prefs.accelerated_compositing_for_scrollable_frames_enabled = true;
+ if (command_line.HasSwitch(switches::kDisableAcceleratedScrollableFrames))
+ prefs.accelerated_compositing_for_scrollable_frames_enabled = false;
+
+ prefs.composited_scrolling_for_frames_enabled = false;
+ if (command_line.HasSwitch(switches::kEnableCompositedScrollingForFrames))
+ prefs.composited_scrolling_for_frames_enabled = true;
+ if (command_line.HasSwitch(switches::kDisableCompositedScrollingForFrames))
+ prefs.composited_scrolling_for_frames_enabled = false;
+
prefs.show_paint_rects =
command_line.HasSwitch(switches::kShowPaintRects);
prefs.accelerated_compositing_enabled =
