Revert of Fix assorted issues with remote CoreAnimation

content/common/gpu/image_transport_surface_fbo_mac.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 CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_FBO_MAC_H_
 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_FBO_MAC_H_
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
@@ skipping 23 matching lines @@
     // Allocate the storage for the color buffer. The specified context is
     // current, and there is a texture bound to GL_TEXTURE_RECTANGLE_ARB.
     virtual bool AllocateColorBufferStorage(
         CGLContextObj context, GLuint texture,
         gfx::Size size, float scale_factor) = 0;
 
     // Free the storage allocated in the AllocateColorBufferStorage call. The
     // GL texture that was bound has already been deleted by the caller.
     virtual void FreeColorBufferStorage() = 0;
 
-    // Swap buffers and return the handle for the surface to send to the browser
-    // process to display.
-    virtual void SwapBuffers(const gfx::Size& size, float scale_factor) = 0;
+    // Retrieve the handle for the surface to send to the browser process to
+    // display.
+    virtual uint64 GetSurfaceHandle() const = 0;
 
-    // Indicate that the backbuffer will be written to.
-    virtual void WillWriteToBackbuffer() = 0;
+    // Called when a new frame has been rendered into the texture, and the
+    // browser is about to be sent the surface to display.
+    virtual void WillSwapBuffers() = 0;
 
-    // Indicate that the backbuffer has been discarded and should not be seen
-    // again.
-    virtual void DiscardBackbuffer() = 0;
-
-    // Called once for every SwapBuffers call when the IPC for the present has
-    // been processed by the browser.
-    virtual void SwapBuffersAckedByBrowser() = 0;
+    // Called once for every WillSwapBuffers call when the buffer that was sent
+    // to the browser may be released by the GPU process (this may be because
+    // the browser is holding a reference, in which case this will come
+    // quickly, or it may be because the browser is done with the surface, in
+    // which case it will come much later).
+    virtual void CanFreeSwappedBuffer() = 0;
   };
 
   ImageTransportSurfaceFBO(GpuChannelManager* manager,
                            GpuCommandBufferStub* stub,
                            gfx::PluginWindowHandle handle);
 
   // GLSurface implementation
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool DeferDraws() OVERRIDE;
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual bool SupportsPostSubBuffer() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual void* GetHandle() OVERRIDE;
   virtual void* GetDisplay() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
   virtual bool SetBackbufferAllocation(bool allocated) OVERRIDE;
   virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
 
   // Called when the context may continue to make forward progress after a swap.
-  void SendSwapBuffers(uint64 surface_handle,
-                       const gfx::Size pixel_size,
-                       float scale_factor);
+  void UnblockContextAfterPendingSwap();
 
  protected:
   // ImageTransportSurface implementation
   virtual void OnBufferPresented(
       const AcceleratedSurfaceMsg_BufferPresented_Params& params) OVERRIDE;
   virtual void OnResize(gfx::Size size, float scale_factor) OVERRIDE;
   virtual void SetLatencyInfo(
       const std::vector<ui::LatencyInfo>&) OVERRIDE;
   virtual void WakeUpGpu() OVERRIDE;
 
@@ skipping 21 matching lines @@
   // Weak pointer to the context that this was last made current to.
   gfx::GLContext* context_;
 
   gfx::Size size_;
   gfx::Size rounded_size_;
   float scale_factor_;
 
   // Whether or not we've successfully made the surface current once.
   bool made_current_;
 
-  // Whether a SwapBuffers IPC needs to be sent to the browser.
-  bool is_swap_buffers_send_pending_;
+  // Whether a SwapBuffers is pending.
+  bool is_swap_buffers_pending_;
+
+  // Whether we unscheduled command buffer because of pending SwapBuffers.
+  bool did_unschedule_;
+
   std::vector<ui::LatencyInfo> latency_info_;
 
   scoped_ptr<ImageTransportHelper> helper_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageTransportSurfaceFBO);
 };
 
 }  // namespace content
 
 #endif  //  CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_MAC_H_