diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 15:00:46 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 15:00:46 +0000 |
| commit | e3415902ca99fd719078cf1780305f9d68250e76 (patch) | |
| tree | 6915d4bd41de88e475f573c220b059bc8059f6df /content/browser/web_contents/web_contents_impl.cc | |
| parent | 1be3d61abea26f5342024a10719c3acce2e8f58e (diff) | |
| download | chromium_src-e3415902ca99fd719078cf1780305f9d68250e76.zip chromium_src-e3415902ca99fd719078cf1780305f9d68250e76.tar.gz chromium_src-e3415902ca99fd719078cf1780305f9d68250e76.tar.bz2 | |
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.
TBR=zeeshan@chromium.org
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
Diffstat (limited to 'content/browser/web_contents/web_contents_impl.cc')
| -rw-r--r-- | content/browser/web_contents/web_contents_impl.cc | 16 |
1 files changed, 12 insertions, 4 deletions
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 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh, 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 = |