ui: Add GetSize() function to gfx::GpuMemoryBuffer API.

This removes the IsMapped() function from the API as that was
never useful and instead adds a GetSize() function that makes
sense to have in addition to the existing GetFormat() function
and will be used by a follow up patch.

BUG=538325
TBR=dalecurtis@chromium.org, sky@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1391963003

Cr-Commit-Position: refs/heads/master@{#353276}

13 files changed, 22 insertions, 38 deletions

diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc
index 0192b40..27d8370 100644
--- a/cc/test/test_gpu_memory_buffer_manager.cc
+++ b/cc/test/test_gpu_memory_buffer_manager.cc
@@ -44,7 +44,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
     shared_memory_->Unmap();
     mapped_ = false;
   }
-  bool IsMapped() const override { return mapped_; }
+  gfx::Size GetSize() const override { return size_; }
   gfx::BufferFormat GetFormat() const override { return format_; }
   void GetStride(int* stride) const override {
     int num_planes =
diff --git a/components/mus/gles2/mojo_gpu_memory_buffer.cc b/components/mus/gles2/mojo_gpu_memory_buffer.cc
index fac4629..b3538a1 100644
--- a/components/mus/gles2/mojo_gpu_memory_buffer.cc
+++ b/components/mus/gles2/mojo_gpu_memory_buffer.cc
@@ -66,8 +66,8 @@ void MojoGpuMemoryBufferImpl::Unmap() {
   mapped_ = false;
 }
 
-bool MojoGpuMemoryBufferImpl::IsMapped() const {
-  return mapped_;
+gfx::Size MojoGpuMemoryBufferImpl::GetSize() const {
+  return size_;
 }
 
 gfx::BufferFormat MojoGpuMemoryBufferImpl::GetFormat() const {
diff --git a/components/mus/gles2/mojo_gpu_memory_buffer.h b/components/mus/gles2/mojo_gpu_memory_buffer.h
index cf16ebd0..e0c6ccf 100644
--- a/components/mus/gles2/mojo_gpu_memory_buffer.h
+++ b/components/mus/gles2/mojo_gpu_memory_buffer.h
@@ -29,7 +29,7 @@ class MojoGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   // Overridden from gfx::GpuMemoryBuffer:
   bool Map(void** data) override;
   void Unmap() override;
-  bool IsMapped() const override;
+  gfx::Size GetSize() const override;
   gfx::BufferFormat GetFormat() const override;
   void GetStride(int* stride) const override;
   gfx::GpuMemoryBufferId GetId() const override;
diff --git a/content/browser/compositor/buffer_queue_unittest.cc b/content/browser/compositor/buffer_queue_unittest.cc
index 5d5d538..12bdfc2 100644
--- a/content/browser/compositor/buffer_queue_unittest.cc
+++ b/content/browser/compositor/buffer_queue_unittest.cc
@@ -29,7 +29,7 @@ class StubGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   // Overridden from gfx::GpuMemoryBuffer:
   bool Map(void** data) override { return false; }
   void Unmap() override {}
-  bool IsMapped() const override { return false; }
+  gfx::Size GetSize() const override { return gfx::Size(); }
   gfx::BufferFormat GetFormat() const override {
     return gfx::BufferFormat::BGRX_8888;
   }
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 f3a2c48..b571429 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -75,7 +75,7 @@ class GpuMemoryBufferBufferHandle final
 #ifndef NDEBUG
     DCHECK_EQ(data->size(), gmbs->size());
     for (const auto& gmb : *gmbs)
-      DCHECK(gmb && gmb->IsMapped());
+      DCHECK(gmb);
     for (const auto& data_ptr : *data)
       DCHECK(data_ptr);
 #endif
@@ -190,10 +190,8 @@ VideoCaptureBufferPool::GpuMemoryBufferTracker::GpuMemoryBufferTracker()
 }
 
 VideoCaptureBufferPool::GpuMemoryBufferTracker::~GpuMemoryBufferTracker() {
-  for (const auto& gmb : gpu_memory_buffers_) {
-    if (gmb->IsMapped())
-      gmb->Unmap();
-  }
+  for (const auto& gmb : gpu_memory_buffers_)
+    gmb->Unmap();
 }
 
 bool VideoCaptureBufferPool::GpuMemoryBufferTracker::Init(
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
index 90b2d49..ecfa914 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
@@ -61,7 +61,7 @@ class VideoCaptureBufferPoolTest
       EXPECT_EQ(mapped_, true);
       mapped_ = false;
     }
-    bool IsMapped() const override { return mapped_; }
+    gfx::Size GetSize() const override { return size_; }
     gfx::BufferFormat GetFormat() const override {
       return gfx::BufferFormat::BGRA_8888;
     }
diff --git a/content/child/child_thread_impl_browsertest.cc b/content/child/child_thread_impl_browsertest.cc
index 220020f..6d82ed4 100644
--- a/content/child/child_thread_impl_browsertest.cc
+++ b/content/child/child_thread_impl_browsertest.cc
@@ -164,7 +164,6 @@ IN_PROC_BROWSER_TEST_P(ChildThreadImplGpuMemoryBufferBrowserTest,
   scoped_ptr<void* []> planes(new void* [num_planes]);
   bool rv = buffer->Map(planes.get());
   ASSERT_TRUE(rv);
-  EXPECT_TRUE(buffer->IsMapped());
 
   // Get strides.
   scoped_ptr<int[]> strides(new int[num_planes]);
@@ -191,7 +190,6 @@ IN_PROC_BROWSER_TEST_P(ChildThreadImplGpuMemoryBufferBrowserTest,
   }
 
   buffer->Unmap();
-  EXPECT_FALSE(buffer->IsMapped());
 }
 
 INSTANTIATE_TEST_CASE_P(
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.cc b/content/common/gpu/client/gpu_memory_buffer_impl.cc
index 38107a5..bfe4656 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl.cc
@@ -75,12 +75,12 @@ GpuMemoryBufferImpl* GpuMemoryBufferImpl::FromClientBuffer(
   return reinterpret_cast<GpuMemoryBufferImpl*>(buffer);
 }
 
-gfx::BufferFormat GpuMemoryBufferImpl::GetFormat() const {
-  return format_;
+gfx::Size GpuMemoryBufferImpl::GetSize() const {
+  return size_;
 }
 
-bool GpuMemoryBufferImpl::IsMapped() const {
-  return mapped_;
+gfx::BufferFormat GpuMemoryBufferImpl::GetFormat() const {
+  return format_;
 }
 
 gfx::GpuMemoryBufferId GpuMemoryBufferImpl::GetId() const {
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.h b/content/common/gpu/client/gpu_memory_buffer_impl.h
index aec75fe..44b528e 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl.h
@@ -35,7 +35,7 @@ class CONTENT_EXPORT GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   static GpuMemoryBufferImpl* FromClientBuffer(ClientBuffer buffer);
 
   // Overridden from gfx::GpuMemoryBuffer:
-  bool IsMapped() const override;
+  gfx::Size GetSize() const override;
   gfx::BufferFormat GetFormat() const override;
   gfx::GpuMemoryBufferId GetId() const override;
   ClientBuffer AsClientBuffer() override;
diff --git a/content/test/gpu_memory_buffer_impl_test_template.h b/content/test/gpu_memory_buffer_impl_test_template.h
index bb3d82c..aabb785 100644
--- a/content/test/gpu_memory_buffer_impl_test_template.h
+++ b/content/test/gpu_memory_buffer_impl_test_template.h
@@ -84,7 +84,6 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, Map) {
     scoped_ptr<TypeParam> buffer(TypeParam::CreateFromHandle(
         handle, buffer_size, format, gfx::BufferUsage::MAP, destroy_callback));
     ASSERT_TRUE(buffer);
-    EXPECT_FALSE(buffer->IsMapped());
 
     size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format);
 
@@ -92,7 +91,6 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, Map) {
     scoped_ptr<void* []> mapped_buffers(new void*[num_planes]);
     bool rv = buffer->Map(mapped_buffers.get());
     ASSERT_TRUE(rv);
-    EXPECT_TRUE(buffer->IsMapped());
 
     // Get strides.
     scoped_ptr<int[]> strides(new int[num_planes]);
@@ -121,7 +119,6 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, Map) {
     }
 
     buffer->Unmap();
-    EXPECT_FALSE(buffer->IsMapped());
   }
 }
 
@@ -144,7 +141,6 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, PersistentMap) {
         handle, buffer_size, format, gfx::BufferUsage::PERSISTENT_MAP,
         destroy_callback));
     ASSERT_TRUE(buffer);
-    EXPECT_FALSE(buffer->IsMapped());
 
     size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format);
 
@@ -152,7 +148,6 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, PersistentMap) {
     scoped_ptr<void* []> mapped_buffers(new void*[num_planes]);
     bool rv = buffer->Map(mapped_buffers.get());
     ASSERT_TRUE(rv);
-    EXPECT_TRUE(buffer->IsMapped());
 
     // Get strides.
     scoped_ptr<int[]> strides(new int[num_planes]);
@@ -181,12 +176,10 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, PersistentMap) {
     }
 
     buffer->Unmap();
-    EXPECT_FALSE(buffer->IsMapped());
 
     // Remap the buffer, and compare again. It should contain the same data.
     rv = buffer->Map(mapped_buffers.get());
     ASSERT_TRUE(rv);
-    EXPECT_TRUE(buffer->IsMapped());
 
     buffer->GetStride(strides.get());
 
@@ -209,7 +202,6 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, PersistentMap) {
     }
 
     buffer->Unmap();
-    EXPECT_FALSE(buffer->IsMapped());
   }
 }
 
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index 8d38fdb..b0414cd 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -49,7 +49,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   GpuMemoryBufferImpl(base::RefCountedBytes* bytes,
                       const gfx::Size& size,
                       gfx::BufferFormat format)
-      : bytes_(bytes), size_(size), format_(format), mapped_(false) {}
+      : bytes_(bytes), size_(size), format_(format) {}
 
   static GpuMemoryBufferImpl* FromClientBuffer(ClientBuffer buffer) {
     return reinterpret_cast<GpuMemoryBufferImpl*>(buffer);
@@ -65,11 +65,10 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
           gfx::RowSizeForBufferFormat(size_.width(), format_, i) *
           (size_.height() / gfx::SubsamplingFactorForBufferFormat(format_, i));
     }
-    mapped_ = true;
     return true;
   }
-  void Unmap() override { mapped_ = false; }
-  bool IsMapped() const override { return mapped_; }
+  void Unmap() override {}
+  gfx::Size GetSize() const override { return size_; }
   gfx::BufferFormat GetFormat() const override { return format_; }
   void GetStride(int* stride) const override {
     size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format_);
@@ -94,7 +93,6 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   scoped_refptr<base::RefCountedBytes> bytes_;
   const gfx::Size size_;
   gfx::BufferFormat format_;
-  bool mapped_;
 };
 
 }  // namespace
diff --git a/media/renderers/mock_gpu_video_accelerator_factories.cc b/media/renderers/mock_gpu_video_accelerator_factories.cc
index 361d8f2..87bd38d 100644
--- a/media/renderers/mock_gpu_video_accelerator_factories.cc
+++ b/media/renderers/mock_gpu_video_accelerator_factories.cc
@@ -33,11 +33,8 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
       data[plane] = &bytes_[plane][0];
     return true;
   }
-  void Unmap() override{};
-  bool IsMapped() const override {
-    NOTREACHED();
-    return false;
-  }
+  void Unmap() override {}
+  gfx::Size GetSize() const override { return size_; }
   gfx::BufferFormat GetFormat() const override {
     return format_;
   }
diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h
index 40bd41a..629dabc 100644
--- a/ui/gfx/gpu_memory_buffer.h
+++ b/ui/gfx/gpu_memory_buffer.h
@@ -10,6 +10,7 @@
 #include "build/build_config.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gfx/generic_shared_memory_id.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/gfx_export.h"
 
 #if defined(USE_OZONE)
@@ -64,8 +65,8 @@ class GFX_EXPORT GpuMemoryBuffer {
   // this has been called.
   virtual void Unmap() = 0;
 
-  // Returns true iff the buffer is mapped.
-  virtual bool IsMapped() const = 0;
+  // Returns the size for the buffer.
+  virtual gfx::Size GetSize() const = 0;
 
   // Returns the format for the buffer.
   virtual BufferFormat GetFormat() const = 0;