Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(458)

Unified Diff: content/browser/tab_contents/tab_contents.cc

Issue 8562007: A few less TOUCH_UIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/tab_contents.cc
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index d9effbc44f03af604b34ec7642086e50621a6ba9..8a998bd7be74ecf5b3457c90148d28f68f946795 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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698