diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 07:31:44 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 07:31:44 +0000 |
| commit | 1dfb8befd5916a9bc6c6d6b16e897172930b9a8b (patch) | |
| tree | 9acc010228a8c6a2c37a28fd797214b88991eaa6 /ppapi/proxy/video_source_resource.cc | |
| parent | f3b55cea740c629621d9258400cc7d2d5a1a7eb1 (diff) | |
| download | chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.zip chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.tar.gz chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.tar.bz2 | |
Switch Linux Aura ports over to POSIX SHM instead of legacy SYSV SHM.
BUG=147622
R=jln@chromium.org, piman@chromium.org, skaslev@chromium.org
Review URL: https://codereview.chromium.org/13529027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/video_source_resource.cc')
| -rw-r--r-- | ppapi/proxy/video_source_resource.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/proxy/video_source_resource.cc b/ppapi/proxy/video_source_resource.cc index 5e1dbc7..3bce63d 100644 --- a/ppapi/proxy/video_source_resource.cc +++ b/ppapi/proxy/video_source_resource.cc @@ -109,15 +109,15 @@ void VideoSourceResource::OnPluginMsgGetFrameComplete( #if defined(OS_ANDROID) frame->image_data = 0; -#elif defined(OS_WIN) || defined(OS_MACOSX) +#elif defined(TOOLKIT_GTK) + frame->image_data = + (new ImageData(image_data, image_desc, fd))->GetReference(); +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) base::SharedMemoryHandle handle; if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &handle)) frame->image_data = 0; frame->image_data = (new ImageData(image_data, image_desc, handle))->GetReference(); -#elif defined(OS_LINUX) - frame->image_data = - (new ImageData(image_data, image_desc, fd))->GetReference(); #else #error Not implemented. #endif |