Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/platform_handle/platform_handle_functions.h" | 5 #include "mojo/platform_handle/platform_handle_functions.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" | 9 #include "mojo/edk/embedder/embedder.h" |
| 10 | 10 |
| 11 extern "C" { | 11 extern "C" { |
| 12 | 12 |
| 13 MojoResult MojoCreatePlatformHandleWrapper(MojoPlatformHandle platform_handle, | 13 MojoResult MojoCreatePlatformHandleWrapper(MojoPlatformHandle platform_handle, |
| 14 MojoHandle* wrapper) { | 14 MojoHandle* wrapper) { |
| 15 mojo::embedder::PlatformHandle platform_handle_wrapper(platform_handle); | 15 mojo::edk::PlatformHandle platform_handle_wrapper(platform_handle); |
| 16 mojo::embedder::ScopedPlatformHandle scoped_platform_handle( | 16 mojo::edk::ScopedPlatformHandle scoped_platform_handle( |
| 17 platform_handle_wrapper); | 17 platform_handle_wrapper); |
| 18 return mojo::embedder::CreatePlatformHandleWrapper( | 18 return mojo::edk::CreatePlatformHandleWrapper( |
| 19 std::move(scoped_platform_handle), wrapper); | 19 std::move(scoped_platform_handle), wrapper); |
| 20 } | 20 } |
| 21 | 21 |
| 22 MojoResult MojoExtractPlatformHandle(MojoHandle wrapper, | 22 MojoResult MojoExtractPlatformHandle(MojoHandle wrapper, |
| 23 MojoPlatformHandle* platform_handle) { | 23 MojoPlatformHandle* platform_handle) { |
| 24 mojo::embedder::ScopedPlatformHandle scoped_platform_handle; | 24 mojo::edk::ScopedPlatformHandle scoped_platform_handle; |
| 25 MojoResult result = mojo::embedder::PassWrappedPlatformHandle( | 25 MojoResult result = |
| 26 wrapper, &scoped_platform_handle); | 26 mojo::edk::PassWrappedPlatformHandle(wrapper, &scoped_platform_handle); |
| 27 if (result != MOJO_RESULT_OK) | 27 if (result != MOJO_RESULT_OK) |
| 28 return result; | 28 return result; |
| 29 | 29 |
| 30 DCHECK(scoped_platform_handle.is_valid()); | 30 DCHECK(scoped_platform_handle.is_valid()); |
| 31 #if defined(OS_POSIX) | 31 #if defined(OS_POSIX) || defined(OS_WIN) |
|
jam
2016/02/08 17:32:12
remove this whole ifdef?
Ken Rockot(use gerrit already)
2016/02/08 17:51:18
Done
| |
| 32 *platform_handle = scoped_platform_handle.release().fd; | |
| 33 #elif defined(OS_WIN) | |
| 34 *platform_handle = scoped_platform_handle.release().handle; | 32 *platform_handle = scoped_platform_handle.release().handle; |
| 35 #else | 33 #else |
| 36 #error "Platform not yet supported." | 34 #error "Platform not yet supported." |
| 37 #endif | 35 #endif |
| 38 return MOJO_RESULT_OK; | 36 return MOJO_RESULT_OK; |
| 39 } | 37 } |
| 40 | 38 |
| 41 } // extern "C" | 39 } // extern "C" |
| OLD | NEW |