cc: Lock resources directly in CALayerOverlay

cc/output/gl_renderer.cc

Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 7cf5a00face44d5bfa4fdf49f6e805ae4d5b209c..ae879e21d37ece258a1a2ea3d06cf699b4daa85e 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -3592,13 +3592,12 @@ bool GLRenderer::IsContextLost() {
 }
 
 void GLRenderer::ScheduleCALayers(DrawingFrame* frame) {
-  for (const CALayerOverlay& ca_layer_overlay : frame->ca_layer_overlay_list) {
+  for (CALayerOverlay& ca_layer_overlay : frame->ca_layer_overlay_list) {
     unsigned texture_id = 0;
-    if (ca_layer_overlay.contents_resource_id) {
+    if (ca_layer_overlay.resource_lock) {
+      texture_id = ca_layer_overlay.resource_lock->GetTextureId();
       pending_overlay_resources_.push_back(
-          base::WrapUnique(new ResourceProvider::ScopedReadLockGpuMemoryBuffer(
-              resource_provider_, ca_layer_overlay.contents_resource_id)));
-      texture_id = pending_overlay_resources_.back()->GetTextureId();
+          std::move(ca_layer_overlay.resource_lock));
     }
     GLfloat contents_rect[4] = {
         ca_layer_overlay.contents_rect.x(), ca_layer_overlay.contents_rect.y(),
@@ -3625,6 +3624,7 @@ void GLRenderer::ScheduleCALayers(DrawingFrame* frame) {
         bounds_rect, is_clipped, clip_rect, sorting_context_id, transform,
         filter);
   }
+  frame->ca_layer_overlay_list.clear();
 }
 
 void GLRenderer::ScheduleOverlays(DrawingFrame* frame) {