WIP GPU scheduler + delayed activation / tile draw

cc/raster/one_copy_raster_buffer_provider.cc

Index: cc/raster/one_copy_raster_buffer_provider.cc
diff --git a/cc/raster/one_copy_raster_buffer_provider.cc b/cc/raster/one_copy_raster_buffer_provider.cc
index 8b5acfc114f74491cced19aba7d862fbf9f9132b..ebbf0d69497b6aa43c8507af2e0aff168d5d9a5d 100644
--- a/cc/raster/one_copy_raster_buffer_provider.cc
+++ b/cc/raster/one_copy_raster_buffer_provider.cc
@@ -20,6 +20,7 @@
 #include "cc/resources/resource_util.h"
 #include "cc/resources/scoped_resource.h"
 #include "gpu/GLES2/gl2extchromium.h"
+#include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "ui/gfx/buffer_format_util.h"
@@ -37,11 +38,10 @@ OneCopyRasterBufferProvider::RasterBufferImpl::RasterBufferImpl(
     OneCopyRasterBufferProvider* client,
     ResourceProvider* resource_provider,
     const Resource* resource,
-    uint64_t previous_content_id,
-    bool async_worker_context_enabled)
+    uint64_t previous_content_id)
     : client_(client),
       resource_(resource),
-      lock_(resource_provider, resource->id(), async_worker_context_enabled),
+      lock_(resource_provider, resource->id(), true),
       previous_content_id_(previous_content_id) {
   client_->pending_raster_buffers_.insert(this);
 }
@@ -107,8 +107,7 @@ OneCopyRasterBufferProvider::AcquireBufferForRaster(
   // TODO(danakj): If resource_content_id != 0, we only need to copy/upload
   // the dirty rect.
   return base::MakeUnique<RasterBufferImpl>(this, resource_provider_, resource,
-                                            previous_content_id,
-                                            async_worker_context_enabled_);
+                                            previous_content_id);
 }
 
 void OneCopyRasterBufferProvider::ReleaseBufferForRaster(
@@ -138,6 +137,36 @@ void OneCopyRasterBufferProvider::OrderingBarrier() {
   pending_raster_buffers_.clear();
 }
 
+bool OneCopyRasterBufferProvider::IsResourceReadyToDraw(
+    const Resource* resource) {
+  if (async_worker_context_enabled_) {
+    gpu::SyncToken sync_token =
+        resource_provider_->GetSyncTokenForResource(resource->id());
+    if (sync_token.HasData()) {
+      return worker_context_provider_->ContextSupport()->IsFenceSyncReleased(
+          sync_token.release_count());
+    }
+  }
+  return true;
+}
+
+void OneCopyRasterBufferProvider::SignalResourcesReadyToDraw(
+    const std::vector<const Resource*>& resources,
+    const base::Closure& callback) {
+  if (async_worker_context_enabled_) {
+    ResourceProvider::ResourceIdArray resource_ids;
+    for (const Resource* resource : resources)
+      resource_ids.push_back(resource->id());
+
+    gpu::SyncToken sync_token =
+        resource_provider_->GetSyncTokenForResources(resource_ids);
+    compositor_context_provider_->ContextSupport()->SignalSyncToken(sync_token,
+                                                                    callback);
+  } else if (!callback.is_null()) {
+    callback.Run();
+  }
+}
+
 ResourceFormat OneCopyRasterBufferProvider::GetResourceFormat(
     bool must_support_alpha) const {
   if (resource_provider_->IsResourceFormatSupported(preferred_tile_format_) &&