Make cross-process CALayers work on Mac

content/common/gpu/image_transport_surface_fbo_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_fbo_mac.h"
 
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/image_transport_surface_iosurface_mac.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_context.h"
@@ skipping 117 matching lines @@
 
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
   params.surface_handle = storage_provider_->GetSurfaceHandle();
   params.size = GetSize();
   params.scale_factor = scale_factor_;
   params.latency_info.swap(latency_info_);
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
   DCHECK(!is_swap_buffers_pending_);
   is_swap_buffers_pending_ = true;
+
+  storage_provider_->WillSwapBuffers();
   return true;
 }
 
 bool ImageTransportSurfaceFBO::PostSubBuffer(
     int x, int y, int width, int height) {
   DCHECK(backbuffer_suggested_allocation_);
   if (!frontbuffer_suggested_allocation_)
     return true;
   glFlush();
 
   GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
   params.surface_handle = storage_provider_->GetSurfaceHandle();
   params.x = x;
   params.y = y;
   params.width = width;
   params.height = height;
   params.surface_size = GetSize();
   params.surface_scale_factor = scale_factor_;
   params.latency_info.swap(latency_info_);
   helper_->SendAcceleratedSurfacePostSubBuffer(params);
 
   DCHECK(!is_swap_buffers_pending_);
   is_swap_buffers_pending_ = true;
+
+  storage_provider_->WillSwapBuffers();
   return true;
 }
 
 bool ImageTransportSurfaceFBO::SupportsPostSubBuffer() {
   return true;
 }
 
 gfx::Size ImageTransportSurfaceFBO::GetSize() {
   return size_;
 }
@@ skipping 143 matching lines @@
                                   depth_stencil_renderbuffer_id_);
     }
 
     // If we asked for stencil but the extension isn't present,
     // it's OK to silently fail; subsequent code will/must check
     // for the presence of a stencil buffer before attempting to
     // do stencil-based operations.
   }
 
   bool allocated_color_buffer = storage_provider_->AllocateColorBufferStorage(
-      static_cast<CGLContextObj>(context_->GetHandle()),
-      rounded_size_);
+      static_cast<CGLContextObj>(context_->GetHandle()), texture_id_,
+      rounded_size_, scale_factor_);
   if (!allocated_color_buffer) {
     DLOG(ERROR) << "Failed to allocate color buffer storage.";
     DestroyFramebuffer();
     return;
   }
 
   GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
   if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
     DLOG(ERROR) << "Framebuffer was incomplete: " << status;
     DestroyFramebuffer();
     return;
   }
 
   has_complete_framebuffer_ = true;
 
   glBindTexture(GL_TEXTURE_RECTANGLE_ARB, previous_texture_id);
   // The FBO remains bound for this GL context.
 }
 
 }  // namespace content