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

Side by Side Diff: gpu/demos/framework/pepper.cc

Issue 9122012: gcl change rev (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ppapi/cpp/completion_callback.h » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <GLES2/gl2.h> 5 #include <GLES2/gl2.h>
6 6
7 #include "gpu/demos/framework/demo.h" 7 #include "gpu/demos/framework/demo.h"
8 #include "gpu/demos/framework/demo_factory.h" 8 #include "gpu/demos/framework/demo_factory.h"
9 #include "ppapi/cpp/completion_callback.h" 9 #include "ppapi/cpp/completion_callback.h"
10 #include "ppapi/cpp/graphics_3d.h" 10 #include "ppapi/cpp/graphics_3d.h"
11 #include "ppapi/cpp/instance.h" 11 #include "ppapi/cpp/instance.h"
12 #include "ppapi/cpp/module.h" 12 #include "ppapi/cpp/module.h"
13 #include "ppapi/cpp/rect.h" 13 #include "ppapi/cpp/rect.h"
14 #include "ppapi/cpp/size.h" 14 #include "ppapi/cpp/size.h"
15 #include "ppapi/lib/gl/gles2/gl2ext_ppapi.h" 15 #include "ppapi/lib/gl/gles2/gl2ext_ppapi.h"
16 #include "ppapi/utility/completion_callback_factory.h"
16 17
17 namespace gpu { 18 namespace gpu {
18 namespace demos { 19 namespace demos {
19 20
20 class PluginInstance : public pp::Instance { 21 class PluginInstance : public pp::Instance {
21 public: 22 public:
22 PluginInstance(PP_Instance instance, pp::Module* module) 23 PluginInstance(PP_Instance instance, pp::Module* module)
23 : pp::Instance(instance), 24 : pp::Instance(instance),
24 module_(module), 25 module_(module),
25 demo_(CreateDemo()), 26 demo_(CreateDemo()),
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } // namespace gpu 139 } // namespace gpu
139 140
140 namespace pp { 141 namespace pp {
141 142
142 Module* CreateModule() { 143 Module* CreateModule() {
143 return new gpu::demos::PluginModule(); 144 return new gpu::demos::PluginModule();
144 } 145 }
145 146
146 } // namespace pp 147 } // namespace pp
147 148
OLDNEW
« no previous file with comments | « no previous file | ppapi/cpp/completion_callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698