ui/gl/gl_surface_ozone.cc - Issue 1263913002: FREEZE.unindexed

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: ui/gl/gl_surface_ozone.cc

Issue 1263913002: FREEZE.unindexed Base URL: https://chromium.googlesource.com/chromium/src.git@textures3

Patch Set: 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:

Index: ui/gl/gl_surface_ozone.cc

diff --git a/ui/gl/gl_surface_ozone.cc b/ui/gl/gl_surface_ozone.cc

index 9f874d4e87bf25f6fc8201b92e620d4f393508f8..fb452b60bc11a491258130b5002ef8298c6f361a 100644

--- a/ui/gl/gl_surface_ozone.cc

+++ b/ui/gl/gl_surface_ozone.cc

@@ -12,6 +12,7 @@

#include "base/memory/scoped_vector.h"

#include "base/memory/weak_ptr.h"

#include "base/threading/worker_pool.h"

+#include "content/common/generic_shared_memory_id_generator.h"

#include "ui/gfx/native_widget_types.h"

#include "ui/gl/gl_context.h"

#include "ui/gl/gl_image.h"

@@ -553,7 +554,9 @@ bool GLSurfaceOzoneSurfacelessSurfaceImpl::CreatePixmaps() {

return false;

scoped_refptr<GLImageOzoneNativePixmap> image =

new GLImageOzoneNativePixmap(GetSize(), GL_BGRA_EXT);

- if (!image->Initialize(pixmap.get(), gfx::BufferFormat::BGRA_8888))

+ if (GetNextGenericSharedMemoryId(),

+ !image->Initialize(pixmap.get(),

+ gfx::GpuMemoryBuffer::Format::BGRA_8888))

return false;

images_[i] = image;

// Bind image to texture.

« no previous file with comments | « ui/gl/gl_image_surface_texture.cc ('k') | ui/ozone/demo/surfaceless_gl_renderer.cc » ('j') | no next file with comments »