Remove allow-webui-compositing switch

Long ago, we used to disable compositing on chrome: and about: URLs by default since that caused a startup performance hit. We then had an --allow-webui-compositing switch to override this behavior when desired. The usefulness of this behavior has long gone and we completely ignore the behavior and the flag on aura builds. This nukes it from the code Review URL: https://codereview.chromium.org/167713003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251915 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Feb 19, 2014 · cddc697 · cddc697
1 parent 2cf0c3a
commit cddc697
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 29 deletions.
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -66,7 +66,6 @@ std::string DeriveCommandLine(const GURL& start_url,
   DCHECK_NE(&base_command_line, command_line);
 
   static const char* kForwardSwitches[] = {
-      ::switches::kAllowWebUICompositing,
       ::switches::kDisableAccelerated2dCanvas,
       ::switches::kDisableAcceleratedOverflowScroll,
       ::switches::kDisableAcceleratedPlugins,

diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc
@@ -112,12 +112,6 @@ class TabCapturePerformanceTest
                                       ScalingMethod());
     }
 
-    // UI tests boot up render views starting from about:blank. This causes
-    // the renderer to start up thinking it cannot use the GPU. To work
-    // around that, and allow the frame rate test to use the GPU, we must
-    // pass kAllowWebUICompositing.
-    command_line->AppendSwitch(switches::kAllowWebUICompositing);
-
     // Some of the tests may launch http requests through JSON or AJAX
     // which causes a security error (cross domain request) when the page
     // is loaded from the local file system ( file:// ). The following switch

diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc
@@ -94,12 +94,6 @@ class FrameRateTest
     // Turn on chrome.Interval to get higher-resolution timestamps on frames.
     launch_arguments_.AppendSwitch(switches::kEnableBenchmarking);
 
-    // UI tests boot up render views starting from about:blank. This causes
-    // the renderer to start up thinking it cannot use the GPU. To work
-    // around that, and allow the frame rate test to use the GPU, we must
-    // pass kAllowWebUICompositing.
-    launch_arguments_.AppendSwitch(switches::kAllowWebUICompositing);
-
     // Some of the tests may launch http requests through JSON or AJAX
     // which causes a security error (cross domain request) when the page
     // is loaded from the local file system ( file:// ). The following switch

diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc
@@ -56,7 +56,6 @@ void SetContentCommandLineFlags(int max_render_process_count,
   }
 
   parsed_command_line->AppendSwitch(switches::kForceCompositingMode);
-  parsed_command_line->AppendSwitch(switches::kAllowWebUICompositing);
   parsed_command_line->AppendSwitch(switches::kEnableThreadedCompositing);
   parsed_command_line->AppendSwitch(
       switches::kEnableCompositingForFixedPosition);

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
@@ -528,17 +528,6 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) {
 
   prefs.is_online = !net::NetworkChangeNotifier::IsOffline();
 
-#if !defined(USE_AURA)
-  // Force accelerated compositing and 2d canvas off for chrome: and about:
-  // pages (unless it's specifically allowed).
-  if ((url.SchemeIs(kChromeUIScheme) ||
-       (url.SchemeIs(chrome::kAboutScheme) && url.spec() != kAboutBlankURL)) &&
-      !command_line.HasSwitch(switches::kAllowWebUICompositing)) {
-    prefs.accelerated_compositing_enabled = false;
-    prefs.accelerated_2d_canvas_enabled = false;
-  }
-#endif
-
   prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch(
       switches::kDisableFixedPositionCreatesStackingContext);
 

diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
@@ -27,9 +27,6 @@ const char kAllowNoSandboxJob[]             = "allow-no-sandbox-job";
 // Allows debugging of sandboxed processes (see zygote_main_linux.cc).
 const char kAllowSandboxDebugging[]         = "allow-sandbox-debugging";
 
-// Allow compositing on chrome:// pages.
-const char kAllowWebUICompositing[]         = "allow-webui-compositing";
-
 // The same as kAuditHandles except all handles are enumerated.
 const char kAuditAllHandles[]               = "enable-handle-auditing-all";
 

diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
@@ -18,7 +18,6 @@ CONTENT_EXPORT extern const char kAcceleratedCanvas2dMSAASampleCount[];
 CONTENT_EXPORT extern const char kAllowFileAccessFromFiles[];
 CONTENT_EXPORT extern const char kAllowNoSandboxJob[];
 extern const char kAllowSandboxDebugging[];
-CONTENT_EXPORT extern const char kAllowWebUICompositing[];
 extern const char kAuditAllHandles[];
 extern const char kAuditHandles[];
 CONTENT_EXPORT extern const char kBlacklistAcceleratedCompositing[];