content/browser/renderer_host/media/video_capture_buffer_pool.cc - Issue 1197853004: Revert of Revert of Make SharedMemoryHandle a class on Mac.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1197853004: Revert of Revert of Make SharedMemoryHandle a class on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shared_memory_make_class3_base

Patch Set: 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 70195ba669ac859e202cb70fe184642023eef927..23a63730fd9498c306e1296b1299e132f2ad26b0 100644

--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc

+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc

@@ -70,7 +70,11 @@

ClientBuffer AsClientBuffer() override { return nullptr; }

#if defined(OS_POSIX)

base::FileDescriptor AsPlatformFile() override {

+#if defined(OS_MACOSX)

+ return handle_.GetFileDescriptor();

+#else

return handle_;

+#endif // defined(OS_MACOSX)

}

#endif

@@ -102,7 +106,11 @@

ClientBuffer AsClientBuffer() override { return gmb_->AsClientBuffer(); }

#if defined(OS_POSIX)

base::FileDescriptor AsPlatformFile() override {

+#if defined(OS_MACOSX)

+ return gmb_->GetHandle().handle.GetFileDescriptor();

+#else

return gmb_->GetHandle().handle;

+#endif // defined(OS_MACOSX)

}

#endif

« no previous file with comments | « base/memory/shared_memory_win.cc ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »