cc: Lock resources directly in CALayerOverlay

cc/output/overlay_processor.h

 // Copyright 2014 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.
 
 #ifndef CC_OUTPUT_OVERLAY_PROCESSOR_H_
 #define CC_OUTPUT_OVERLAY_PROCESSOR_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
-#include "cc/output/ca_layer_overlay.h"
-#include "cc/output/overlay_candidate.h"
 #include "cc/quads/render_pass.h"
 
 namespace cc {
+class CALayerOverlay;
 class OutputSurface;
+class OverlayCandidate;
 class ResourceProvider;
 
+typedef std::vector<CALayerOverlay> CALayerOverlayList;
+typedef std::vector<OverlayCandidate> OverlayCandidateList;
+
 class CC_EXPORT OverlayProcessor {
  public:
   class CC_EXPORT Strategy {
    public:
     virtual ~Strategy() {}
     // Returns false if the strategy cannot be made to work with the
     // current set of render passes. Returns true if the strategy was successful
     // and adds any additional passes necessary to represent overlays to
     // |render_passes|.
     virtual bool Attempt(ResourceProvider* resource_provider,
@@ skipping 32 matching lines @@
   // Update |damage_rect| by removing damage casued by |candidates|.
   void UpdateDamageRect(OverlayCandidateList* candidates,
                         gfx::Rect* damage_rect);
 
   DISALLOW_COPY_AND_ASSIGN(OverlayProcessor);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OVERLAY_PROCESSOR_H_