Plumb overlay processing into DirectRenderer.

cc/resources/resource_provider.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_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 1435 matching lines @@
     ResourceId local_id = it->second;
     DCHECK(!resources_[local_id].marked_for_deletion);
     child_info.in_use_resources.insert(local_id);
   }
 
   ResourceIdArray unused;
   for (ResourceIdMap::iterator it = child_info.child_to_parent_map.begin();
        it != child_info.child_to_parent_map.end();
        ++it) {
     ResourceId local_id = it->second;
+    // Hold onto resources that still have read locks on them.
+    if (GetResource(local_id)->lock_for_read_count > 0)
+      child_info.in_use_resources.insert(local_id);

[piman, 2014/03/27 00:12:37]

I'm not sure if it's the best way to do this, in particular it means we have to
wait one more frame before returning the resources after the swap (since we have
to wait for the next DeclareUsedResourcesFromChild, on the next commit, and that
might even be skipped if the layer didn't change).

What I had in mind rather, is to follow the places where we test exported_count,
and take lock_for_read_count into account there too, where it makes sense.
Specifically, DeleteAndReturnUnusedResourcesToChild would mark for deletion
(instead of deleting immediately), and conversely, UnlockForRead would call
DeleteResourceInternal or DeleteAndReturnUnusedResourcesToChild if the resource
was marked_for_deletion and the lock_for_read_count dropped to 0.

Possibly doing the same for DeleteResource, if we ever want to handle the case
where the overlay candidate comes directly from the UI compositor.

+
     bool resource_is_in_use = child_info.in_use_resources.count(local_id) > 0;
     if (!resource_is_in_use)
       unused.push_back(local_id);
   }
   DeleteAndReturnUnusedResourcesToChild(child_it, Normal, unused);
 }
 
 // static
 bool ResourceProvider::CompareResourceMapIteratorsByChildId(
     const std::pair<ReturnedResource, ResourceMap::iterator>& a,
@@ skipping 749 matching lines @@
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->ContextGL() : NULL;
 }
 
 class GrContext* ResourceProvider::GrContext() const {
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
 }  // namespace cc