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

Side by Side Diff: ppapi/proxy/ppb_surface_3d_proxy.h

Issue 7782020: Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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 | « ppapi/proxy/ppb_opengles2_proxy.cc ('k') | ppapi/proxy/ppp_graphics_3d_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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 #ifndef PPAPI_PPB_SURFACE_3D_PROXY_H_ 5 #ifndef PPAPI_PPB_SURFACE_3D_PROXY_H_
6 #define PPAPI_PPB_SURFACE_3D_PROXY_H_ 6 #define PPAPI_PPB_SURFACE_3D_PROXY_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ppapi/c/dev/pp_graphics_3d_dev.h"
10 #include "ppapi/c/pp_completion_callback.h" 11 #include "ppapi/c/pp_completion_callback.h"
11 #include "ppapi/c/pp_graphics_3d.h"
12 #include "ppapi/c/pp_instance.h" 12 #include "ppapi/c/pp_instance.h"
13 #include "ppapi/cpp/completion_callback.h" 13 #include "ppapi/cpp/completion_callback.h"
14 #include "ppapi/proxy/interface_proxy.h" 14 #include "ppapi/proxy/interface_proxy.h"
15 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h" 15 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
16 #include "ppapi/shared_impl/resource.h" 16 #include "ppapi/shared_impl/resource.h"
17 #include "ppapi/thunk/ppb_surface_3d_api.h" 17 #include "ppapi/thunk/ppb_surface_3d_api.h"
18 18
19 struct PPB_Surface3D_Dev; 19 struct PPB_Surface3D_Dev;
20 20
21 namespace ppapi { 21 namespace ppapi {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 const ppapi::HostResource& surface_3d); 90 const ppapi::HostResource& surface_3d);
91 91
92 pp::CompletionCallbackFactory<PPB_Surface3D_Proxy, 92 pp::CompletionCallbackFactory<PPB_Surface3D_Proxy,
93 ProxyNonThreadSafeRefCount> callback_factory_; 93 ProxyNonThreadSafeRefCount> callback_factory_;
94 }; 94 };
95 95
96 } // namespace proxy 96 } // namespace proxy
97 } // namespace ppapi 97 } // namespace ppapi
98 98
99 #endif // PPAPI_PPB_SURFACE_3D_PROXY_H_ 99 #endif // PPAPI_PPB_SURFACE_3D_PROXY_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/ppb_opengles2_proxy.cc ('k') | ppapi/proxy/ppp_graphics_3d_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698