Reland [Mojo Video Capture] Simplify media::VideoCaptureDevice::Client:Buffer to a struct

media/capture/video/shared_memory_buffer_tracker.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/capture/video/shared_memory_buffer_tracker.h"
 
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 
 namespace media {
@@ skipping 12 matching lines @@
   set_pixel_format(format);
   set_storage_type(storage_type);
   mapped_size_ = VideoCaptureFormat(dimensions, 0.0f, format, storage_type)
                      .ImageAllocationSize();
   if (!mapped_size_)
     return true;
   return shared_memory_.CreateAndMapAnonymous(mapped_size_);
 }
 
 std::unique_ptr<VideoCaptureBufferHandle>
-SharedMemoryBufferTracker::GetBufferHandle() {
+SharedMemoryBufferTracker::GetMemoryMappedAccess() {
   return base::MakeUnique<SharedMemoryBufferHandle>(this);
 }
 
 mojo::ScopedSharedBufferHandle
 SharedMemoryBufferTracker::GetHandleForTransit() {
   return mojo::WrapSharedMemoryHandle(
       base::SharedMemory::DuplicateHandle(shared_memory_.handle()),
       mapped_size_, false /* read_only */);
 }
 
+base::SharedMemoryHandle
+SharedMemoryBufferTracker::GetNonOwnedSharedMemoryHandleForLegacyIPC() {
+  return shared_memory_.handle();

[mcasas, 2017/01/12 00:25:26]

I was surprised to see that here we don't need
base::SharedMemory::DuplicateHandle(shared_memory_.handle()
but then I recalled that IPC does it among its
black magics, plus the win bots are happy.

+}
+
 SharedMemoryBufferHandle::SharedMemoryBufferHandle(
     SharedMemoryBufferTracker* tracker)
     : tracker_(tracker) {}
 
 SharedMemoryBufferHandle::~SharedMemoryBufferHandle() = default;
 
-gfx::Size SharedMemoryBufferHandle::dimensions() const {
-  return tracker_->dimensions();
-}
-
 size_t SharedMemoryBufferHandle::mapped_size() const {
   return tracker_->mapped_size_;
 }
 
-void* SharedMemoryBufferHandle::data(int plane) {
-  DCHECK_EQ(0, plane);
-  return tracker_->shared_memory_.memory();
+uint8_t* SharedMemoryBufferHandle::data() {
+  return static_cast<uint8_t*>(tracker_->shared_memory_.memory());
 }
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-base::FileDescriptor SharedMemoryBufferHandle::AsPlatformFile() {
-  return tracker_->shared_memory_.handle();
-}
-#endif
-
-bool SharedMemoryBufferHandle::IsBackedByVideoFrame() const {
-  return false;
-}
-
-scoped_refptr<VideoFrame> SharedMemoryBufferHandle::GetVideoFrame() {
-  return scoped_refptr<VideoFrame>();
+const uint8_t* SharedMemoryBufferHandle::data() const {
+  return static_cast<const uint8_t*>(tracker_->shared_memory_.memory());
 }
 
 }  // namespace media