cc: Hide Gpu Rasterization details in Resource Provider.

cc/resources/gpu_raster_worker_pool.cc

 // Copyright 2014 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/gpu_raster_worker_pool.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/output/context_provider.h"
 #include "cc/resources/resource.h"
 #include "cc/resources/resource_provider.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace cc {
 
 // static
 scoped_ptr<RasterWorkerPool> GpuRasterWorkerPool::Create(
     base::SequencedTaskRunner* task_runner,
-    ResourceProvider* resource_provider,
-    ContextProvider* context_provider) {
-  return make_scoped_ptr<RasterWorkerPool>(new GpuRasterWorkerPool(
-      task_runner, resource_provider, context_provider));
+    ResourceProvider* resource_provider) {
+  return make_scoped_ptr<RasterWorkerPool>(
+      new GpuRasterWorkerPool(task_runner, resource_provider));
 }
 
 GpuRasterWorkerPool::GpuRasterWorkerPool(base::SequencedTaskRunner* task_runner,
-                                         ResourceProvider* resource_provider,
-                                         ContextProvider* context_provider)
+                                         ResourceProvider* resource_provider)
     : task_runner_(task_runner),
       task_graph_runner_(new TaskGraphRunner),
       namespace_token_(task_graph_runner_->GetNamespaceToken()),
       resource_provider_(resource_provider),
-      context_provider_(context_provider),
       run_tasks_on_origin_thread_pending_(false),
       raster_tasks_pending_(false),
       raster_tasks_required_for_activation_pending_(false),
       raster_finished_weak_ptr_factory_(this),
       weak_ptr_factory_(this) {
-  DCHECK(context_provider_);
 }
 
 GpuRasterWorkerPool::~GpuRasterWorkerPool() {
   DCHECK_EQ(0u, completed_tasks_.size());
 }
 
 Rasterizer* GpuRasterWorkerPool::AsRasterizer() {
   return this;
 }
 
@@ skipping 133 matching lines @@
                  weak_ptr_factory_.GetWeakPtr()));
   run_tasks_on_origin_thread_pending_ = true;
 }
 
 void GpuRasterWorkerPool::RunTasksOnOriginThread() {
   TRACE_EVENT0("cc", "GpuRasterWorkerPool::RunTasksOnOriginThread");
 
   DCHECK(run_tasks_on_origin_thread_pending_);
   run_tasks_on_origin_thread_pending_ = false;
 
-  DCHECK(context_provider_->ContextGL());
   // TODO(alokp): Use a trace macro to push/pop markers.
   // Using push/pop functions directly incurs cost to evaluate function
   // arguments even when tracing is disabled.

[reveman, 2014/07/01 17:19:01]

this comment should be moved to the resource provider and where the code it
refers to is.

[sohanjg, 2014/07/02 07:40:37]

Done.

-  context_provider_->ContextGL()->PushGroupMarkerEXT(
-      0, "GpuRasterWorkerPool::RunTasksOnOriginThread");
-
-  GrContext* gr_context = context_provider_->GrContext();
-  // TODO(alokp): Implement TestContextProvider::GrContext().
-  if (gr_context)
-    gr_context->resetContext();
-
+  ResourceProvider::ScopedGpuRaster gpu_raster(
+      resource_provider_, "GpuRasterWorkerPool::RunTasksOnOriginThread");

[reveman, 2014/07/01 17:19:01]

I'm not sure how useful the "GpuRasterWorkerPool::RunTasksOnOriginThread" name
is here. Maybe we can remove the name parameter from ScopedGpuRaster ctor and
just use "GpuRasterization" from within the ResourceProvider implementation.
That would also provide a simple hint to look for in traces to determine if GPU
raster is used.

[sohanjg, 2014/07/02 07:40:37]

Done.

   task_graph_runner_->RunUntilIdle();
-
-  // TODO(alokp): Implement TestContextProvider::GrContext().
-  if (gr_context)
-    gr_context->flush();
-
-  context_provider_->ContextGL()->PopGroupMarkerEXT();
 }
 
 }  // namespace cc