| Index: ppapi/proxy/video_source_resource.cc
|
| ===================================================================
|
| --- ppapi/proxy/video_source_resource.cc (revision 200710)
|
| +++ ppapi/proxy/video_source_resource.cc (working copy)
|
| @@ -109,15 +109,15 @@
|
|
|
| #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
|
|
|