Replace IOSurfaceManager by directly passing IOSurface Mach ports over Chrome IPC.

content/browser/gpu/gpu_process_host_ui_shim.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/browser/gpu/gpu_process_host_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "content/browser/compositor/gpu_process_transport_factory.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_helper.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_MACOSX)
-#include "content/browser/browser_io_surface_manager_mac.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/gpu_platform_support_host.h"
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace content {
 
@@ skipping 199 matching lines @@
   // no longer attached to, do not pass the frame along to the widget. Just ack
   // it to the GPU process immediately, so we can proceed to the next frame.
   bool should_not_show_frame =
       content::ImageTransportFactory::GetInstance()
           ->SurfaceShouldNotShowFramesAfterSuspendForRecycle(params.surface_id);
   if (!should_not_show_frame) {
     gfx::AcceleratedWidget native_widget =
         content::GpuSurfaceTracker::Get()->AcquireNativeWidget(
             params.surface_id);
     base::ScopedCFTypeRef<IOSurfaceRef> io_surface;
-    CAContextID ca_context_id = 0;
+    CAContextID ca_context_id = params.ca_context_id;
 
-    switch (ui::GetSurfaceHandleType(params.surface_handle)) {
-      case ui::kSurfaceHandleTypeIOSurface: {
-        IOSurfaceID io_surface_id =
-            ui::IOSurfaceIDFromSurfaceHandle(params.surface_handle);
-        io_surface.reset(
-            BrowserIOSurfaceManager::GetInstance()->AcquireIOSurface(
-                gfx::GenericSharedMemoryId(io_surface_id)));
-        break;
-      }
-      case ui::kSurfaceHandleTypeCAContext: {
-        ca_context_id = ui::CAContextIDFromSurfaceHandle(params.surface_handle);
-        break;
-      }
-      default:
-        DLOG(ERROR) << "Unrecognized accelerated frame type.";
-        return;
+    DCHECK((params.ca_context_id == 0) ^
+           (params.io_surface.get() == MACH_PORT_NULL));
+    if (params.io_surface.get()) {
+      io_surface.reset(IOSurfaceLookupFromMachPort(params.io_surface));
     }
 
     ui::AcceleratedWidgetMacGotFrame(native_widget, ca_context_id, io_surface,
                                      params.size, params.scale_factor,
                                      &ack_params.vsync_timebase,
                                      &ack_params.vsync_interval);
   }
 
   content::ImageTransportFactory::GetInstance()->OnGpuSwapBuffersCompleted(
       params.surface_id, params.latency_info, gfx::SwapResult::SWAP_ACK);
@@ skipping 18 matching lines @@
 
 void GpuProcessHostUIShim::OnRemoveSubscription(int32_t process_id,
                                                 unsigned int target) {
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   if (rph) {
     rph->OnRemoveSubscription(target);
   }
 }
 
 }  // namespace content