Switch BackgroundContents to use TabContents instead of RenderViewHost.

chrome/browser/tab_contents/render_view_host_delegate_helper.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 134 matching lines @@
     WindowContainerType window_container_type,
     const string16& frame_name) {
   if (window_container_type == WINDOW_CONTAINER_TYPE_BACKGROUND) {
     BackgroundContents* contents = MaybeCreateBackgroundContents(
         route_id,
         profile,
         site,
         opener->GetURL(),
         frame_name);
     if (contents) {
-      pending_contents_[route_id] = contents->render_view_host();
+      pending_contents_[route_id] =
+          contents->tab_contents()->render_view_host();
       return NULL;
     }
   }
 
   TabContents* base_tab_contents = opener->GetAsTabContents();
 
   // Do not create the new TabContents if the opener is a prerender TabContents.
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(profile);
   if (prerender_manager &&
@@ skipping 378 matching lines @@
 
   web_prefs.is_online = !net::NetworkChangeNotifier::IsOffline();
 
   ExtensionService* service = profile->GetExtensionService();
   if (service) {
     const Extension* extension =
         service->GetExtensionByURL(rvh->site_instance()->site());
     extension_webkit_preferences::SetPreferences(&web_prefs, extension);
   }
 
-  if (rvh->delegate()->GetRenderViewType() == chrome::VIEW_TYPE_NOTIFICATION)
+  if (rvh->delegate()->GetRenderViewType() == chrome::VIEW_TYPE_NOTIFICATION) {
     web_prefs.allow_scripts_to_close_windows = true;
+  } else if (rvh->delegate()->GetRenderViewType() ==
+             chrome::VIEW_TYPE_BACKGROUND_CONTENTS) {
+    // Disable all kinds of acceleration for background pages.
+    // See http://crbug.com/96005 and http://crbug.com/96006
+    web_prefs.force_compositing_mode = false;
+    web_prefs.accelerated_compositing_enabled = false;
+    web_prefs.accelerated_2d_canvas_enabled = false;
+    web_prefs.accelerated_video_enabled = false;
+    web_prefs.accelerated_drawing_enabled = false;
+    web_prefs.accelerated_plugins_enabled = false;
+  }
 
   return web_prefs;
 }
 
 void RenderViewHostDelegateHelper::UpdateInspectorSetting(
     content::BrowserContext* browser_context,
     const std::string& key,
     const std::string& value) {
   DictionaryPrefUpdate update(
       Profile::FromBrowserContext(browser_context)->GetPrefs(),
       prefs::kWebKitInspectorSettings);
   DictionaryValue* inspector_settings = update.Get();
   inspector_settings->SetWithoutPathExpansion(key,
                                               Value::CreateStringValue(value));
 }
 
 void RenderViewHostDelegateHelper::ClearInspectorSettings(
     content::BrowserContext* browser_context) {
   Profile::FromBrowserContext(browser_context)->GetPrefs()->
       ClearPref(prefs::kWebKitInspectorSettings);
 }