Added a master switch to enable/disable gpu acceleration.

chrome/browser/tab_contents/render_view_host_delegate_helper.cc

 // Copyright (c) 2010 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 "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/background_contents_service.h"
@@ skipping 170 matching lines @@
     RenderWidgetHost* host) {
   for (PendingWidgetViews::iterator i = pending_widget_views_.begin();
        i != pending_widget_views_.end(); ++i) {
     if (host->view() == i->second) {
       pending_widget_views_.erase(i);
       return;
     }
   }
 }
 
+bool RenderViewHostDelegateHelper::gpu_enabled_ = true;
+
 // static
 WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     Profile* profile, bool is_dom_ui) {
   PrefService* prefs = profile->GetPrefs();
   WebPreferences web_prefs;
 
   web_prefs.fixed_font_family =
       UTF8ToWide(prefs->GetString(prefs::kWebKitFixedFontFamily));
   web_prefs.serif_font_family =
       UTF8ToWide(prefs->GetString(prefs::kWebKitSerifFontFamily));
@@ skipping 63 matching lines @@
     web_prefs.xss_auditor_enabled =
         command_line.HasSwitch(switches::kEnableXSSAuditor);
     web_prefs.application_cache_enabled =
         !command_line.HasSwitch(switches::kDisableApplicationCache);
 
     web_prefs.local_storage_enabled =
         !command_line.HasSwitch(switches::kDisableLocalStorage);
     web_prefs.databases_enabled =
         !command_line.HasSwitch(switches::kDisableDatabases);
     web_prefs.experimental_webgl_enabled =
+        gpu_enabled() &&
         !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
     web_prefs.site_specific_quirks_enabled =
         !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);
     web_prefs.allow_file_access_from_file_urls =
         command_line.HasSwitch(switches::kAllowFileAccessFromFiles);
     web_prefs.show_composited_layer_borders =
         command_line.HasSwitch(switches::kShowCompositedLayerBorders);
     web_prefs.accelerated_compositing_enabled =
+        gpu_enabled() &&
         !command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
     web_prefs.accelerated_2d_canvas_enabled =
+        gpu_enabled() &&
         command_line.HasSwitch(switches::kEnableAccelerated2dCanvas);
     web_prefs.memory_info_enabled =
         command_line.HasSwitch(switches::kEnableMemoryInfo);
     web_prefs.hyperlink_auditing_enabled =
         !command_line.HasSwitch(switches::kNoPings);
     // The user stylesheet watcher may not exist in a testing profile.
     if (profile->GetUserStyleSheetWatcher()) {
       web_prefs.user_style_sheet_enabled = true;
       web_prefs.user_style_sheet_location =
           profile->GetUserStyleSheetWatcher()->user_style_sheet();
@@ skipping 33 matching lines @@
   inspector_settings->SetWithoutPathExpansion(key,
                                               Value::CreateStringValue(value));
 }
 
 void RenderViewHostDelegateHelper::ClearInspectorSettings(Profile* profile) {
   DictionaryValue* inspector_settings =
       profile->GetPrefs()->GetMutableDictionary(
           prefs::kWebKitInspectorSettings);
   inspector_settings->Clear();
 }