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 /media | |
| 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 'media')
| -rw-r--r-- | media/capture/video/fake_video_capture_device_unittest.cc | 2 | ||||
| -rw-r--r-- | media/capture/video/video_capture_device.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc index 22e73ae..05ac492 100644 --- a/media/capture/video/fake_video_capture_device_unittest.cc +++ b/media/capture/video/fake_video_capture_device_unittest.cc @@ -40,7 +40,7 @@ class MockBuffer : public VideoCaptureDevice::Client::Buffer { size_t mapped_size() const override { return mapped_size_; } void* data(int plane) override { return data_; } ClientBuffer AsClientBuffer(int plane) override { return nullptr; } -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS)) base::FileDescriptor AsPlatformFile() override { return base::FileDescriptor(); } diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h index b66409b..ad0927d 100644 --- a/media/capture/video/video_capture_device.h +++ b/media/capture/video/video_capture_device.h @@ -186,7 +186,7 @@ class MEDIA_EXPORT VideoCaptureDevice { virtual void* data(int plane) = 0; void* data() { return data(0); } virtual ClientBuffer AsClientBuffer(int plane) = 0; -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS)) virtual base::FileDescriptor AsPlatformFile() = 0; #endif }; |