cc: Lock resources directly in CALayerOverlay

cc/output/ca_layer_overlay.h

Index: cc/output/ca_layer_overlay.h
diff --git a/cc/output/ca_layer_overlay.h b/cc/output/ca_layer_overlay.h
index 09dc7f83bb62c22e05ce8bc0fffa053b7742f009..0ac0be2cdee659164d319e24b5ca36da4ce16c9b 100644
--- a/cc/output/ca_layer_overlay.h
+++ b/cc/output/ca_layer_overlay.h
@@ -5,7 +5,9 @@
 #ifndef CC_OUTPUT_CA_LAYER_OVERLAY_H_
 #define CC_OUTPUT_CA_LAYER_OVERLAY_H_
 
+#include "base/macros.h"
 #include "cc/quads/render_pass.h"
+#include "cc/resources/resource_provider.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "ui/gfx/geometry/rect_f.h"
@@ -13,23 +15,25 @@
 namespace cc {
 
 class DrawQuad;
-class ResourceProvider;
 
 class CC_EXPORT CALayerOverlay {
  public:
   CALayerOverlay();
-  CALayerOverlay(const CALayerOverlay& other);
+  CALayerOverlay(CALayerOverlay&& other);
+  CALayerOverlay& operator=(CALayerOverlay&& other);
   ~CALayerOverlay();
 
+  // Resource that corresponds to an IOSurface to set as the content of the
+  // CALayer. If this is nullptr then the CALayer is a solid color.
+  std::unique_ptr<ResourceProvider::ScopedReadLockGpuMemoryBuffer>
+      resource_lock;
+
   // If |is_clipped| is true, then clip to |clip_rect| in the target space.
   bool is_clipped = false;
   gfx::RectF clip_rect;
   // Layers in a non-zero sorting context exist in the same 3D space and should
   // intersect.
   unsigned sorting_context_id = 0;
-  // Texture that corresponds to an IOSurface to set as the content of the
-  // CALayer. If this is 0 then the CALayer is a solid color.
-  unsigned contents_resource_id = 0;
   // The contents rect property for the CALayer.
   gfx::RectF contents_rect;
   // The opacity property for the CAayer.
@@ -44,9 +48,10 @@ class CC_EXPORT CALayerOverlay {
   SkMatrix44 transform = SkMatrix44(SkMatrix44::kIdentity_Constructor);
   // The minification and magnification filters for the CALayer.
   unsigned filter;
-};
 
-typedef std::vector<CALayerOverlay> CALayerOverlayList;
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CALayerOverlay);
+};
 
 // Returns true if all quads in the root render pass have been replaced by
 // CALayerOverlays.