Connect up --disable-gl-multisampling to command buffer

content/browser/gpu_process_host.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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "content/browser/gpu_process_host.h"
 
@@ skipping 84 matching lines @@
     gpu_thread_.reset();
   }
 
  private:
   scoped_ptr<GpuThread> gpu_thread_;
   std::string channel_id_;
   DISALLOW_COPY_AND_ASSIGN(GpuMainThread);
 };
 
 // static
-GpuProcessHost* GpuProcessHost::Create(int host_id) {
+GpuProcessHost* GpuProcessHost::Create(
+    int host_id,
+    const GpuFeatureFlags& gpu_feature_flags) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  GpuProcessHost* host = new GpuProcessHost(host_id);
+  GpuProcessHost* host = new GpuProcessHost(host_id, gpu_feature_flags);
   if (!host->Init()) {
     delete host;
     return NULL;
   }
 
   return host;
 }
 
 // static
 GpuProcessHost* GpuProcessHost::FromID(int host_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (host_id == 0)
     return NULL;
 
   return g_hosts_by_id.Lookup(host_id);
 }
 
-GpuProcessHost::GpuProcessHost(int host_id)
+GpuProcessHost::GpuProcessHost(
+    int host_id,
+    const GpuFeatureFlags& gpu_feature_flags)
     : BrowserChildProcessHost(GPU_PROCESS, NULL),
-      host_id_(host_id) {
+      host_id_(host_id),
+      gpu_feature_flags_(gpu_feature_flags) {
   g_hosts_by_id.AddWithID(this, host_id_);
 }
 
 GpuProcessHost::~GpuProcessHost() {
 
   DCHECK(CalledOnValidThread());
 
   g_hosts_by_id.Remove(host_id_);
 
   BrowserThread::PostTask(BrowserThread::UI,
@@ skipping 149 matching lines @@
     switches::kDisableLogging,
     switches::kEnableAcceleratedDecoding,
     switches::kEnableLogging,
 #if defined(OS_MACOSX)
     switches::kEnableSandboxLogging,
 #endif
     switches::kGpuStartupDialog,
     switches::kLoggingLevel,
     switches::kNoGpuSandbox,
     switches::kNoSandbox,
+    switches::kDisableGLMultisampling,
   };
   cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
                              arraysize(kSwitchNames));
 
+  if (gpu_feature_flags_.flags() & GpuFeatureFlags::kGpuFeatureMultisampling) {
+    cmd_line->AppendSwitch(switches::kDisableGLMultisampling);
+  }
+
   // If specified, prepend a launcher program to the command line.
   if (!gpu_launcher.empty())
     cmd_line->PrependWrapper(gpu_launcher);
 
   Launch(
 #if defined(OS_WIN)
       FilePath(),
 #elif defined(OS_POSIX)
       false,  // Never use the zygote (GPU plugin can't be sandboxed).
       base::environment_vector(),
 #endif
       cmd_line);
 
   UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLifetimeEvents",
                             LAUNCHED, GPU_PROCESS_LIFETIME_EVENT_MAX);
   return true;
 }