Don't suppress HW compositing on the new file manager (chrome://files).

BUG=chromium-os:26939
TEST=--allow-webui-compositing no longer needed to get HW-accelerated decode & render on ARM crosbook.


Review URL: http://codereview.chromium.org/9583022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124756 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 18 insertions, 2 deletions

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 57b0933..ed827c5 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1302,7 +1302,7 @@ bool ChromeContentBrowserClient::IsFastShutdownPossible() {
 }
 
 void ChromeContentBrowserClient::OverrideWebkitPrefs(
-    RenderViewHost* rvh, WebPreferences* web_prefs) {
+    RenderViewHost* rvh, const GURL& url, WebPreferences* web_prefs) {
   Profile* profile = Profile::FromBrowserContext(
       rvh->process()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
@@ -1442,6 +1442,16 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
     web_prefs->accelerated_painting_enabled = false;
     web_prefs->accelerated_plugins_enabled = false;
   }
+
+#if defined(FILE_MANAGER_EXTENSION)
+  // Override the default of suppressing HW compositing for WebUI pages for the
+  // file manager, which is implemented using WebUI but wants HW acceleration
+  // for video decode & render.
+  if (url.spec() == chrome::kChromeUIFileManagerURL) {
+    web_prefs->accelerated_compositing_enabled = true;
+    web_prefs->accelerated_2d_canvas_enabled = true;
+  }
+#endif
 }
 
 void ChromeContentBrowserClient::UpdateInspectorSetting(
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index e262f48..ddedf31 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -150,6 +150,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
   virtual bool IsFastShutdownPossible() OVERRIDE;
   virtual void OverrideWebkitPrefs(RenderViewHost* rvh,
+                                   const GURL& url,
                                    WebPreferences* prefs) OVERRIDE;
   virtual void UpdateInspectorSetting(RenderViewHost* rvh,
                                       const std::string& key,
diff --git a/content/browser/mock_content_browser_client.cc b/content/browser/mock_content_browser_client.cc
index 0273a2c..6b153ad0 100644
--- a/content/browser/mock_content_browser_client.cc
+++ b/content/browser/mock_content_browser_client.cc
@@ -273,6 +273,7 @@ bool MockContentBrowserClient::IsFastShutdownPossible() {
 }
 
 void MockContentBrowserClient::OverrideWebkitPrefs(RenderViewHost* rvh,
+                                                   const GURL& url,
                                                    WebPreferences* prefs) {
 }
 
diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h
index c529d5b..a7c5138 100644
--- a/content/browser/mock_content_browser_client.h
+++ b/content/browser/mock_content_browser_client.h
@@ -144,6 +144,7 @@ class MockContentBrowserClient : public ContentBrowserClient {
   virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
   virtual bool IsFastShutdownPossible() OVERRIDE;
   virtual void OverrideWebkitPrefs(RenderViewHost* rvh,
+                                   const GURL& url,
                                    WebPreferences* prefs) OVERRIDE;
   virtual void UpdateInspectorSetting(RenderViewHost* rvh,
                                       const std::string& key,
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 9bcd915..5f97fe2 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -470,7 +470,7 @@ WebPreferences TabContents::GetWebkitPrefs(RenderViewHost* rvh,
 
   prefs.default_device_scale_factor = default_device_scale_factor;
 
-  content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, &prefs);
+  content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, url, &prefs);
 
   return prefs;
 }
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index fb34d57..e6331e8 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -339,6 +339,7 @@ class ContentBrowserClient {
   // the renderer. The content layer will add its own settings, and then it's up
   // to the embedder to update it if it wants.
   virtual void OverrideWebkitPrefs(RenderViewHost* render_view_host,
+                                   const GURL& url,
                                    WebPreferences* prefs) = 0;
 
   // Inspector setting was changed and should be persisted.
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index 45356c6..711aecd 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -300,6 +300,7 @@ bool ShellContentBrowserClient::IsFastShutdownPossible() {
 }
 
 void ShellContentBrowserClient::OverrideWebkitPrefs(RenderViewHost* rvh,
+                                                    const GURL& url,
                                                     WebPreferences* prefs) {
 }
 
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 9a0fcef..6afd657 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -151,6 +151,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
   virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
   virtual bool IsFastShutdownPossible() OVERRIDE;
   virtual void OverrideWebkitPrefs(RenderViewHost* rvh,
+                                   const GURL& url,
                                    WebPreferences* prefs) OVERRIDE;
   virtual void UpdateInspectorSetting(RenderViewHost* rvh,
                                       const std::string& key,