content/browser/compositor/buffer_queue_unittest.cc - Issue 1269503007: Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/compositor/buffer_queue_unittest.cc

Issue 1269503007: Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add header to BUILD.gn Created 5 years, 4 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

« no previous file with comments | « content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc ('k') | content/browser/compositor/gpu_process_transport_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/buffer_queue_unittest.cc

diff --git a/content/browser/compositor/buffer_queue_unittest.cc b/content/browser/compositor/buffer_queue_unittest.cc

index 670d4d38b99702548caad1600df0f833eb14cb96..dba8b157ce91bc0280bb3b70bdc856ead1f62b07 100644

--- a/content/browser/compositor/buffer_queue_unittest.cc

+++ b/content/browser/compositor/buffer_queue_unittest.cc

@@ -30,7 +30,9 @@ class StubGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {

bool Map(void** data) override { return false; }

void Unmap() override {}

bool IsMapped() const override { return false; }

- Format GetFormat() const override { return gfx::GpuMemoryBuffer::RGBX_8888; }

+ gfx::BufferFormat GetFormat() const override {

+ return gfx::BufferFormat::RGBX_8888;

+ }

void GetStride(int* stride) const override {}

gfx::GpuMemoryBufferId GetId() const override { return 0; }

gfx::GpuMemoryBufferHandle GetHandle() const override {

@@ -47,7 +49,7 @@ class StubBrowserGpuMemoryBufferManager : public BrowserGpuMemoryBufferManager {

scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForScanout(

const gfx::Size& size,

- gfx::GpuMemoryBuffer::Format format,

+ gfx::BufferFormat format,

int32 surface_id) override {

return make_scoped_ptr<gfx::GpuMemoryBuffer>(new StubGpuMemoryBufferImpl);

}