Change GpuMemoryBuffer::GetStride interface from unsigned to signed.

GpuMemoryBuffer interface should allow specific implementations to have negative stride to support bottom-up buffer layout.
This change is to encourage GpuMemoryBuffer usage not to rely on positive stride.

TBR=piman@chromium.org

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

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

11 files changed, 11 insertions, 12 deletions

diff --git a/content/browser/compositor/buffer_queue_unittest.cc b/content/browser/compositor/buffer_queue_unittest.cc
index 61e4dab..d41d86c 100644
--- a/content/browser/compositor/buffer_queue_unittest.cc
+++ b/content/browser/compositor/buffer_queue_unittest.cc
@@ -31,7 +31,7 @@ class StubGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   void Unmap() override {}
   bool IsMapped() const override { return false; }
   Format GetFormat() const override { return gfx::GpuMemoryBuffer::RGBX_8888; }
-  void GetStride(uint32* stride) const override {}
+  void GetStride(int* stride) const override {}
   gfx::GpuMemoryBufferHandle GetHandle() const override {
     return gfx::GpuMemoryBufferHandle();
   }
diff --git a/content/browser/renderer_host/media/video_capture_texture_wrapper.cc b/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
index 7c14a15..339596e 100644
--- a/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
+++ b/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
@@ -287,7 +287,7 @@ void VideoCaptureTextureWrapper::TextureWrapperDelegate::OnIncomingCapturedData(
   void* data = NULL;
   bool rv = gpu_memory_buffer->Map(&data);
   DCHECK(rv);
-  uint32 stride;
+  int stride;
   gpu_memory_buffer->GetStride(&stride);
 
   uint8* mapped_buffer = static_cast<uint8*>(data);
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc b/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc
index fef592f..ed7836c 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc
@@ -49,7 +49,7 @@ void GpuMemoryBufferImplIOSurface::Unmap() {
   mapped_ = false;
 }
 
-void GpuMemoryBufferImplIOSurface::GetStride(uint32* stride) const {
+void GpuMemoryBufferImplIOSurface::GetStride(int* stride) const {
   *stride = IOSurfaceGetBytesPerRow(io_surface_);
 }
 
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h b/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h
index ff16c15..89d4834 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h
@@ -24,7 +24,7 @@ class GpuMemoryBufferImplIOSurface : public GpuMemoryBufferImpl {
   // Overridden from gfx::GpuMemoryBuffer:
   bool Map(void** data) override;
   void Unmap() override;
-  void GetStride(uint32* stride) const override;
+  void GetStride(int* stride) const override;
   gfx::GpuMemoryBufferHandle GetHandle() const override;
 
  private:
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
index 1dc9df1..8b3e342 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
@@ -40,7 +40,7 @@ void GpuMemoryBufferImplOzoneNativeBuffer::Unmap() {
   NOTREACHED();
 }
 
-void GpuMemoryBufferImplOzoneNativeBuffer::GetStride(uint32* stride) const {
+void GpuMemoryBufferImplOzoneNativeBuffer::GetStride(int* stride) const {
   NOTREACHED();
 }
 
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
index f82bc97..040eab9 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
@@ -21,7 +21,7 @@ class GpuMemoryBufferImplOzoneNativeBuffer : public GpuMemoryBufferImpl {
   // Overridden from gfx::GpuMemoryBuffer:
   bool Map(void** data) override;
   void Unmap() override;
-  void GetStride(uint32* stride) const override;
+  void GetStride(int* stride) const override;
   gfx::GpuMemoryBufferHandle GetHandle() const override;
 
  private:
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc
index 20afe37..7767956 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc
@@ -197,7 +197,7 @@ void GpuMemoryBufferImplSharedMemory::Unmap() {
   mapped_ = false;
 }
 
-void GpuMemoryBufferImplSharedMemory::GetStride(uint32* stride) const {
+void GpuMemoryBufferImplSharedMemory::GetStride(int* stride) const {
   size_t num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_);
   for (size_t i = 0; i < num_planes; ++i) {
     size_t stride_in_bytes = 0;
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
index e93ab32..90c649e 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h
@@ -42,7 +42,7 @@ class GpuMemoryBufferImplSharedMemory : public GpuMemoryBufferImpl {
   // Overridden from gfx::GpuMemoryBuffer:
   bool Map(void** data) override;
   void Unmap() override;
-  void GetStride(uint32* stride) const override;
+  void GetStride(int* stride) const override;
   gfx::GpuMemoryBufferHandle GetHandle() const override;
 
  private:
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
index 7a0831d..0fa6e81 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
@@ -101,7 +101,7 @@ void GpuMemoryBufferImplSurfaceTexture::Unmap() {
   mapped_ = false;
 }
 
-void GpuMemoryBufferImplSurfaceTexture::GetStride(uint32* stride) const {
+void GpuMemoryBufferImplSurfaceTexture::GetStride(int* stride) const {
   *stride = stride_;
 }
 
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
index 111ef17..af96c33 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
@@ -24,7 +24,7 @@ class GpuMemoryBufferImplSurfaceTexture : public GpuMemoryBufferImpl {
   bool Map(void** data) override;
   void Unmap() override;
   gfx::GpuMemoryBufferHandle GetHandle() const override;
-  void GetStride(uint32* stride) const override;
+  void GetStride(int* stride) const override;
 
  private:
   GpuMemoryBufferImplSurfaceTexture(gfx::GpuMemoryBufferId id,
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc b/content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc
index d73dae7..3a4789f 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc
@@ -106,7 +106,7 @@ TEST_P(GpuMemoryBufferImplTest, Map) {
     EXPECT_TRUE(buffer->IsMapped());
 
     // Get strides.
-    scoped_ptr<uint32[]> strides(new uint32[num_planes]);
+    scoped_ptr<int[]> strides(new int[num_planes]);
     buffer->GetStride(strides.get());
 
     // Copy and compare mapped buffers.
@@ -115,7 +115,6 @@ TEST_P(GpuMemoryBufferImplTest, Map) {
       EXPECT_TRUE(GpuMemoryBufferImpl::StrideInBytes(
           buffer_size.width(), configuration.format, i, &width_in_bytes));
       EXPECT_GT(width_in_bytes, 0u);
-      EXPECT_GE(strides[i], width_in_bytes);
 
       scoped_ptr<char[]> data(new char[width_in_bytes]);
       memset(data.get(), 0x2a + i, width_in_bytes);