Mac Overlays: Add sandwich strategy

cc/output/output_surface.h

 // Copyright 2012 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_OUTPUT_SURFACE_H_
 #define CC_OUTPUT_OUTPUT_SURFACE_H_
 
 #include <deque>
 
 #include "base/basictypes.h"
@@ skipping 102 matching lines @@
   // Called by the compositor on the compositor thread. This is a place where
   // thread-specific data for the output surface can be initialized, since from
   // this point on the output surface will only be used on the compositor
   // thread.
   virtual bool BindToClient(OutputSurfaceClient* client);
 
   virtual void EnsureBackbuffer();
   virtual void DiscardBackbuffer();
 
   virtual void Reshape(const gfx::Size& size, float scale_factor);
-  virtual gfx::Size SurfaceSize() const;
+  gfx::Size SurfaceSize() const { return surface_size_; }

[alexst (slow to review), 2015/08/25 18:49:38]

surface_size(), hacker style since it's simple, although I imagine it will
trickle to other places.

[ccameron, 2015/08/26 21:36:13]

I agree -- mind if I do this in a separate CL (cause this guy is going to need a
merge to M46)?

[alexst (slow to review), 2015/08/26 21:54:18]

No problem, probably better in a separate CL anyway to reduce noise.

+  float device_scale_factor() const { return device_scale_factor_; }
 
   // If supported, this causes a ReclaimResources for all resources that are
   // currently in use.
   virtual void ForceReclaimResources() {}
 
   virtual void BindFramebuffer();
 
   // The implementation may destroy or steal the contents of the CompositorFrame
   // passed in (though it will not take ownership of the CompositorFrame
   // itself). For successful swaps, the implementation must call
   // OutputSurfaceClient::DidSwapBuffers() and eventually
   // DidSwapBuffersComplete().
   virtual void SwapBuffers(CompositorFrame* frame) = 0;
   virtual void OnSwapBuffersComplete();
 
   // Notifies frame-rate smoothness preference. If true, all non-critical
   // processing should be stopped, or lowered in priority.
   virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) {}
 
   bool HasClient() { return !!client_; }
 
   // Get the class capable of informing cc of hardware overlay capability.
   virtual OverlayCandidateValidator* GetOverlayCandidateValidator() const;
 
+  // Get the texture for the main image's overlay.
+  virtual unsigned GetOverlayTextureId() const;
+
   void DidLoseOutputSurface();
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
 
   // Support for a pull-model where draws are requested by the output surface.
   //
   // OutputSurface::Invalidate is called by the compositor to notify that
   // there's new content.
   virtual void Invalidate() {}
 
   // Updates the worker context provider's visibility, freeing GPU resources if
@@ skipping 33 matching lines @@
   bool external_stencil_test_enabled_;
 
   base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OUTPUT_SURFACE_H_