Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3868)

Unified Diff: cc/test/test_gpu_memory_buffer_manager.cc

Issue 1024113003: Add multi-planar functions to GpuMemoryBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment fix. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..b43cd76c58098572ff97f4cc3959976072ca3db1 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 = shared_memory_->memory();
+ return true;
}
void Unmap() override {
DCHECK(mapped_);
@@ -56,8 +57,8 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
}
bool IsMapped() const override { return mapped_; }
Format GetFormat() const override { return format_; }
- uint32 GetStride() const override {
- return StrideInBytes(size_.width(), format_);
+ void GetStride(uint32* stride) const override {
+ *stride = StrideInBytes(size_.width(), format_);
}
gfx::GpuMemoryBufferHandle GetHandle() const override {
gfx::GpuMemoryBufferHandle handle;
« no previous file with comments | « cc/resources/zero_copy_tile_task_worker_pool.cc ('k') | content/browser/compositor/buffer_queue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698