Revert of Fix assorted issues with remote CoreAnimation

content/common/gpu/image_transport_surface_iosurface_mac.cc

Index: content/common/gpu/image_transport_surface_iosurface_mac.cc
diff --git a/content/common/gpu/image_transport_surface_iosurface_mac.cc b/content/common/gpu/image_transport_surface_iosurface_mac.cc
index 6ef1fc6e80221f0ea235426b10beb1935da9f728..cbae4a2612535fddbfa8dfaef2f01a5a1254b5e1 100644
--- a/content/common/gpu/image_transport_surface_iosurface_mac.cc
+++ b/content/common/gpu/image_transport_surface_iosurface_mac.cc
@@ -105,26 +105,21 @@
   io_surface_id_ = 0;
 }
 
-void IOSurfaceStorageProvider::SwapBuffers(
-    const gfx::Size& size, float scale_factor) {
+uint64 IOSurfaceStorageProvider::GetSurfaceHandle() const {
+  return SurfaceHandleFromIOSurfaceID(io_surface_id_);
+}
+
+void IOSurfaceStorageProvider::WillSwapBuffers() {
   // 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_->SendSwapBuffers(
-      SurfaceHandleFromIOSurfaceID(io_surface_id_), size, scale_factor);
+  transport_surface_->UnblockContextAfterPendingSwap();
 }
 
-void IOSurfaceStorageProvider::WillWriteToBackbuffer() {
-}
-
-void IOSurfaceStorageProvider::DiscardBackbuffer() {
-}
-
-void IOSurfaceStorageProvider::SwapBuffersAckedByBrowser() {
+void IOSurfaceStorageProvider::CanFreeSwappedBuffer() {
   DCHECK(!pending_swapped_surfaces_.empty());
   pending_swapped_surfaces_.pop_front();
 }