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

Unified Diff: content/renderer/pepper/pepper_video_capture_host.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: Another nits pass. 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: content/renderer/pepper/pepper_video_capture_host.cc
diff --git a/content/renderer/pepper/pepper_video_capture_host.cc b/content/renderer/pepper/pepper_video_capture_host.cc
index 820dd12b67ca0b722b1bae03f032d0ce8fad5982..116837944fc0df4c172df82866a58165a01a6e50 100644
--- a/content/renderer/pepper/pepper_video_capture_host.cc
+++ b/content/renderer/pepper/pepper_video_capture_host.cc
@@ -220,21 +220,11 @@ void PepperVideoCaptureHost::AllocBuffers(const gfx::Size& resolution,
{
EnterResourceNoLock<PPB_Buffer_API> enter(res, true);
DCHECK(enter.succeeded());
- int handle;
- int32_t result = enter.object()->GetSharedMemory(&handle);
+ base::SharedMemory* shm;
+ int32_t result = enter.object()->GetSharedMemory(&shm);
DCHECK(result == PP_OK);
- // TODO(piman/brettw): Change trusted interface to return a PP_FileHandle,
- // those casts are ugly.
- base::PlatformFile platform_file =
-#if defined(OS_WIN)
- reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle));
-#elif defined(OS_POSIX)
- handle;
-#else
-#error Not implemented.
-#endif
params.AppendHandle(ppapi::proxy::SerializedHandle(
- dispatcher->ShareHandleWithRemote(platform_file, false), size));
+ dispatcher->ShareSharedMemoryHandleWithRemote(shm->handle()), size));
}
}

Powered by Google App Engine
This is Rietveld 408576698