content: Pass IOSurface references using Mach IPC.

content/test/content_test_suite.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/test/content_test_suite.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 #include <map>
 #endif
 
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "gpu/config/gpu_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/win/dpi.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #if !defined(OS_IOS)
+#include "base/mac/scoped_mach_port.h"
+#include "base/memory/linked_ptr.h"
 #include "base/test/mock_chrome_application_mac.h"
+#include "content/common/mac/io_surface_manager.h"
 #endif
 #endif
 
 #if !defined(OS_IOS)
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "media/base/media.h"
 #include "ui/gl/gl_surface.h"
 #endif
 
@@ skipping 48 matching lines @@
     return ANativeWindow_fromSurface(
         env, surfaces_[surface_texture_id]->j_surface().obj());
   }
 
  private:
   typedef std::map<int, linked_ptr<gfx::ScopedJavaSurface>> SurfaceMap;
   SurfaceMap surfaces_;
 };
 #endif
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+class IOSurfaceManagerImpl : public IOSurfaceManager {

[Avi (use Gerrit), 2015/05/09 18:00:28]

Is this a simplified test implementation? Can you stick the name "test" in there
somewhere? I don't like having two different IOSurfaceManagerImpl classes.

[reveman, 2015/05/09 19:24:23]

Sure, let me just land a patch that changes SurfaceTextureManagerImpl above
first so things are consistent.

[reveman, 2015/05/10 18:45:08]

Done.

+ public:
+  // Overridden from IOSurfaceManager:
+  bool RegisterIOSurface(int io_surface_id,
+                         int client_id,
+                         IOSurfaceRef io_surface) override {
+    mach_ports_[io_surface_id] =
+        make_linked_ptr(new base::mac::ScopedMachSendRight(
+            IOSurfaceCreateMachPort(io_surface)));
+    return true;
+  }
+  void UnregisterIOSurface(int io_surface_id, int client_id) override {
+    mach_ports_.erase(io_surface_id);
+  }
+  IOSurfaceRef AcquireIOSurface(int io_surface_id) override {
+    return IOSurfaceLookupFromMachPort(mach_ports_[io_surface_id]->get());
+  }
+
+ private:
+  typedef std::map<int, linked_ptr<base::mac::ScopedMachSendRight>>
+      MachSendRightMap;
+  MachSendRightMap mach_ports_;
+};
+#endif
+
 }  // namespace
 
 ContentTestSuite::ContentTestSuite(int argc, char** argv)
     : ContentTestSuiteBase(argc, argv) {
 }
 
 ContentTestSuite::~ContentTestSuite() {
 }
 
 void ContentTestSuite::Initialize() {
@@ skipping 23 matching lines @@
     gfx::GLSurface::InitializeOneOffForTests();
     gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess());
   }
 #endif
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 #if defined(OS_ANDROID)
   SurfaceTextureManager::InitInstance(new SurfaceTextureManagerImpl);
 #endif
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  IOSurfaceManager::InitInstance(new IOSurfaceManagerImpl);

[Avi (use Gerrit), 2015/05/09 18:00:28]

We're also calling InitInstance at the end of ContentMainRunnerImpl::Initialize.
What is the relationship here? This gets called after?

[reveman, 2015/05/09 19:24:23]

Pretty sure ContentMainRunnerImpl::Initialize is not called in the case where
this is used as that would cause the DCHECK in InitInstance to fail.

[Avi (use Gerrit), 2015/05/09 20:41:02]

That makes sense.

+#endif
 }
 
 }  // namespace content