content: Rename raster threads to worker threads.

content/browser/gpu/compositor_util.cc

Index: content/browser/gpu/compositor_util.cc
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
index 3da40a8be322610fa33c5653636dbf9d9838c178..249458497a73f22d63750d1278f84b3ab7f84898 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -31,8 +31,8 @@ const char* kWebGLFeatureName = "webgl";
 const char* kRasterizationFeatureName = "rasterization";
 const char* kMultipleRasterThreadsFeatureName = "multiple_raster_threads";
 
-const int kMinRasterThreads = 1;
-const int kMaxRasterThreads = 16;
+const int kMinWorkerThreads = 1;
+const int kMaxWorkerThreads = 16;
 
 const int kMinMSAASampleCount = 0;
 
@@ -146,7 +146,7 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) {
       {
           kMultipleRasterThreadsFeatureName,
           false,
-          NumberOfRendererRasterThreads() == 1,
+          NumberOfRendererWorkerThreads() == 1,
           "Raster is using a single thread.",
           false
       },
@@ -180,7 +180,7 @@ bool IsDelegatedRendererEnabled() {
   return enabled;
 }
 
-int NumberOfRendererRasterThreads() {
+int NumberOfRendererWorkerThreads() {
   int num_processors = base::SysInfo::NumberOfProcessors();
 
 #if defined(OS_ANDROID)
@@ -189,30 +189,30 @@ int NumberOfRendererRasterThreads() {
   num_processors = std::min(num_processors, 4);
 #endif
 
-  int num_raster_threads = num_processors / 2;
+  int num_worker_threads = num_processors / 2;
 
   // Async uploads is used when neither zero-copy nor one-copy is enabled and
-  // it uses its own thread, so reduce the number of raster threads when async
+  // it uses its own thread, so reduce the number of worker threads when async
   // uploads is in use.
   bool async_uploads_is_used =
       !IsZeroCopyUploadEnabled() && !IsOneCopyUploadEnabled();
   if (async_uploads_is_used)
-    --num_raster_threads;
+    --num_worker_threads;
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
-  if (command_line.HasSwitch(switches::kNumRasterThreads)) {
+  if (command_line.HasSwitch(switches::kNumWorkerThreads)) {
     std::string string_value = command_line.GetSwitchValueASCII(
-        switches::kNumRasterThreads);
-    if (!base::StringToInt(string_value, &num_raster_threads)) {
+        switches::kNumWorkerThreads);
+    if (!base::StringToInt(string_value, &num_worker_threads)) {
       DLOG(WARNING) << "Failed to parse switch " <<
-          switches::kNumRasterThreads  << ": " << string_value;
+          switches::kNumWorkerThreads  << ": " << string_value;
     }
   }
 
-  return cc::MathUtil::ClampToRange(num_raster_threads, kMinRasterThreads,
-                                    kMaxRasterThreads);
+  return cc::MathUtil::ClampToRange(num_worker_threads, kMinWorkerThreads,
+                                    kMaxWorkerThreads);
 }
 
 bool IsOneCopyUploadEnabled() {
@@ -345,7 +345,7 @@ base::DictionaryValue* GetFeatureStatus() {
       if (gpu_feature_info.name == kMultipleRasterThreadsFeatureName) {
         const base::CommandLine& command_line =
             *base::CommandLine::ForCurrentProcess();
-        if (command_line.HasSwitch(switches::kNumRasterThreads))
+        if (command_line.HasSwitch(switches::kNumWorkerThreads))
           status += "_force";
       }
       if (gpu_feature_info.name == kMultipleRasterThreadsFeatureName)