Shared Raster Worker Threads

cc/resources/raster_worker_pool.cc

 // Copyright 2013 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 "cc/resources/raster_worker_pool.h"
 
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "cc/debug/devtools_instrumentation.h"
@@ skipping 301 matching lines @@
   void RunOnOriginThread() const {
     on_raster_finished_callback_.Run(this);
   }
 
   scoped_refptr<base::MessageLoopProxy> origin_loop_;
   const Callback on_raster_finished_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterFinishedWorkerPoolTaskImpl);
 };
 
-const char* kWorkerThreadNamePrefix = "CompositorRaster";
+const int kDefaultNumRasterThreads = 1;

[reveman, 2014/01/06 20:01:35]

nit: I'd add a blank line after this

[sohanjg, 2014/01/07 08:35:23]

Done.

+static int num_raster_threads = kDefaultNumRasterThreads;

[reveman, 2014/01/06 20:01:35]

s/num_raster_threads/g_num_raster_threads/

if you initialize this to 0 then you can DCHECK that it's not set twice.

nit: 'static' is not really necessary here.

[sohanjg, 2014/01/07 08:35:23]

Done.

 
 }  // namespace
 
 namespace internal {
 
 RasterWorkerPoolTask::RasterWorkerPoolTask(
     const Resource* resource, TaskVector* dependencies)
     : did_run_(false),
       did_complete_(false),
       was_canceled_(false),
@@ skipping 121 matching lines @@
     skia::LazyPixelRef* pixel_ref,
     int layer_id,
     RenderingStatsInstrumentation* stats_instrumentation,
     const Task::Reply& reply) {
   return Task(new ImageDecodeWorkerPoolTaskImpl(pixel_ref,
                                                 layer_id,
                                                 stats_instrumentation,
                                                 reply));
 }
 
-RasterWorkerPool::RasterWorkerPool(ResourceProvider* resource_provider,
-                                   size_t num_threads)
-    : WorkerPool(num_threads, kWorkerThreadNamePrefix),
-      client_(NULL),
+// static
+void RasterWorkerPool::SetNumRasterThreads(int num_threads) {
+  DCHECK(num_threads);

[reveman, 2014/01/06 20:01:35]

I prefer DCHECK_LT(0, num_threads)

also add DCHECK_EQ(0, g_num_raster_threads)

[sohanjg, 2014/01/07 08:35:23]

Done.

+
+  num_raster_threads = num_threads;
+}
+
+// static
+int RasterWorkerPool::GetNumRasterThreads() {

[reveman, 2014/01/06 20:01:35]

Let's just use WorkerPool::GetNumRasterThreads() for now until I clean this up
in a follow up.

[sohanjg, 2014/01/07 08:35:23]

Done.

+  return num_raster_threads;
+}
+
+// static
+int WorkerPool::GetNumRasterThreads() {

[reveman, 2014/01/06 20:01:35]

if you make this:

{
  if (!g_num_raster_threads)
    g_num_raster_threads = kDefaultNumRasterThreads;

  return g_num_raster_threads;
}

DCHECK will also fail if someone decides to call SetNumRasterThreads after
GetNumRasterThreads has been called.

[sohanjg, 2014/01/07 08:35:23]

Done.

+  return RasterWorkerPool::GetNumRasterThreads();
+}
+
+RasterWorkerPool::RasterWorkerPool(ResourceProvider* resource_provider)
+    : client_(NULL),
       resource_provider_(resource_provider),
       weak_ptr_factory_(this) {
 }
 
 RasterWorkerPool::~RasterWorkerPool() {
 }
 
 void RasterWorkerPool::SetClient(RasterWorkerPoolClient* client) {
   client_ = client;
 }
@@ skipping 109 matching lines @@
 
     internal::GraphNode* decode_node = CreateGraphNodeForTask(
         decode_task, priority, graph);
     decode_node->add_dependent(raster_node);
   }
 
   return raster_node;
 }
 
 }  // namespace cc