diff options
| author | jfroy <jfroy@chromium.org> | 2015-09-05 01:47:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-05 08:48:21 +0000 |
| commit | cc7516ec9d89cff1d5cfe72794395c1a1c95908e (patch) | |
| tree | 66d806cbed1ab9b3f0b04c555a976ada44b130e4 /base | |
| parent | a269fca26b03fcdf80e2f6a20146408ce3318f02 (diff) | |
| download | chromium_src-cc7516ec9d89cff1d5cfe72794395c1a1c95908e.zip chromium_src-cc7516ec9d89cff1d5cfe72794395c1a1c95908e.tar.gz chromium_src-cc7516ec9d89cff1d5cfe72794395c1a1c95908e.tar.bz2 | |
Build shared_memory_mac.cc and shared_memory_handle_mac.cc for iOS
media::VideoFrame has new constructors that use SharedMemory and
SharedMemoryHandle. This patch enables building the Mac implementations
to support building //media/cast/sender on iOS.
BUG=528408
Review URL: https://codereview.chromium.org/1328963002
Cr-Commit-Position: refs/heads/master@{#347569}
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 2 | ||||
| -rw-r--r-- | base/memory/BUILD.gn | 9 | ||||
| -rw-r--r-- | base/memory/shared_memory_handle.h | 4 | ||||
| -rw-r--r-- | base/memory/shared_memory_handle_mac.cc | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/base/base.gypi b/base/base.gypi index ce980ed..ea02165 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -891,6 +891,8 @@ ['include', '^mac/scoped_nsautorelease_pool\\.'], ['include', '^mac/scoped_nsobject\\.'], ['include', '^mac/scoped_objc_class_swizzler\\.'], + ['include', '^memory/shared_memory_handle_mac\\.'], + ['include', '^memory/shared_memory_mac\\.'], ['include', '^message_loop/message_pump_mac\\.'], ['include', '^strings/sys_string_conversions_mac\\.'], ['include', '^threading/platform_thread_mac\\.'], diff --git a/base/memory/BUILD.gn b/base/memory/BUILD.gn index 51dedba..9c5d0a0 100644 --- a/base/memory/BUILD.gn +++ b/base/memory/BUILD.gn @@ -73,6 +73,15 @@ source_set("memory") { sources -= [ "shared_memory_posix.cc" ] } + if (is_ios) { + set_sources_assignment_filter([]) + sources += [ + "shared_memory_handle_mac.cc", + "shared_memory_mac.cc", + ] + set_sources_assignment_filter(sources_assignment_filter) + } + if (is_android) { deps = [ "//third_party/ashmem", diff --git a/base/memory/shared_memory_handle.h b/base/memory/shared_memory_handle.h index 7af8729..01a7f75 100644 --- a/base/memory/shared_memory_handle.h +++ b/base/memory/shared_memory_handle.h @@ -9,7 +9,7 @@ #if defined(OS_WIN) #include <windows.h> -#elif defined(OS_MACOSX) && !defined(OS_IOS) +#elif defined(OS_MACOSX) #include <sys/types.h> #include "base/base_export.h" #include "base/file_descriptor_posix.h" @@ -27,7 +27,7 @@ class Pickle; // the underlying OS handle to a shared memory segment. #if defined(OS_WIN) typedef HANDLE SharedMemoryHandle; -#elif defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS)) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) typedef FileDescriptor SharedMemoryHandle; #else class BASE_EXPORT SharedMemoryHandle { diff --git a/base/memory/shared_memory_handle_mac.cc b/base/memory/shared_memory_handle_mac.cc index eb4f465..6e18089 100644 --- a/base/memory/shared_memory_handle_mac.cc +++ b/base/memory/shared_memory_handle_mac.cc @@ -8,7 +8,6 @@ #include "base/posix/eintr_wrapper.h" -#if defined(OS_MACOSX) && !defined(OS_IOS) namespace base { static_assert(sizeof(SharedMemoryHandle::Type) <= @@ -87,4 +86,3 @@ SharedMemoryHandle SharedMemoryHandle::Duplicate() const { } } // namespace base -#endif // defined(OS_MACOSX) && !defined(OS_IOS) |