Add preliminary support for hw-accelerated tile rasterization.

cc/resources/pixel_buffer_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/pixel_buffer_raster_worker_pool.h"
 
 #include "base/containers/stack_container.h"
 #include "base/debug/trace_event.h"
 #include "base/values.h"
 #include "cc/debug/traced_value.h"
@@ skipping 73 matching lines @@
 
 // Only used as std::find_if predicate for DCHECKs.
 bool WasCanceled(const internal::RasterWorkerPoolTask* task) {
   return task->WasCanceled();
 }
 
 }  // namespace
 
 PixelBufferRasterWorkerPool::PixelBufferRasterWorkerPool(
     ResourceProvider* resource_provider,
+    ContextProvider* context_provider,
     size_t num_threads,
     size_t max_transfer_buffer_usage_bytes)
-    : RasterWorkerPool(resource_provider, num_threads),
+    : RasterWorkerPool(resource_provider, context_provider, num_threads),
       shutdown_(false),
       scheduled_raster_task_count_(0),
       bytes_pending_upload_(0),
       max_bytes_pending_upload_(max_transfer_buffer_usage_bytes),
       has_performed_uploads_since_last_flush_(false),
       check_for_completed_raster_tasks_pending_(false),
       should_notify_client_if_no_tasks_are_pending_(false),
       should_notify_client_if_no_tasks_required_for_activation_are_pending_(
           false) {
 }
@@ skipping 35 matching lines @@
   if (!should_notify_client_if_no_tasks_are_pending_)
     TRACE_EVENT_ASYNC_BEGIN0("cc", "ScheduledTasks", this);
 
   should_notify_client_if_no_tasks_are_pending_ = true;
   should_notify_client_if_no_tasks_required_for_activation_are_pending_ = true;
 
   tasks_required_for_activation_.clear();
 
   // Build new pixel buffer task set.
   TaskMap new_pixel_buffer_tasks;
+  RasterTaskVector gpu_rasterization_tasks;
   for (RasterTaskVector::const_iterator it = raster_tasks().begin();
        it != raster_tasks().end(); ++it) {
     internal::RasterWorkerPoolTask* task = it->get();
     DCHECK(new_pixel_buffer_tasks.find(task) == new_pixel_buffer_tasks.end());
     DCHECK(!task->HasCompleted());
     DCHECK(!task->WasCanceled());
 
+    if (task->use_gpu_rasterization()) {
+      gpu_rasterization_tasks.push_back(task);
+      continue;
+    }
+
     new_pixel_buffer_tasks[task] = pixel_buffer_tasks_[task];
     pixel_buffer_tasks_.erase(task);
 
     if (IsRasterTaskRequiredForActivation(task))
       tasks_required_for_activation_.insert(task);
   }
 
   // Transfer remaining pixel buffer tasks to |new_pixel_buffer_tasks|
   // and cancel all remaining inactive tasks.
   for (TaskMap::iterator it = pixel_buffer_tasks_.begin();
@@ skipping 36 matching lines @@
 
   // Schedule new tasks.
   ScheduleMoreTasks();
 
   // Cancel any pending check for completed raster tasks and schedule
   // another check.
   check_for_completed_raster_tasks_callback_.Cancel();
   check_for_completed_raster_tasks_pending_ = false;
   ScheduleCheckForCompletedRasterTasks();
 
+  // Run raster tasks that use GPU on impl thread.
+  RasterWorkerPool::RunGpuRasterizationTasks(gpu_rasterization_tasks);
+  for (RasterTaskVector::iterator it = gpu_rasterization_tasks.begin();
+      it != gpu_rasterization_tasks.end(); ++it) {
+    internal::RasterWorkerPoolTask* task = it->get();
+    task->DidRun(false);

[vmpstr, 2013/12/17 22:52:45]

In ImageRasterWorkerPool, similar block does a OnRasterTaskCompleted (which is
also changed to do special logic for gpu rasterization tasks). In here, you call
task->DidRun/WillComplete/etc directly. I think we should add some consistency
between the two methods.

I would vote for calling OnRasterTaskCompleted in both cases and handling gpu
rasterization tasks specially (this would allow us to still have the trace event
that is triggered from there)

[reveman, 2013/12/17 23:03:16]

Should this be done by RasterWorkerPool::RunGpuRasterizationTasks?

[alokp, 2013/12/17 23:26:08]

Yes. It can be. I was just following the pattern used by other tasks.

+    task->WillComplete();
+    task->CompleteOnOriginThread();
+    task->DidComplete();

[reveman, 2013/12/17 23:03:16]

I think these 3 lines need to be moved to ::CheckForCompletedTasks().

[alokp, 2013/12/17 23:26:08]

Are you suggesting implementing RasterWorkerPool::CheckForCompletedTasks, which
will iterate through the gpu-raster tasks and call these 3 functions?

[reveman, 2013/12/18 00:09:51]

You already have an impl of this function below:
PixelBufferRasterWorkerPool::CheckForCompletedTasks()
just do it from there instead.

And for ImageRasterWorkerPool you'll need to add:
ImageRasterWorkerPool::CheckForCompletedTasks() as it was not needed before
(WorkerPool::CheckForCompletedTasks() was already doing the right thing there
before).

[alokp, 2013/12/18 22:49:22]

I added an implementation of RWP::CheckForCompletedTasks instead.

+  }
+
   TRACE_EVENT_ASYNC_STEP_INTO1(
       "cc", "ScheduledTasks", this, StateName(),
       "state", TracedValue::FromValue(StateAsValue().release()));
 }
 
 GLenum PixelBufferRasterWorkerPool::GetResourceTarget() const {
   return GL_TEXTURE_2D;
 }
 
 ResourceFormat PixelBufferRasterWorkerPool::GetResourceFormat() const {
@@ skipping 443 matching lines @@
 
   throttle_state->SetInteger("bytes_available_for_upload",
                              max_bytes_pending_upload_ - bytes_pending_upload_);
   throttle_state->SetInteger("bytes_pending_upload", bytes_pending_upload_);
   throttle_state->SetInteger("scheduled_raster_task_count",
                              scheduled_raster_task_count_);
   return throttle_state.PassAs<base::Value>();
 }
 
 }  // namespace cc