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

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

Issue 1163943004: Make SharedMemoryHandle a class on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shared_memory_make_class3_base
Patch Set: Fix logic error. Created 5 years, 6 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 eeeafc6ce986d7f85984a8c6f669f1fcc580772c..4961cc9d485adeb44c394d81cdf782b4ca2de171 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -72,7 +72,9 @@ class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle {
}
ClientBuffer AsClientBuffer() override { return nullptr; }
base::PlatformFile AsPlatformFile() override {
-#if defined(OS_POSIX)
+#if defined(OS_MACOSX)
mcasas 2015/06/17 21:33:11 OS_MACOSX implies OS_POSIX, right? [1] [1] https:
erikchen 2015/06/18 17:58:33 I don't understand your question. Yes, OS_MACOSX i
+ return handle_.GetFileDescriptor()->fd;
+#elif defined(OS_POSIX)
return handle_.fd;
#elif defined(OS_WIN)
return handle_;
@@ -110,7 +112,9 @@ class GpuMemoryBufferBufferHandle
ClientBuffer AsClientBuffer() override { return gmb_->AsClientBuffer(); }
base::PlatformFile AsPlatformFile() override {
DCHECK_EQ(gmb_->GetHandle().type, gfx::SHARED_MEMORY_BUFFER);
-#if defined(OS_POSIX)
+#if defined(OS_MACOSX)
+ return gmb_->GetHandle().handle.GetFileDescriptor()->fd;
+#elif defined(OS_POSIX)
return gmb_->GetHandle().handle.fd;
#elif defined(OS_WIN)
return gmb_->GetHandle().handle;

Powered by Google App Engine
This is Rietveld 408576698