Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Side by Side Diff: mojo/gles2/command_buffer_client_impl.h

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in 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 unified diff | Download patch
« no previous file with comments | « mojo/application/public/cpp/lib/service_registry.h ('k') | mojo/runner/child_process.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_ 5 #ifndef MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_
6 #define MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_ 6 #define MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "components/view_manager/public/interfaces/command_buffer.mojom.h" 12 #include "components/view_manager/public/interfaces/command_buffer.mojom.h"
13 #include "gpu/command_buffer/client/gpu_control.h" 13 #include "gpu/command_buffer/client/gpu_control.h"
14 #include "gpu/command_buffer/common/command_buffer.h" 14 #include "gpu/command_buffer/common/command_buffer.h"
15 #include "gpu/command_buffer/common/command_buffer_shared.h" 15 #include "gpu/command_buffer/common/command_buffer_shared.h"
16 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
16 17
17 namespace base { 18 namespace base {
18 class RunLoop; 19 class RunLoop;
19 } 20 }
20 21
21 namespace gles2 { 22 namespace gles2 {
22 class CommandBufferClientImpl; 23 class CommandBufferClientImpl;
23 24
24 class CommandBufferDelegate { 25 class CommandBufferDelegate {
25 public: 26 public:
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 100
100 // Image IDs are allocated in sequence. 101 // Image IDs are allocated in sequence.
101 int next_image_id_; 102 int next_image_id_;
102 103
103 const MojoAsyncWaiter* async_waiter_; 104 const MojoAsyncWaiter* async_waiter_;
104 }; 105 };
105 106
106 } // gles2 107 } // gles2
107 108
108 #endif // MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_ 109 #endif // MOJO_GLES2_COMMAND_BUFFER_CLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/application/public/cpp/lib/service_registry.h ('k') | mojo/runner/child_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698