cc: Release pending overlay resources on swap-ack.

cc/output/gl_renderer.cc

 // Copyright 2010 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/output/gl_renderer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2747 matching lines @@
       swapping_overlay_resources_.size() > 2) {
     swapping_overlay_resources_.pop_front();
   }
 
   output_surface_->SwapBuffers(std::move(compositor_frame));
 
   swap_buffer_rect_ = gfx::Rect();
 }
 
 void GLRenderer::SwapBuffersComplete() {
-  // Once a resouce has been swap-ACKed, send a query to the GPU process to ask
-  // if the resource is no longer being consumed by the system compositor. The
-  // response will come with the next swap-ACK.
   if (settings_->release_overlay_resources_after_gpu_query) {
+    // Once a resouce has been swap-ACKed, send a query to the GPU process to

[reveman, 2016/07/20 21:07:22]

nit: s/resouce/resource/

[Daniele Castagna, 2016/07/20 23:03:58]

Done.

+    // ask if the resource is no longer being consumed by the system compositor.
+    // The response will come with the next swap-ACK.
     if (!swapping_overlay_resources_.empty()) {
       for (OverlayResourceLock& lock : swapping_overlay_resources_.front()) {
         unsigned texture = lock->texture_id();
         if (swapped_and_acked_overlay_resources_.find(texture) ==
             swapped_and_acked_overlay_resources_.end()) {
           swapped_and_acked_overlay_resources_[texture] = std::move(lock);
         }
       }
       swapping_overlay_resources_.pop_front();
     }
 
     if (!swapped_and_acked_overlay_resources_.empty()) {
       std::vector<unsigned> textures;
       textures.reserve(swapped_and_acked_overlay_resources_.size());
       for (auto& pair : swapped_and_acked_overlay_resources_) {
         textures.push_back(pair.first);
       }
       gl_->ScheduleCALayerInUseQueryCHROMIUM(textures.size(), textures.data());
     }
+  } else if (swapping_overlay_resources_.size() > 1) {
+    DCHECK_EQ(2U, swapping_overlay_resources_.size());

[reveman, 2016/07/20 21:07:22]

nit: 2u

[Daniele Castagna, 2016/07/20 23:03:58]

I used the capital U to stay consistent with overlay_unittests.cc

+    swapping_overlay_resources_.pop_front();

[reveman, 2016/07/20 21:07:21]

I think a comment here explaining why this is correct would be useful.

[ccameron, 2016/07/20 21:22:24]

+1

   }
 }
 
 void GLRenderer::DidReceiveTextureInUseResponses(
     const gpu::TextureInUseResponses& responses) {
   DCHECK(settings_->release_overlay_resources_after_gpu_query);
   for (const gpu::TextureInUseResponse& response : responses) {
     if (!response.in_use) {
       swapped_and_acked_overlay_resources_.erase(response.texture);
     }
@@ skipping 883 matching lines @@
       texture_id = pending_overlay_resources_.back()->texture_id();
     }
 
     context_support_->ScheduleOverlayPlane(
         overlay.plane_z_order, overlay.transform, texture_id,
         ToNearestRect(overlay.display_rect), overlay.uv_rect);
   }
 }
 
 }  // namespace cc