cc: Fix overlay damage tracking bug

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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ skipping 11 matching lines @@
    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|. Strategy can also optimize |damage_rect| as it seems
     // fit to reduce GL composition, in case |damage_rect| is obscured by
     // overlays.
     virtual bool Attempt(ResourceProvider* resource_provider,
                          RenderPassList* render_passes,
-                         OverlayCandidateList* candidates,
-                         gfx::Rect* damage_rect) = 0;
+                         OverlayCandidateList* candidates) = 0;
   };
   using StrategyList = std::vector<scoped_ptr<Strategy>>;
 
   explicit OverlayProcessor(OutputSurface* surface);
   virtual ~OverlayProcessor();
   // Virtual to allow testing different strategies.
   virtual void Initialize();
 
-  bool ProcessForCALayers(ResourceProvider* resource_provider,
-                          RenderPassList* render_passes,
-                          CALayerOverlayList* ca_layer_overlays,
-                          OverlayCandidateList* overlay_candidates);
+  gfx::Rect GetAndResetOverlayDamage();
 
   void ProcessForOverlays(ResourceProvider* resource_provider,
                           RenderPassList* render_passes,
-                          OverlayCandidateList* candidates,
+                          OverlayCandidateList* overlay_candidates,
+                          CALayerOverlayList* ca_layer_overlays,
                           gfx::Rect* damage_rect);
 
  protected:
   StrategyList strategies_;
   OutputSurface* surface_;
+  gfx::Rect overlay_damage_rect_;
 
  private:
+  bool ProcessForCALayers(ResourceProvider* resource_provider,
+                          RenderPassList* render_passes,
+                          OverlayCandidateList* overlay_candidates,
+                          CALayerOverlayList* ca_layer_overlays,
+                          gfx::Rect* damage_rect);
+
   DISALLOW_COPY_AND_ASSIGN(OverlayProcessor);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OVERLAY_PROCESSOR_H_