Make the number of raster threads appear in chrome://gpu.

content/renderer/render_thread_impl.cc

 // 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.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 155 matching lines @@
 using blink::WebView;
 
 namespace content {
 
 namespace {
 
 const int64 kInitialIdleHandlerDelayMs = 1000;
 const int64 kShortIdleHandlerDelayMs = 1000;
 const int64 kLongIdleHandlerDelayMs = 30*1000;
 const int kIdleCPUUsageThresholdInPercents = 3;
-const int kMinRasterThreads = 1;
-const int kMaxRasterThreads = 64;
 
 // Maximum allocation size allowed for image scaling filters that
 // require pre-scaling. Skia will fallback to a filter that doesn't
 // require pre-scaling if the default filter would require an
 // allocation that exceeds this limit.
 const size_t kImageCacheSingleAllocationByteLimit = 64 * 1024 * 1024;
 
 const size_t kEmulatedDiscardableMemoryBytesToKeepWhenWidgetsHidden =
     4 * 1024 * 1024;
 
@@ skipping 361 matching lines @@
       LOG(ERROR) << "Requested discardable memory type is not supported.";
     }
   }
 
   base::DiscardableMemory::SetPreferredType(type);
 
   // AllocateGpuMemoryBuffer must be used exclusively on one thread but
   // it doesn't have to be the same thread RenderThreadImpl is created on.
   allocate_gpu_memory_buffer_thread_checker_.DetachFromThread();
 
-  if (command_line.HasSwitch(switches::kNumRasterThreads)) {
+  if (is_impl_side_painting_enabled_) {
     int num_raster_threads;

[jamesr, 2014/08/29 19:50:39]

initialize this var, please. if the StringToInt call fails and we aren't in a
debug build this will call SetNumRasterThreads() with whatever's sitting on the
stack here which'll probably lead to a difficult to understand crash later

[danakj, 2014/08/29 19:53:31]

Done.

     std::string string_value =
         command_line.GetSwitchValueASCII(switches::kNumRasterThreads);
-    if (base::StringToInt(string_value, &num_raster_threads) &&
-        num_raster_threads >= kMinRasterThreads &&
-        num_raster_threads <= kMaxRasterThreads) {
-      cc::RasterWorkerPool::SetNumRasterThreads(num_raster_threads);
-    } else {
-      LOG(WARNING) << "Failed to parse switch " <<
-                      switches::kNumRasterThreads  << ": " << string_value;
-    }
+    bool ok = base::StringToInt(string_value, &num_raster_threads);
+    DCHECK(ok) << string_value;

[jamesr, 2014/08/29 19:50:38]

if you give this var a better name the error message will be slightly easier to
parse when this trips. DCHECK(num_raster_threads_parsed) or something?

[danakj, 2014/08/29 19:53:31]

Done.

+    DCHECK_GT(num_raster_threads, 0);
+    cc::RasterWorkerPool::SetNumRasterThreads(num_raster_threads);
   }
 
   service_registry()->AddService<RenderFrameSetup>(
       base::Bind(CreateRenderFrameSetup));
 
   TRACE_EVENT_END_ETW("RenderThreadImpl::Init", 0, "");
 }
 
 RenderThreadImpl::~RenderThreadImpl() {
   for (std::map<int, mojo::MessagePipeHandle>::iterator it =
@@ skipping 1063 matching lines @@
   hidden_widget_count_--;
 
   if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
     return;
   }
 
   ScheduleIdleHandler(kLongIdleHandlerDelayMs);
 }
 
 }  // namespace content