[mojo-edk] Expose portable API for platform handle wrapping

components/mus/gles2/command_buffer_local.cc

 // Copyright 2015 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 "components/mus/gles2/command_buffer_local.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/mus/gles2/command_buffer_driver.h"
 #include "components/mus/gles2/command_buffer_local_client.h"
 #include "components/mus/gles2/command_buffer_type_conversions.h"
 #include "components/mus/gles2/gpu_memory_tracker.h"
 #include "components/mus/gles2/gpu_state.h"
 #include "components/mus/gles2/mojo_buffer_backing.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer.h"
 #include "gpu/command_buffer/client/gpu_control_client.h"
 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
-#include "mojo/platform_handle/platform_handle_functions.h"
+#include "mojo/public/cpp/system/platform_handle.h"
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image_shared_memory.h"
 #include "ui/gl/gl_surface.h"
 
 namespace mus {
 
 namespace {
 
@@ skipping 202 matching lines @@
       mus::MojoGpuMemoryBufferImpl::FromClientBuffer(buffer);
 
   bool requires_sync_point = false;
 
   if (gpu_memory_buffer->GetBufferType() == gfx::SHARED_MEMORY_BUFFER) {
     gfx::GpuMemoryBufferHandle handle = gpu_memory_buffer->GetHandle();
     // TODO(rjkroege): Verify that this is required and update appropriately.
     base::SharedMemoryHandle dupd_handle =
         base::SharedMemory::DuplicateHandle(handle.handle);
 #if defined(OS_WIN)
-    HANDLE platform_handle = dupd_handle.GetHandle();
+    HANDLE platform_file = dupd_handle.GetHandle();
 #else
-    int platform_handle = dupd_handle.fd;
+    int platform_file = dupd_handle.fd;
 #endif
 
-    MojoHandle mojo_handle = MOJO_HANDLE_INVALID;
-    MojoResult create_result =
-        MojoCreatePlatformHandleWrapper(platform_handle, &mojo_handle);
-    // |MojoCreatePlatformHandleWrapper()| always takes the ownership of the
-    // |platform_handle|, so we don't need to close |platform_handle|.
-    if (create_result != MOJO_RESULT_OK) {
-      NOTIMPLEMENTED();
-      return -1;
-    }
-    mojo::ScopedHandle scoped_handle;
-    scoped_handle.reset(mojo::Handle(mojo_handle));
-
+    mojo::ScopedHandle scoped_handle = mojo::WrapPlatformFile(platform_file);
     const int32_t format = static_cast<int32_t>(gpu_memory_buffer->GetFormat());
     gpu_state_->command_buffer_task_runner()->PostTask(
         driver_.get(),
         base::Bind(&CommandBufferLocal::CreateImageOnGpuThread,
                    base::Unretained(this), new_id, base::Passed(&scoped_handle),
                    handle.type, base::Passed(&size), format, internal_format));
 #if defined(USE_OZONE)
   } else if (gpu_memory_buffer->GetBufferType() == gfx::OZONE_NATIVE_PIXMAP) {
     gpu_state_->command_buffer_task_runner()->PostTask(
         driver_.get(),
@@ skipping 300 matching lines @@
     client_->UpdateVSyncParameters(timebase, interval);
 }
 
 void CommandBufferLocal::OnGpuCompletedSwapBuffersOnClientThread(
     gfx::SwapResult result) {
   if (client_)
     client_->GpuCompletedSwapBuffers(result);
 }
 
 }  // namespace mus