[CLOSED] Cleaning up the plethora of switches for GPU vs software vs SwiftShader.

content/browser/gpu/gpu_process_host.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 
 #include <map>
 #include <queue>
 #include <set>
@@ skipping 100 matching lines @@
   // Tells the GPU process to create a new image using the given window.
   void CreateImage(
       gfx::PluginWindowHandle window,
       int client_id,
       int image_id,
       const CreateImageCallback& callback);
 
     // Tells the GPU process to delete image.
   void DeleteImage(int client_id, int image_id, int sync_point);
 
-  // Whether this GPU process is set up to use software rendering.
-  bool software_rendering();
-
   // What kind of GPU process, e.g. sandboxed or unsandboxed.
   GpuProcessKind kind();
 
   void ForceShutdown();
 
   void BeginFrameSubscription(
       int surface_id,
       base::WeakPtr<RenderWidgetHostViewFrameSubscriber> subscriber);
   void EndFrameSubscription(int surface_id);
   void LoadedShader(const std::string& key, const std::string& data);
@@ skipping 72 matching lines @@
   // Qeueud messages to send when the process launches.
   std::queue<IPC::Message*> queued_messages_;
 
   // Whether the GPU process is valid, set to false after Send() failed.
   bool valid_;
 
   // Whether we are running a GPU thread inside the browser process instead
   // of a separate GPU process.
   bool in_process_;
 
-  bool software_rendering_;
+  bool swiftshader_rendering_;
   GpuProcessKind kind_;
 
   scoped_ptr<GpuMainThread> in_process_gpu_thread_;
 
   // Whether we actually launched a GPU process.
   bool process_launched_;
 
   // Whether the GPU process successfully initialized.
   bool initialized_;
 
@@ skipping 39 matching lines @@
   typedef std::multimap<int, scoped_refptr<GpuSurfaceTracker::SurfaceRef> >
       SurfaceRefMap;
   SurfaceRefMap surface_refs_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_