summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 23:46:12 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 23:46:12 +0000
commit5e67ec8ab14c4ba8d9ee426f4be90d6b53262c2f (patch)
tree8a67c5aeffacea9d3b73d8284b90e8c28535548d /content
parent16aa68e81494965712aacc82c8b242ff9c1d5a51 (diff)
downloadchromium_src-5e67ec8ab14c4ba8d9ee426f4be90d6b53262c2f.zip
chromium_src-5e67ec8ab14c4ba8d9ee426f4be90d6b53262c2f.tar.gz
chromium_src-5e67ec8ab14c4ba8d9ee426f4be90d6b53262c2f.tar.bz2
A few less TOUCH_UIs.
Removing code that --force-compositing-mode on all pages including WebUI. BUG=none TEST=none Review URL: http://codereview.chromium.org/8562007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/tab_contents/tab_contents.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index d9effbc..8a998bd 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -1835,10 +1835,8 @@ WebPreferences TabContents::GetWebkitPrefs() {
// Force accelerated compositing and 2d canvas off for chrome:, about: and
// chrome-devtools: pages (unless it's specifically allowed).
if ((GetURL().SchemeIs(chrome::kChromeDevToolsScheme) ||
-#if !defined(TOUCH_UI)
// Allow accelerated compositing for keyboard and log in screen.
GetURL().SchemeIs(chrome::kChromeUIScheme) ||
-#endif
(GetURL().SchemeIs(chrome::kAboutScheme) &&
GetURL().spec() != chrome::kAboutBlankURL)) &&
!web_prefs.allow_webui_compositing) {
@@ -1846,10 +1844,6 @@ WebPreferences TabContents::GetWebkitPrefs() {
web_prefs.accelerated_2d_canvas_enabled = false;
}
-#if defined(TOUCH_UI)
- web_prefs.force_compositing_mode = true;
-#endif
-
return web_prefs;
}