Mac Overlays: Allow the primary plane to be optionally scheduled.

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>
 
@@ skipping 47 matching lines @@
 
  private:
   class PendingSwap;
   class OverlayPlane;
 
   ~ImageTransportSurfaceOverlayMac() override;
 
   gfx::SwapResult SwapBuffersInternal(const gfx::Rect& pixel_damage_rect);
 
   void UpdateRootAndPartialDamagePlanes(
-      const std::vector<linked_ptr<OverlayPlane>>& new_overlay_planes,
+      const linked_ptr<OverlayPlane>& new_root_plane,
       const gfx::RectF& dip_damage_rect);
   void UpdateOverlayPlanes(
       const std::vector<linked_ptr<OverlayPlane>>& new_overlay_planes);
   void UpdateCALayerTree();
 
   // 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
@@ skipping 22 matching lines @@
   base::scoped_nsobject<CALayer> ca_root_layer_;
 
   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_;
 
-  // Overlay planes that have been scheduled, but have not had a subsequent
-  // SwapBuffers call made yet.
+  // Planes that have been scheduled, but have not had a subsequent SwapBuffers
+  // call made yet.
+  linked_ptr<OverlayPlane> pending_root_plane_;
   std::vector<linked_ptr<OverlayPlane>> pending_overlay_planes_;
 
   // 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_;
   std::list<linked_ptr<OverlayPlane>> current_overlay_planes_;
 
   // 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_;
 
   base::Timer display_pending_swap_timer_;
   base::WeakPtrFactory<ImageTransportSurfaceOverlayMac> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_