Video Gmb Pool: Plumb GpuMemoryBufferId through to compositor

media/renderers/mock_gpu_video_accelerator_factories.cc

 // Copyright 2013 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/renderers/mock_gpu_video_accelerator_factories.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace media {
 
 namespace {
 
 bool gpu_memory_buffers_in_use_by_window_server = false;
+int g_next_gpu_memory_buffer_id = 1;
 
 class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
  public:
   GpuMemoryBufferImpl(const gfx::Size& size, gfx::BufferFormat format)
       : mapped_(false),
         format_(format),
         size_(size),
-        num_planes_(gfx::NumberOfPlanesForBufferFormat(format)) {
+        num_planes_(gfx::NumberOfPlanesForBufferFormat(format)),
+        id_(g_next_gpu_memory_buffer_id++) {
     DCHECK(gfx::BufferFormat::R_8 == format_ ||
            gfx::BufferFormat::YUV_420_BIPLANAR == format_ ||
            gfx::BufferFormat::UYVY_422 == format_);
     DCHECK(num_planes_ <= kMaxPlanes);
     for (int i = 0; i < static_cast<int>(num_planes_); ++i) {
       bytes_[i].resize(
           gfx::RowSizeForBufferFormat(size_.width(), format_, i) *
           size_.height() / gfx::SubsamplingFactorForBufferFormat(format_, i));
     }
   }
@@ skipping 18 matching lines @@
   }
   gfx::Size GetSize() const override { return size_; }
   gfx::BufferFormat GetFormat() const override {
     return format_;
   }
   int stride(size_t plane) const override {
     DCHECK_LT(plane, num_planes_);
     return static_cast<int>(gfx::RowSizeForBufferFormat(
         size_.width(), format_, static_cast<int>(plane)));
   }
-  gfx::GpuMemoryBufferId GetId() const override {
-    NOTREACHED();
-    return gfx::GpuMemoryBufferId(0);
-  }
+  gfx::GpuMemoryBufferId GetId() const override { return id_; }
   gfx::GpuMemoryBufferHandle GetHandle() const override {
     NOTREACHED();
     return gfx::GpuMemoryBufferHandle();
   }
   ClientBuffer AsClientBuffer() override {
     return reinterpret_cast<ClientBuffer>(this);
   }
 
  private:
   static const size_t kMaxPlanes = 3;
 
   bool mapped_;
   gfx::BufferFormat format_;
   const gfx::Size size_;
   size_t num_planes_;
   std::vector<uint8_t> bytes_[kMaxPlanes];
+  gfx::GpuMemoryBufferId id_;
 };
 
 }  // unnamed namespace
 
 MockGpuVideoAcceleratorFactories::MockGpuVideoAcceleratorFactories(
     gpu::gles2::GLES2Interface* gles2)
     : gles2_(gles2) {}
 
 MockGpuVideoAcceleratorFactories::~MockGpuVideoAcceleratorFactories() {}
 
@@ skipping 56 matching lines @@
 };
 }  // namespace
 
 std::unique_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock>
 MockGpuVideoAcceleratorFactories::GetGLContextLock() {
   DCHECK(gles2_);
   return base::WrapUnique(new ScopedGLContextLockImpl(this));
 }
 
 }  // namespace media