Make cross-process CALayers work on Mac

content/common/gpu/image_transport_surface_fbo_mac.cc

 // Copyright (c) 2012 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 88 matching lines @@
   // to be updated if this event is changed or moved.
   TRACE_EVENT2("gpu", "ImageTransportSurfaceFBO::CreateFramebuffer",
                "width", new_rounded_size.width(),
                "height", new_rounded_size.height());
 
   rounded_size_ = new_rounded_size;
 
   // GL_TEXTURE_RECTANGLE_ARB is the best supported render target on
   // Mac OS X and is required for IOSurface interoperability.
   GLint previous_texture_id = 0;
   glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &previous_texture_id);

[piman, 2014/06/19 21:51:02]

Note: you can use  gfx::ScopedTextureBinder

[ccameron, 2014/06/19 23:56:41]

That indicates that it expects GLES 2.0 textures, while this isn't in the
supported list. I'll leave this as it was for now (except insofar as I'm fixing
the bug where we didn't even check for _BINDING_ before).

 
   // Free the old IO Surface first to reduce memory fragmentation.
   DestroyFramebuffer();
 
   glGenFramebuffersEXT(1, &fbo_id_);
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo_id_);
 
   glGenTextures(1, &texture_id_);
 
   glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture_id_);
@@ skipping 35 matching lines @@
     }
 
     // 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_);
+      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