diff options
Diffstat (limited to 'content/browser/gpu')
-rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.cc | 19 | ||||
-rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.h | 10 |
2 files changed, 3 insertions, 26 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc index 3c49377..53f91e9 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc @@ -19,7 +19,6 @@ #include "content/public/browser/gpu_data_manager_observer.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" -#include "ui/base/ui_base_switches.h" #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_switches.h" #include "webkit/plugins/plugin_switches.h" @@ -238,24 +237,6 @@ void GpuDataManagerImpl::AppendGpuCommandLine( } } -void GpuDataManagerImpl::AppendPluginCommandLine( - CommandLine* command_line) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - DCHECK(command_line); - -#if defined(OS_MACOSX) - uint32 flags = GetGpuFeatureType(); - if ((flags & content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) || - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableAcceleratedCompositing)) { - if (!command_line->HasSwitch( - switches::kDisableCompositedCoreAnimationPlugins)) - command_line->AppendSwitch( - switches::kDisableCompositedCoreAnimationPlugins); - } -#endif -} - void GpuDataManagerImpl::SetGpuFeatureType(GpuFeatureType feature_type) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); UpdateGpuFeatureType(feature_type); diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h index 7683373..3c665d1 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h @@ -46,18 +46,14 @@ class CONTENT_EXPORT GpuDataManagerImpl void AddLogMessage(Value* msg); - // Insert disable-feature switches corresponding to preliminary gpu feature - // flags into the renderer process command line. + // Inserting disable-feature switches into renderer process command-line + // in correspondence to preliminary gpu feature flags. void AppendRendererCommandLine(CommandLine* command_line); - // Insert switches into gpu process command line: kUseGL, + // Inserting switches into gpu process command-line: kUseGL, // kDisableGLMultisampling. void AppendGpuCommandLine(CommandLine* command_line); - // Insert switches into plugin process command line: - // kDisableCoreAnimationPlugins. - void AppendPluginCommandLine(CommandLine* command_line); - // This gets called when switching GPU might have happened. void HandleGpuSwitch(); |