blimp/client/core/compositor/blimp_gpu_memory_buffer_manager.cc - Issue 2241623002: blimp: Move compositing, input and render widget feature to client/core.

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: blimp/client/core/compositor/blimp_gpu_memory_buffer_manager.cc

Issue 2241623002: blimp: Move compositing, input and render widget feature to client/core. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: moar gn fix Created 4 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 | « blimp/client/core/compositor/blimp_gpu_memory_buffer_manager.h ('k') | blimp/client/core/compositor/compositor_deps_provider.h » ('j') | blimp/client/core/contents/blimp_contents_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/core/compositor/blimp_gpu_memory_buffer_manager.cc

diff --git a/blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.cc b/blimp/client/core/compositor/blimp_gpu_memory_buffer_manager.cc

similarity index 96%

rename from blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.cc

rename to blimp/client/core/compositor/blimp_gpu_memory_buffer_manager.cc

index 437269ad5fec17b7835a92618eb653dbfcc1f032..b0fc2521bd2d585dcde99780d2b5fbad1e5b833d 100644

--- a/blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.cc

+++ b/blimp/client/core/compositor/blimp_gpu_memory_buffer_manager.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.h"

+#include "blimp/client/core/compositor/blimp_gpu_memory_buffer_manager.h"

#include <GLES2/gl2.h>

#include <stddef.h>

@@ -38,8 +38,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {

// Overridden from gfx::GpuMemoryBuffer:

bool Map() override {

DCHECK(!mapped_);

- DCHECK_EQ(stride_, gfx::RowSizeForBufferFormat(size_.width(),

- format_, 0));

+ DCHECK_EQ(stride_, gfx::RowSizeForBufferFormat(size_.width(), format_, 0));

if (!shared_memory_->Map(offset_ +

gfx::BufferSizeForBufferFormat(size_, format_)))

return false;

@@ -51,7 +50,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {

DCHECK(mapped_);

DCHECK_LT(plane, gfx::NumberOfPlanesForBufferFormat(format_));

return reinterpret_cast<uint8_t*>(shared_memory_->memory()) + offset_ +

- gfx::BufferOffsetForBufferFormat(size_, format_, plane);

+ gfx::BufferOffsetForBufferFormat(size_, format_, plane);

}

void Unmap() override {