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

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

Issue 5828003: Move the Pepper implementation from webkit/glue/plugins/pepper_* to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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 | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/plugin_object.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_GLUE_PLUGINS_PEPPER_PLUGIN_OBJECT_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_OBJECT_H_
6 #define WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_OBJECT_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_OBJECT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 11
12 struct PP_Var; 12 struct PP_Var;
13 struct PPP_Class_Deprecated; 13 struct PPP_Class_Deprecated;
14 typedef struct NPObject NPObject; 14 typedef struct NPObject NPObject;
15 typedef struct _NPVariant NPVariant; 15 typedef struct _NPVariant NPVariant;
16 16
17 namespace pepper { 17 namespace webkit {
18 namespace ppapi {
18 19
19 class PluginModule; 20 class PluginModule;
20 21
21 class PluginObject { 22 class PluginObject {
22 public: 23 public:
23 virtual ~PluginObject(); 24 virtual ~PluginObject();
24 25
25 // Allocates a new PluginObject and returns it as a PP_Var with a 26 // Allocates a new PluginObject and returns it as a PP_Var with a
26 // refcount of 1. 27 // refcount of 1.
27 static PP_Var Create(PluginModule* module, 28 static PP_Var Create(PluginModule* module,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // We don't actually own this pointer, it's the NPObject that actually 78 // We don't actually own this pointer, it's the NPObject that actually
78 // owns us. 79 // owns us.
79 NPObjectWrapper* object_wrapper_; 80 NPObjectWrapper* object_wrapper_;
80 81
81 const PPP_Class_Deprecated* ppp_class_; 82 const PPP_Class_Deprecated* ppp_class_;
82 void* ppp_class_data_; 83 void* ppp_class_data_;
83 84
84 DISALLOW_COPY_AND_ASSIGN(PluginObject); 85 DISALLOW_COPY_AND_ASSIGN(PluginObject);
85 }; 86 };
86 87
87 } // namespace pepper 88 } // namespace ppapi
89 } // namespace webkit
88 90
89 #endif // WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_OBJECT_H_ 91 #endif // WEBKIT_PLUGINS_PPAPI_PLUGIN_OBJECT_H_
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/plugin_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698