Set GpuPreferences correctly in GpuDataManagerImplPrivate::AppendGpuCommandLine.

content/browser/gpu/gpu_data_manager_impl.h

Index: content/browser/gpu/gpu_data_manager_impl.h
diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
index 2bb437a27e173c3e94f8ddda39029022279f4b1b..7b436f306627f6b2c2d2ede94ff8d9a0435111f9 100644
--- a/content/browser/gpu/gpu_data_manager_impl.h
+++ b/content/browser/gpu/gpu_data_manager_impl.h
@@ -31,6 +31,7 @@ class CommandLine;
 }
 
 namespace gpu {
+struct GpuPreferences;
 struct VideoMemoryUsageStats;
 }
 
@@ -113,7 +114,11 @@ class CONTENT_EXPORT GpuDataManagerImpl
   void AppendRendererCommandLine(base::CommandLine* command_line) const;
 
   // Insert switches into gpu process command line: kUseGL, etc.
-  void AppendGpuCommandLine(base::CommandLine* command_line) const;
+  // If the gpu_preferences isn't a nullptr, the gpu_preferences will be set
+  // for some GPU switches which have been replaced by GpuPreferences, and those
+  // switches will not be append to the command_line anymore.
+  void AppendGpuCommandLine(base::CommandLine* command_line,
+                            gpu::GpuPreferences* gpu_preferences) const;

[jbauman, 2016/04/12 01:30:49]

It would probably be best to make the GpuPreferences modification into a new
method.

[Peng, 2016/04/12 02:13:24]

I use one method to modify command_line & gpu_preferences together, because if
the gpu_preferences is used, some switches should not be in the command line. So
it is very easy to do it in one method, and it is hard to do it in two methods.

Other solution is keeping this method unchanged, and modifying the
gpu_preferences in GpuProcessHost by checking the command_line returned by this
method, and removing some unnecessary switches from the it.

Or maybe we could rename this method to
PrepareGpuCommandLineAndGpuPreferences()?

Thought?

 
   // Update WebPreferences for renderer based on blacklisting decisions.
   void UpdateRendererWebPrefs(WebPreferences* prefs) const;