Commit df83d88b authored by Alex Ilin's avatar Alex Ilin Committed by Commit Bot

[media] Remove the deprecated shared memory

This CL removes the last references to deprecated shared memory classes
in media/. It's a dead code that is no longer needed.

This also fixes some missing includes that used to be added
transitively.

Bug: 849207
Change-Id: I29483f5af8fe69bec69ace124e92b3aed91c6c83
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1919216
Auto-Submit: Alex Ilin <alexilin@chromium.org>
Reviewed-by: default avatarThomas Guilbert <tguilbert@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716409}
parent eeb0e161
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <stdint.h> #include <stdint.h>
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h" #include "base/sync_socket.h"
#include "base/threading/platform_thread.h" #include "base/threading/platform_thread.h"
#include "base/threading/thread_checker.h" #include "base/threading/thread_checker.h"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <utility> #include <utility>
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/memory/shared_memory.h" #include "base/memory/read_only_shared_memory_region.h"
#include "base/process/process_handle.h" #include "base/process/process_handle.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <utility> #include <utility>
#include "base/bind.h" #include "base/bind.h"
#include "base/memory/shared_memory.h" #include "base/memory/shared_memory_mapping.h"
#include "base/sync_socket.h" #include "base/sync_socket.h"
#include "base/test/task_environment.h" #include "base/test/task_environment.h"
#include "base/time/time.h" #include "base/time/time.h"
......
...@@ -35,23 +35,6 @@ BitstreamBuffer::BitstreamBuffer(int32_t id, ...@@ -35,23 +35,6 @@ BitstreamBuffer::BitstreamBuffer(int32_t id,
offset_(offset), offset_(offset),
presentation_timestamp_(presentation_timestamp) {} presentation_timestamp_(presentation_timestamp) {}
BitstreamBuffer::BitstreamBuffer(int32_t id,
base::SharedMemoryHandle handle,
bool read_only,
size_t size,
off_t offset,
base::TimeDelta presentation_timestamp)
: id_(id),
region_(
base::subtle::PlatformSharedMemoryRegion::TakeFromSharedMemoryHandle(
handle.Duplicate(),
read_only
? base::subtle::PlatformSharedMemoryRegion::Mode::kReadOnly
: base::subtle::PlatformSharedMemoryRegion::Mode::kUnsafe)),
size_(size),
offset_(offset),
presentation_timestamp_(presentation_timestamp) {}
BitstreamBuffer::BitstreamBuffer(BitstreamBuffer&&) = default; BitstreamBuffer::BitstreamBuffer(BitstreamBuffer&&) = default;
BitstreamBuffer& BitstreamBuffer::operator=(BitstreamBuffer&&) = default; BitstreamBuffer& BitstreamBuffer::operator=(BitstreamBuffer&&) = default;
......
...@@ -50,16 +50,6 @@ class MEDIA_EXPORT BitstreamBuffer { ...@@ -50,16 +50,6 @@ class MEDIA_EXPORT BitstreamBuffer {
off_t offset = 0, off_t offset = 0,
base::TimeDelta presentation_timestamp = kNoTimestamp); base::TimeDelta presentation_timestamp = kNoTimestamp);
// As above, but creates by duplicating a SharedMemoryHandle.
// TODO(https://crbug.com/793446): remove once legacy shared memory has been
// converted.
BitstreamBuffer(int32_t id,
base::SharedMemoryHandle handle,
bool read_only,
size_t size,
off_t offset = 0,
base::TimeDelta presentation_timestamp = kNoTimestamp);
// Move operations are allowed. // Move operations are allowed.
BitstreamBuffer(BitstreamBuffer&&); BitstreamBuffer(BitstreamBuffer&&);
BitstreamBuffer& operator=(BitstreamBuffer&&); BitstreamBuffer& operator=(BitstreamBuffer&&);
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "base/memory/aligned_memory.h" #include "base/memory/aligned_memory.h"
#include "base/memory/read_only_shared_memory_region.h" #include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/memory/shared_memory_handle.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "media/base/decrypt_config.h" #include "media/base/decrypt_config.h"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "base/files/file_enumerator.h" #include "base/files/file_enumerator.h"
#include "base/posix/eintr_wrapper.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/task_environment.h" #include "base/test/task_environment.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "base/files/file.h" #include "base/files/file.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/memory/shared_memory.h"
#include "base/process/process.h" #include "base/process/process.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "build/build_config.h" #include "build/build_config.h"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/memory/shared_memory.h"
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
#include "gpu/command_buffer/service/texture_manager.h" #include "gpu/command_buffer/service/texture_manager.h"
#include "gpu/config/gpu_info.h" #include "gpu/config/gpu_info.h"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "base/containers/mru_cache.h" #include "base/containers/mru_cache.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/scoped_refptr.h" #include "base/memory/scoped_refptr.h"
#include "base/memory/shared_memory.h"
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/time/time.h" #include "base/time/time.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/numerics/safe_conversions.h" #include "base/numerics/safe_conversions.h"
#include "base/posix/eintr_wrapper.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/posix/eintr_wrapper.h"
#include "base/sequenced_task_runner.h" #include "base/sequenced_task_runner.h"
#include "media/base/decode_status.h" #include "media/base/decode_status.h"
#include "media/base/video_codecs.h" #include "media/base/video_codecs.h"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/location.h" #include "base/location.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/shared_memory.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
#include "ui/gfx/mojom/buffer_types_mojom_traits.h" #include "ui/gfx/mojom/buffer_types_mojom_traits.h"
#include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/color_space_mojom_traits.h"
#if defined(OS_LINUX)
#include "base/posix/eintr_wrapper.h"
#endif // defined(OS_LINUX)
namespace mojo { namespace mojo {
namespace { namespace {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment