Fix assorted issues with remote CoreAnimation

content/common/gpu/image_transport_surface_iosurface_mac.cc

 // 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.
 
 #include "content/common/gpu/image_transport_surface_iosurface_mac.h"
 
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/surface_handle_types_mac.h"
 
 namespace content {
@@ skipping 87 matching lines @@
 
   glFlush();
   return true;
 }
 
 void IOSurfaceStorageProvider::FreeColorBufferStorage() {
   io_surface_.reset();
   io_surface_id_ = 0;
 }
 
-uint64 IOSurfaceStorageProvider::GetSurfaceHandle() const {
-  return SurfaceHandleFromIOSurfaceID(io_surface_id_);
+void IOSurfaceStorageProvider::DiscardBackbuffer() {
 }
 
-void IOSurfaceStorageProvider::WillSwapBuffers() {
+uint64 IOSurfaceStorageProvider::SwapBuffersAndGetSurfaceHandle() {
   // The browser compositor will throttle itself, so we are free to unblock the
   // context immediately. Make sure that the browser is doing its throttling
   // appropriately by ensuring that the previous swap was acknowledged before
   // we get another swap.
   DCHECK(pending_swapped_surfaces_.empty());
   pending_swapped_surfaces_.push_back(io_surface_);
   transport_surface_->UnblockContextAfterPendingSwap();
+
+  return SurfaceHandleFromIOSurfaceID(io_surface_id_);
 }
 
 void IOSurfaceStorageProvider::CanFreeSwappedBuffer() {
   DCHECK(!pending_swapped_surfaces_.empty());
   pending_swapped_surfaces_.pop_front();
 }
 
 }  //  namespace content