mojo/examples/bitmap_uploader/bitmap_uploader.cc - Issue 640893003: Move mojo/services/public/cpp TypeConverters to mojo/converters.

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: mojo/examples/bitmap_uploader/bitmap_uploader.cc

Issue 640893003: Move mojo/services/public/cpp TypeConverters to mojo/converters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix GN. Created 6 years, 2 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 unified diff | Download patch

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 "mojo/examples/bitmap_uploader/bitmap_uploader.h"	5 #include "mojo/examples/bitmap_uploader/bitmap_uploader.h"

6	6

7 #ifndef GL_GLEXT_PROTOTYPES	7 #ifndef GL_GLEXT_PROTOTYPES

8 #define GL_GLEXT_PROTOTYPES	8 #define GL_GLEXT_PROTOTYPES

9 #endif // GL_GLEXT_PROTOTYPES	9 #endif // GL_GLEXT_PROTOTYPES

10	10

11 #include "base/bind.h"	11 #include "base/bind.h"

12 #include "cc/surfaces/surface_id.h"	12 #include "cc/surfaces/surface_id.h"

13 #include "cc/surfaces/surface_id_allocator.h"	13 #include "cc/surfaces/surface_id_allocator.h"

14 #include "gpu/GLES2/gl2chromium.h"	14 #include "gpu/GLES2/gl2chromium.h"

15 #include "gpu/GLES2/gl2extchromium.h"	15 #include "gpu/GLES2/gl2extchromium.h"

16 #include "gpu/command_buffer/common/mailbox.h"	16 #include "gpu/command_buffer/common/mailbox.h"

	17 #include "mojo/converters/geometry_type_converters.h"

	18 #include "mojo/converters/surfaces_type_converters.h"

	19 #include "mojo/converters/surfaces_utils.h"

17 #include "mojo/public/c/gles2/gles2.h"	20 #include "mojo/public/c/gles2/gles2.h"

18 #include "mojo/public/cpp/application/connect.h"	21 #include "mojo/public/cpp/application/connect.h"

19 #include "mojo/public/interfaces/application/shell.mojom.h"	22 #include "mojo/public/interfaces/application/shell.mojom.h"

20 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"

21 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h"

22 #include "mojo/services/public/cpp/surfaces/surfaces_utils.h"

23 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"	23 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"

24 #include "third_party/khronos/GLES2/gl2.h"	24 #include "third_party/khronos/GLES2/gl2.h"

25 #include "ui/gfx/geometry/rect.h"	25 #include "ui/gfx/geometry/rect.h"

26	26

27 namespace mojo {	27 namespace mojo {

28	28

29 namespace {	29 namespace {

30 void LostContext(void*) {	30 void LostContext(void*) {

31 DCHECK(false);	31 DCHECK(false);

32 }	32 }

(...skipping 191 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
224 size.height(),	224 size.height(),

225 0,	225 0,

226 TextureFormat(),	226 TextureFormat(),

227 GL_UNSIGNED_BYTE,	227 GL_UNSIGNED_BYTE,

228 0);	228 0);

229 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);	229 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

230 return texture;	230 return texture;

231 }	231 }

232	232

233 } // namespace mojo	233 } // namespace mojo

OLD	NEW

« mojo/converters/surfaces_utils.h ('K') | « mojo/examples/bitmap_uploader/BUILD.gn ('k') | mojo/examples/browser/BUILD.gn » ('j') | mojo/services/window_manager/DEPS » ('J')