summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 23:36:12 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 23:36:12 +0000
commit9464e40dba8e61eab52beca601c4e42372694c56 (patch)
tree3b9d9e1c007b62d2b4c0e3d12d1bce2a3770a77a
parent9f350118ec1f1876a2cf5702a031508031fc357c (diff)
downloadchromium_src-9464e40dba8e61eab52beca601c4e42372694c56.zip
chromium_src-9464e40dba8e61eab52beca601c4e42372694c56.tar.gz
chromium_src-9464e40dba8e61eab52beca601c4e42372694c56.tar.bz2
Don't expose --disable-gpu-compositing, only set internally.
The flag isn't meant to be set externally, it doesn't work on most configs. It's only meant internally to make sure the renderer doesn't try to use GPU when the browser is in software. BUG=None Review URL: https://codereview.chromium.org/300523002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272636 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/chrome_restart_request.cc1
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc1
-rw-r--r--content/public/common/content_switches.h2
3 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index a4a1324..d80519e 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -79,7 +79,6 @@ std::string DeriveCommandLine(const GURL& start_url,
::switches::kDisableFiltersOverIPC,
::switches::kDisableGpuShaderDiskCache,
::switches::kDisableGpuWatchdog,
- ::switches::kDisableGpuCompositing,
::switches::kDisableGpuRasterization,
::switches::kDisableImplSidePainting,
::switches::kDisableLowResTiling,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index bb52683..6551842 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1038,7 +1038,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kDisableFastTextAutosizing,
switches::kDisableFileSystem,
switches::kDisableFiltersOverIPC,
- switches::kDisableGpuCompositing,
switches::kDisableGpuVsync,
switches::kDisableLowResTiling,
switches::kDisableHistogramCustomizer,
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index d54695f..ef13827c 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -59,7 +59,7 @@ CONTENT_EXPORT extern const char kDisableFlashStage3d[];
CONTENT_EXPORT extern const char kDisableGestureTapHighlight[];
CONTENT_EXPORT extern const char kDisableGLMultisampling[];
CONTENT_EXPORT extern const char kDisableGpu[];
-CONTENT_EXPORT extern const char kDisableGpuCompositing[];
+extern const char kDisableGpuCompositing[];
extern const char kDisableGpuProcessCrashLimit[];
CONTENT_EXPORT extern const char kDisableGpuRasterization[];
CONTENT_EXPORT extern const char kDisableGpuSandbox[];