cc: Remove ScheduleOnOriginThread() and CompleteOnOriginThread().

cc/raster/one_copy_tile_task_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/raster/one_copy_tile_task_worker_pool.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 110 matching lines @@
   TaskGraph empty;
   task_graph_runner_->ScheduleTasks(namespace_token_, &empty);
   task_graph_runner_->WaitForTasksToFinishRunning(namespace_token_);
 
   staging_pool_->Shutdown();
 }
 
 void OneCopyTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) {
   TRACE_EVENT0("cc", "OneCopyTileTaskWorkerPool::ScheduleTasks");
 
-  ScheduleTasksOnOriginThread(this, graph);
-
   // Barrier to sync any new resources to the worker context.
   resource_provider_->output_surface()
       ->context_provider()
       ->ContextGL()
       ->OrderingBarrierCHROMIUM();
 
   task_graph_runner_->ScheduleTasks(namespace_token_, graph);
 }
 
-void OneCopyTileTaskWorkerPool::CheckForCompletedTasks() {
+void OneCopyTileTaskWorkerPool::CollectCompletedTasks(
+    Task::Vector* completed_tasks) {
   TRACE_EVENT0("cc", "OneCopyTileTaskWorkerPool::CheckForCompletedTasks");
 
-  task_graph_runner_->CollectCompletedTasks(namespace_token_,
-                                            &completed_tasks_);
-
-  for (Task::Vector::const_iterator it = completed_tasks_.begin();
-       it != completed_tasks_.end(); ++it) {
-    TileTask* task = static_cast<TileTask*>(it->get());
-
-    task->WillComplete();
-    task->CompleteOnOriginThread(this);
-    task->DidComplete();
-  }
-  completed_tasks_.clear();
+  task_graph_runner_->CollectCompletedTasks(namespace_token_, completed_tasks);
 }
 
 ResourceFormat OneCopyTileTaskWorkerPool::GetResourceFormat(
     bool must_support_alpha) const {
   if (resource_provider_->IsResourceFormatSupported(preferred_tile_format_) &&
       (DoesResourceFormatSupportAlpha(preferred_tile_format_) ||
        !must_support_alpha)) {
     return preferred_tile_format_;
   }
 
   return resource_provider_->best_texture_format();
 }
 
 bool OneCopyTileTaskWorkerPool::GetResourceRequiresSwizzle(
     bool must_support_alpha) const {
   return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha));
 }
 
+TileTaskClient* OneCopyTileTaskWorkerPool::AsTileTaskClient() {
+  return this;
+}
+
 std::unique_ptr<RasterBuffer> OneCopyTileTaskWorkerPool::AcquireBufferForRaster(
     const Resource* resource,
     uint64_t resource_content_id,
     uint64_t previous_content_id) {
   // TODO(danakj): If resource_content_id != 0, we only need to copy/upload
   // the dirty rect.
   return base::WrapUnique<RasterBuffer>(
       new RasterBufferImpl(this, resource_provider_, resource->format(),
                            resource, previous_content_id));
 }
@@ skipping 78 matching lines @@
   }
 }
 
 void OneCopyTileTaskWorkerPool::CopyOnWorkerThread(
     StagingBuffer* staging_buffer,
     const Resource* resource,
     ResourceProvider::ScopedWriteLockGL* resource_lock,
     const RasterSource* raster_source,
     uint64_t previous_content_id,
     uint64_t new_content_id) {
+  DCHECK(resource->size().width() && resource->size().height());
+
   ContextProvider* context_provider =
       resource_provider_->output_surface()->worker_context_provider();
   DCHECK(context_provider);
 
   {
     ContextProvider::ScopedContextLock scoped_context(context_provider);
 
     gpu::gles2::GLES2Interface* gl = scoped_context.ContextGL();
     DCHECK(gl);
 
@@ skipping 93 matching lines @@
     gl->OrderingBarrierCHROMIUM();
 
     // Generate sync token after the barrier for cross context synchronization.
     gpu::SyncToken sync_token;
     gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
     resource_lock->UpdateResourceSyncToken(sync_token);
   }
 }
 
 }  // namespace cc