cc: Lock resources directly in CALayerOverlay

cc/output/ca_layer_overlay.cc

 // Copyright 2015 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/ca_layer_overlay.h"
 
 #include "base/metrics/histogram.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/stream_video_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
@@ skipping 20 matching lines @@
   CA_LAYER_FAILED_QUAD_TRANSFORM,
   CA_LAYER_FAILED_QUAD_CLIPPING,
   CA_LAYER_FAILED_DEBUG_BORDER,
   CA_LAYER_FAILED_PICTURE_CONTENT,
   CA_LAYER_FAILED_RENDER_PASS,
   CA_LAYER_FAILED_SURFACE_CONTENT,
   CA_LAYER_FAILED_YUV_VIDEO_CONTENT,
   CA_LAYER_FAILED_COUNT,
 };
 
+bool SetResource(ResourceProvider* resource_provider,

[erikchen, 2016/05/26 00:32:01]

I think the conditional should live outside the function. I don't really see the
point of this function. [It's doing too many things. SetResource should set a
resource, not conditionally set a resource.]

if (!resource_provider->IsOverlayCandidate(resource_id))	
       return CA_LAYER_FAILED_STREAM_VIDEO_NOT_CANDIDATE;

ca_layer_overlay->resource_lock = new
ResourceProvider::ScopedReadLockGpuMemoryBuffer(resource_provider, resource_id);

[ccameron, 2016/05/26 18:49:15]

But but ... it seems so wasteful to look the same structure up in the hash table
twice in a row!

The hope, though is that the next step will be to check
resource_lock->GetGpuMemoryBuffer, so the IsOverlayCandidate is to be short
lived. Made it not-lived.

+                 unsigned resource_id,
+                 CALayerOverlay* ca_layer_overlay) {
+  std::unique_ptr<ResourceProvider::ScopedReadLockGpuMemoryBuffer>
+      resource_lock(new ResourceProvider::ScopedReadLockGpuMemoryBuffer(
+          resource_provider, resource_id));
+  if (!resource_lock->IsOverlayCandidate())
+    return false;
+  ca_layer_overlay->resource_lock = std::move(resource_lock);
+  return true;
+}
+
 CALayerResult FromStreamVideoQuad(ResourceProvider* resource_provider,
                                   const StreamVideoDrawQuad* quad,
                                   CALayerOverlay* ca_layer_overlay) {
-  unsigned resource_id = quad->resource_id();
-  if (!resource_provider->IsOverlayCandidate(resource_id))
+  if (!SetResource(resource_provider, quad->resource_id(), ca_layer_overlay))
     return CA_LAYER_FAILED_STREAM_VIDEO_NOT_CANDIDATE;
-  ca_layer_overlay->contents_resource_id = resource_id;
   // TODO(ccameron): Support merging at least some basic transforms into the
   // layer transform.
   if (!quad->matrix.IsIdentity())
     return CA_LAYER_FAILED_STREAM_VIDEO_TRANSFORM;
   ca_layer_overlay->contents_rect = gfx::RectF(0, 0, 1, 1);
   return CA_LAYER_SUCCESS;
 }
 
 CALayerResult FromSolidColorDrawQuad(const SolidColorDrawQuad* quad,
                                      CALayerOverlay* ca_layer_overlay,
                                      bool* skip) {
   // Do not generate quads that are completely transparent.
   if (SkColorGetA(quad->color) == 0) {
     *skip = true;
     return CA_LAYER_SUCCESS;
   }
   ca_layer_overlay->background_color = quad->color;
   return CA_LAYER_SUCCESS;
 }
 
 CALayerResult FromTextureQuad(ResourceProvider* resource_provider,
                               const TextureDrawQuad* quad,
                               CALayerOverlay* ca_layer_overlay) {
-  unsigned resource_id = quad->resource_id();
-  if (!resource_provider->IsOverlayCandidate(resource_id))
+  if (!SetResource(resource_provider, quad->resource_id(), ca_layer_overlay))
     return CA_LAYER_FAILED_TEXTURE_NOT_CANDIDATE;
   if (quad->y_flipped) {
     // The anchor point is at the bottom-left corner of the CALayer. The
     // transformation that flips the contents of the layer without changing its
     // frame is the composition of a vertical flip about the anchor point, and a
     // translation by the height of the layer.
     ca_layer_overlay->transform.preTranslate(
         0, ca_layer_overlay->bounds_rect.height(), 0);
     ca_layer_overlay->transform.preScale(1, -1, 1);
   }
-  ca_layer_overlay->contents_resource_id = resource_id;
   ca_layer_overlay->contents_rect =
       BoundingRect(quad->uv_top_left, quad->uv_bottom_right);
   ca_layer_overlay->background_color = quad->background_color;
   for (int i = 1; i < 4; ++i) {
     if (quad->vertex_opacity[i] != quad->vertex_opacity[0])
       return CA_LAYER_FAILED_UNKNOWN;
   }
   ca_layer_overlay->opacity *= quad->vertex_opacity[0];
   ca_layer_overlay->filter = quad->nearest_neighbor ? GL_NEAREST : GL_LINEAR;
   return CA_LAYER_SUCCESS;
 }
 
 CALayerResult FromTileQuad(ResourceProvider* resource_provider,
                            const TileDrawQuad* quad,
                            CALayerOverlay* ca_layer_overlay) {
-  unsigned resource_id = quad->resource_id();
-  if (!resource_provider->IsOverlayCandidate(resource_id))
+  if (!SetResource(resource_provider, quad->resource_id(), ca_layer_overlay))
     return CA_LAYER_FAILED_TILE_NOT_CANDIDATE;
-  ca_layer_overlay->contents_resource_id = resource_id;
   ca_layer_overlay->contents_rect = quad->tex_coord_rect;
   ca_layer_overlay->contents_rect.Scale(1.f / quad->texture_size.width(),
                                         1.f / quad->texture_size.height());
   return CA_LAYER_SUCCESS;
 }
 
 CALayerResult FromDrawQuad(ResourceProvider* resource_provider,
                            const gfx::RectF& display_rect,
                            const DrawQuad* quad,
                            CALayerOverlay* ca_layer_overlay,
@@ skipping 58 matching lines @@
       break;
   }
 
   return CA_LAYER_FAILED_UNKNOWN;
 }
 
 }  // namespace
 
 CALayerOverlay::CALayerOverlay() : filter(GL_LINEAR) {}
 
-CALayerOverlay::CALayerOverlay(const CALayerOverlay& other) = default;
+CALayerOverlay::CALayerOverlay(CALayerOverlay&& other) = default;
 
 CALayerOverlay::~CALayerOverlay() {}
 
 bool ProcessForCALayerOverlays(ResourceProvider* resource_provider,
                                const gfx::RectF& display_rect,
                                const QuadList& quad_list,
                                CALayerOverlayList* ca_layer_overlays) {
   CALayerResult result = CA_LAYER_SUCCESS;
   ca_layer_overlays->reserve(quad_list.size());
 
@@ skipping 18 matching lines @@
           previous_ca_layer.sorting_context_id == ca_layer.sorting_context_id) {
         if (previous_ca_layer.is_clipped != ca_layer.is_clipped ||
             previous_ca_layer.clip_rect != ca_layer.clip_rect) {
           // TODO(ccameron): Add a histogram value for this.
           result = CA_LAYER_FAILED_UNKNOWN;
           break;
         }
       }
     }
 
-    ca_layer_overlays->push_back(ca_layer);
+    ca_layer_overlays->push_back(std::move(ca_layer));
   }
 
   UMA_HISTOGRAM_ENUMERATION("Compositing.Renderer.CALayerResult", result,
                             CA_LAYER_FAILED_COUNT);
 
   if (result != CA_LAYER_SUCCESS) {
     ca_layer_overlays->clear();
     return false;
   }
   return true;
 }
 
 }  // namespace cc