Mac overlays: Isolate partial swap support

content/common/gpu/image_transport_surface_overlay_mac.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_
 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_
 
 #include <list>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/timer/timer.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/image_transport_surface.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gpu_switching_observer.h"
 
 @class CAContext;
 @class CALayer;
 
 namespace content {
 
 class CALayerTree;
+class CALayerPartialDamageTree;
 
 class ImageTransportSurfaceOverlayMac : public gfx::GLSurface,
                                         public ImageTransportSurface,
                                         public ui::GpuSwitchingObserver {
  public:
   ImageTransportSurfaceOverlayMac(GpuChannelManager* manager,
                                   GpuCommandBufferStub* stub,
                                   gfx::PluginWindowHandle handle);
 
   // GLSurface implementation
@@ skipping 36 matching lines @@
   void OnGpuSwitched() override;
 
  private:
   class PendingSwap;
   class OverlayPlane;
 
   ~ImageTransportSurfaceOverlayMac() override;
 
   gfx::SwapResult SwapBuffersInternal(const gfx::Rect& pixel_damage_rect);
 
-  void UpdateRootAndPartialDamagePlanes(
-      const linked_ptr<OverlayPlane>& new_root_plane,
-      const gfx::RectF& pixel_damage_rect);
-  void UpdateRootAndPartialDamageCALayers(float scale_factor);
-  void UpdateCALayerTree(scoped_ptr<CALayerTree> ca_layer_tree,
-                         float scale_factor);
-
   // Returns true if the front of |pending_swaps_| has completed, or has timed
   // out by |now|.
   bool IsFirstPendingSwapReadyToDisplay(
     const base::TimeTicks& now);
   // Sets the CALayer contents to the IOSurface for the front of
   // |pending_swaps_|, and removes it from the queue.
   void DisplayFirstPendingSwapImmediately();
   // Force that all of |pending_swaps_| displayed immediately, and the list be
   // cleared.
   void DisplayAndClearAllPendingSwaps();
@@ skipping 20 matching lines @@
   gfx::Size pixel_size_;
   float scale_factor_;
   std::vector<ui::LatencyInfo> latency_info_;
 
   // The renderer ID that all contexts made current to this surface should be
   // targeting.
   GLint gl_renderer_id_;
 
   // Planes that have been scheduled, but have not had a subsequent SwapBuffers
   // call made yet.
-  linked_ptr<OverlayPlane> pending_root_plane_;
+  scoped_ptr<CALayerPartialDamageTree> pending_partial_damage_tree_;
   scoped_ptr<CALayerTree> pending_ca_layer_tree_;
 
   // A queue of all frames that have been created by SwapBuffersInternal but
   // have not yet been displayed. This queue is checked at the beginning of
   // every swap and also by a callback.
   std::deque<linked_ptr<PendingSwap>> pending_swaps_;
 
   // The planes that are currently being displayed on the screen.
-  linked_ptr<OverlayPlane> current_root_plane_;
-  std::list<linked_ptr<OverlayPlane>> current_partial_damage_planes_;
+  scoped_ptr<CALayerPartialDamageTree> current_partial_damage_tree_;
   scoped_ptr<CALayerTree> current_ca_layer_tree_;
 
   // The time of the last swap was issued. If this is more than two vsyncs, then
   // use the simpler non-smooth animation path.
   base::TimeTicks last_swap_time_;
 
   // The vsync information provided by the browser.
   bool vsync_parameters_valid_;
   base::TimeTicks vsync_timebase_;
   base::TimeDelta vsync_interval_;
 
-  // Calls to ScheduleCALayer come in back-to-front. This is reset to 1 at each
-  // swap and increments with each call to ScheduleCALayer.
-  int next_ca_layer_z_order_;
-
   base::Timer display_pending_swap_timer_;
   base::WeakPtrFactory<ImageTransportSurfaceOverlayMac> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_