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

Side by Side Diff: webkit/plugins/ppapi/plugin_module.h

Issue 7349016: Added versioning for PPB_Core::MemAlloc and MemFree (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes based on comments from dmichael Created 9 years, 5 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/tests/test_char_set.cc ('k') | webkit/plugins/ppapi/plugin_module.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 (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 WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
6 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/file_path.h" 13 #include "base/file_path.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/native_library.h" 17 #include "base/native_library.h"
18 #include "base/process.h" 18 #include "base/process.h"
19 #include "ppapi/c/pp_bool.h" 19 #include "ppapi/c/pp_bool.h"
20 #include "ppapi/c/pp_instance.h" 20 #include "ppapi/c/pp_instance.h"
21 #include "ppapi/c/pp_module.h" 21 #include "ppapi/c/pp_module.h"
22 #include "ppapi/c/ppb.h" 22 #include "ppapi/c/ppb.h"
23 #include "webkit/plugins/ppapi/plugin_delegate.h" 23 #include "webkit/plugins/ppapi/plugin_delegate.h"
24 24
25 class FilePath; 25 class FilePath;
26 class MessageLoop; 26 class MessageLoop;
27 struct PPB_Core; 27 struct PPB_Core;
28 struct PPB_Memory_Dev;
28 typedef void* NPIdentifier; 29 typedef void* NPIdentifier;
29 30
30 namespace base { 31 namespace base {
31 class WaitableEvent; 32 class WaitableEvent;
32 } 33 }
33 34
34 namespace ppapi { 35 namespace ppapi {
35 class WebKitForwarding; 36 class WebKitForwarding;
36 } // namespace ppapi 37 } // namespace ppapi
37 38
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // Initializes this module using the given library path as the plugin. 94 // Initializes this module using the given library path as the plugin.
94 // Returns true on success. False means that the plugin can not be used. 95 // Returns true on success. False means that the plugin can not be used.
95 bool InitAsLibrary(const FilePath& path); 96 bool InitAsLibrary(const FilePath& path);
96 97
97 // Initializes this module for the given out of process proxy. This takes 98 // Initializes this module for the given out of process proxy. This takes
98 // ownership of the given pointer, even in the failure case. 99 // ownership of the given pointer, even in the failure case.
99 void InitAsProxied(PluginDelegate::OutOfProcessProxy* out_of_process_proxy); 100 void InitAsProxied(PluginDelegate::OutOfProcessProxy* out_of_process_proxy);
100 101
101 static const PPB_Core* GetCore(); 102 static const PPB_Core* GetCore();
102 103
104 static const PPB_Memory_Dev* GetMemoryDev();
105
103 // Returns a pointer to the local GetInterface function for retrieving 106 // Returns a pointer to the local GetInterface function for retrieving
104 // PPB interfaces. 107 // PPB interfaces.
105 static GetInterfaceFunc GetLocalGetInterfaceFunc(); 108 static GetInterfaceFunc GetLocalGetInterfaceFunc();
106 109
107 // Returns the module handle. This may be used before Init() is called (the 110 // Returns the module handle. This may be used before Init() is called (the
108 // proxy needs this information to set itself up properly). 111 // proxy needs this information to set itself up properly).
109 PP_Module pp_module() const { return pp_module_; } 112 PP_Module pp_module() const { return pp_module_; }
110 113
111 const std::string& name() const { return name_; } 114 const std::string& name() const { return name_; }
112 const FilePath& path() const { return path_; } 115 const FilePath& path() const { return path_; }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // Lazily created by GetWebKitForwarding. 210 // Lazily created by GetWebKitForwarding.
208 scoped_ptr< ::ppapi::WebKitForwarding> webkit_forwarding_; 211 scoped_ptr< ::ppapi::WebKitForwarding> webkit_forwarding_;
209 212
210 DISALLOW_COPY_AND_ASSIGN(PluginModule); 213 DISALLOW_COPY_AND_ASSIGN(PluginModule);
211 }; 214 };
212 215
213 } // namespace ppapi 216 } // namespace ppapi
214 } // namespace webkit 217 } // namespace webkit
215 218
216 #endif // WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_ 219 #endif // WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
OLDNEW
« no previous file with comments | « ppapi/tests/test_char_set.cc ('k') | webkit/plugins/ppapi/plugin_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698