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

Unified Diff: content/browser/renderer_host/media/video_capture_buffer_pool.cc

Issue 1815563004: Remove iOS ifdefs in src/content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 9 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/browser/renderer_host/media/video_capture_buffer_pool.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.cc b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
index a934a40cf81e6d950c3942861d5e849b37148c42..cd3e0be624008bd500265ee6d8a6e73f584f0577 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -24,7 +24,7 @@ class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle {
base::SharedMemoryHandle handle)
: data_(data),
mapped_size_(mapped_size)
-#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS))
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
,
handle_(handle)
#endif
@@ -45,7 +45,7 @@ class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle {
NOTREACHED();
return nullptr;
}
-#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS))
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
base::FileDescriptor AsPlatformFile() override {
return handle_;
}
@@ -54,7 +54,7 @@ class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle {
private:
void* const data_;
const size_t mapped_size_;
-#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS))
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
const base::SharedMemoryHandle handle_;
#endif
};
@@ -85,7 +85,7 @@ class GpuMemoryBufferBufferHandle final
DCHECK_LT(plane, static_cast<int>(gmbs_->size()));
return (*gmbs_)[plane]->AsClientBuffer();
}
-#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS))
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
base::FileDescriptor AsPlatformFile() override {
NOTREACHED();
return base::FileDescriptor();

Powered by Google App Engine
This is Rietveld 408576698