Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: ppapi/proxy/ppapi_proxy_test.cc

Issue 1154613006: Update pepper to not assume that SharedMemoryHandle is an int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove changes to base/memory. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/ppapi_proxy_test.cc
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 64b00e26c6947bc4208b3cf58c075bc0e8aa61a7..8efbec1ecbf7dac9059a741341f44c929053f92b 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -256,6 +256,21 @@ PluginProxyTestHarness::PluginDelegateMock::ShareHandleWithRemote(
should_close_source);
}
+base::SharedMemoryHandle
+PluginProxyTestHarness::PluginDelegateMock::ShareSharedMemoryHandleWithRemote(
+ const base::SharedMemoryHandle& handle,
+ base::ProcessId remote_pid) {
+#if defined(OS_POSIX)
+ return ShareHandleWithRemote(handle.fd, remote_pid, false);
+#elif defined(OS_WIN)
+ return ShareHandleWithRemote(
+ reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle)), remote_pid,
piman 2015/06/01 22:16:08 ditto, no need for casts.
erikchen 2015/06/01 23:48:53 Done.
+ false);
+#else
+#error Not implemented.
+#endif
+}
+
std::set<PP_Instance>*
PluginProxyTestHarness::PluginDelegateMock::GetGloballySeenInstanceIDSet() {
return &instance_id_set_;
@@ -489,6 +504,20 @@ HostProxyTestHarness::DelegateMock::ShareHandleWithRemote(
should_close_source);
}
+base::SharedMemoryHandle
+HostProxyTestHarness::DelegateMock::ShareSharedMemoryHandleWithRemote(
+ const base::SharedMemoryHandle& handle,
+ base::ProcessId remote_pid) {
+#if defined(OS_POSIX)
+ return ShareHandleWithRemote(handle.fd, remote_pid, false);
+#elif defined(OS_WIN)
+ return ShareHandleWithRemote(
+ reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle)), remote_pid,
piman 2015/06/01 22:16:08 ditto
erikchen 2015/06/01 23:48:53 Done.
+ false);
+#else
+#error Not implemented.
+#endif
+}
// HostProxyTest ---------------------------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698