Index: cc/test/test_gpu_memory_buffer_manager.cc |
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc |
index 7430051ea6ff16ad6d9160f8d6896b428be87d61..6d1bd19a7edce08154dfe7284cdeef4f3539a34c 100644 |
--- a/cc/test/test_gpu_memory_buffer_manager.cc |
+++ b/cc/test/test_gpu_memory_buffer_manager.cc |
@@ -41,13 +41,14 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { |
mapped_(false) {} |
// Overridden from gfx::GpuMemoryBuffer: |
- void* Map() override { |
+ bool Map(void** data) override { |
DCHECK(!mapped_); |
if (!shared_memory_->Map(StrideInBytes(size_.width(), format_) * |
size_.height())) |
- return NULL; |
+ return false; |
mapped_ = true; |
- return shared_memory_->memory(); |
+ data[0] = shared_memory_->memory(); |
+ return true; |
} |
void Unmap() override { |
DCHECK(mapped_); |
@@ -55,9 +56,11 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { |
mapped_ = false; |
} |
bool IsMapped() const override { return mapped_; } |
+ size_t GetNumberOfPlanes() const override { return 1; } |
Format GetFormat() const override { return format_; } |
- uint32 GetStride() const override { |
- return StrideInBytes(size_.width(), format_); |
+ bool GetStride(uint32* stride) const override { |
+ stride[0] = StrideInBytes(size_.width(), format_); |
+ return true; |
} |
gfx::GpuMemoryBufferHandle GetHandle() const override { |
gfx::GpuMemoryBufferHandle handle; |