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;
 
-    // Retrieve the handle for the surface to send to the browser process to
-    // display.
-    virtual uint64 GetSurfaceHandle() const = 0;
+    // Indicate that the backbuffer has been discarded and should not be seen
+    // again.
+    virtual void DiscardBackbuffer() = 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;
+    // Swap buffers and return the handle for the surface to send to the browser
+    // process to display.
+    virtual uint64 SwapBuffersAndGetSurfaceHandle() = 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,
@@ skipping 68 matching lines @@
   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_