Fix assorted issues with remote CoreAnimation

content/common/gpu/image_transport_surface_fbo_mac.h

Index: content/common/gpu/image_transport_surface_fbo_mac.h
diff --git a/content/common/gpu/image_transport_surface_fbo_mac.h b/content/common/gpu/image_transport_surface_fbo_mac.h
index 42f6683498c48317c6cd8fbf16ad23cb8aafb33b..b9804186d0703c590acfb692e4608adeeb94a47a 100644
--- a/content/common/gpu/image_transport_surface_fbo_mac.h
+++ b/content/common/gpu/image_transport_surface_fbo_mac.h
@@ -41,13 +41,13 @@ class ImageTransportSurfaceFBO
     // 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