Revert of Re-land: cc: Use worker context for one-copy tile initialization.

cc/resources/resource_pool.cc

 // Copyright 2012 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/resource_pool.h"
 
 #include <algorithm>
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 169 matching lines @@
 }
 
 void ResourcePool::DeleteResource(ScopedResource* resource) {
   size_t resource_bytes = ResourceUtil::UncheckedSizeInBytes<size_t>(
       resource->size(), resource->format());
   memory_usage_bytes_ -= resource_bytes;
   --resource_count_;
   delete resource;
 }
 
-void ResourcePool::CheckBusyResources() {
+void ResourcePool::CheckBusyResources(bool wait_if_needed) {
   ResourceList::iterator it = busy_resources_.begin();
 
   while (it != busy_resources_.end()) {
     ScopedResource* resource = it->resource;
 
+    if (wait_if_needed)
+      resource_provider_->WaitReadLockIfNeeded(resource->id());
+
     if (resource_provider_->CanLockForWrite(resource->id())) {
       DidFinishUsingResource(resource, it->content_id);
       it = busy_resources_.erase(it);
     } else if (resource_provider_->IsLost(resource->id())) {
       // Remove lost resources from pool.
       DeleteResource(resource);
       it = busy_resources_.erase(it);
     } else {
       ++it;
     }
@@ skipping 14 matching lines @@
   }
   for (const auto& resource : busy_resources_) {
     resource.OnMemoryDump(pmd, false /* is_free */);
   }
   // TODO(ericrk): Dump vended out resources once that data is available.
   // crbug.com/516541
   return true;
 }
 
 }  // namespace cc