diff options
| author | erikchen <erikchen@chromium.org> | 2015-10-22 18:17:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 01:18:36 +0000 |
| commit | ac7e317e2f5044d2f9cc133afaf28e6ca2ed70af (patch) | |
| tree | 943b2fe67d2d9dca3b98a814dbf1e3110615c8ef /content/browser/renderer_host/media/video_capture_device_client.cc | |
| parent | c2574ed2dede52cbf0353a3aca99d96cf0794571 (diff) | |
| download | chromium_src-ac7e317e2f5044d2f9cc133afaf28e6ca2ed70af.zip chromium_src-ac7e317e2f5044d2f9cc133afaf28e6ca2ed70af.tar.gz chromium_src-ac7e317e2f5044d2f9cc133afaf28e6ca2ed70af.tar.bz2 | |
mac: Remove a use of SharedMemory::GetFileDescriptor() from media/.
The method VideoCaptureBufferPool::BufferHandle::AsPlatformFile() is only ever
used on POSIX platforms excluding Mac. Update all the preprocessor macros to
reflect this. Doing so allows the removal of a call to
SharedMemoryHandle::GetFileDescriptor(), which does not work with Mach-backed
SharedMemory on Mac.
BUG=535711
Review URL: https://codereview.chromium.org/1418023003
Cr-Commit-Position: refs/heads/master@{#355698}
Diffstat (limited to 'content/browser/renderer_host/media/video_capture_device_client.cc')
| -rw-r--r-- | content/browser/renderer_host/media/video_capture_device_client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/renderer_host/media/video_capture_device_client.cc b/content/browser/renderer_host/media/video_capture_device_client.cc index fe7c623..de12799 100644 --- a/content/browser/renderer_host/media/video_capture_device_client.cc +++ b/content/browser/renderer_host/media/video_capture_device_client.cc @@ -122,7 +122,7 @@ class AutoReleaseBuffer : public media::VideoCaptureDevice::Client::Buffer { ClientBuffer AsClientBuffer(int plane) override { return buffer_handle_->AsClientBuffer(plane); } -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS)) base::FileDescriptor AsPlatformFile() override { return buffer_handle_->AsPlatformFile(); } |