ui/gl/gl_image_memory.cc - Issue 895853003: Update from https://crrev.com/314320

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ui/gl/gl_image_memory.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 10 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:

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/gl/gl_image_memory.h"	5 #include "ui/gl/gl_image_memory.h"

6	6

7 #include "base/debug/trace_event.h"

8 #include "base/logging.h"	7 #include "base/logging.h"

	8 #include "base/trace_event/trace_event.h"

9 #include "ui/gl/gl_bindings.h"	9 #include "ui/gl/gl_bindings.h"

10 #include "ui/gl/scoped_binders.h"	10 #include "ui/gl/scoped_binders.h"

11	11

12 #if defined(OS_WIN) \|\| defined(USE_X11) \|\| defined(OS_ANDROID) \|\| \	12 #if defined(OS_WIN) \|\| defined(USE_X11) \|\| defined(OS_ANDROID) \|\| \

13 defined(USE_OZONE)	13 defined(USE_OZONE)

14 #include "ui/gl/gl_surface_egl.h"	14 #include "ui/gl/gl_surface_egl.h"

15 #endif	15 #endif

16	16

17 namespace gfx {	17 namespace gfx {

18 namespace {	18 namespace {

(...skipping 269 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
288 TextureFormat(format_),	288 TextureFormat(format_),

289 size_.width(),	289 size_.width(),

290 size_.height(),	290 size_.height(),

291 0, // border	291 0, // border

292 DataFormat(format_),	292 DataFormat(format_),

293 DataType(format_),	293 DataType(format_),

294 memory_);	294 memory_);

295 }	295 }

296	296

297 } // namespace gfx	297 } // namespace gfx

OLD	NEW

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