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

Unified Diff: ppapi/shared_impl/ppp_instance_combined.h

Issue 10543029: PPAPI/NaCl: Reinitialize some stuff when the ipc proxy starts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: enforce ordering of events, make previous view emptyenforce ordering of events, make previous view … Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/shared_impl/ppp_instance_combined.h
diff --git a/ppapi/shared_impl/ppp_instance_combined.h b/ppapi/shared_impl/ppp_instance_combined.h
index 7bb229fbbf1f2b571c52025022df714c6352b934..05eada07eb231188513de1f7a2bc26f1cc6a55f9 100644
--- a/ppapi/shared_impl/ppp_instance_combined.h
+++ b/ppapi/shared_impl/ppp_instance_combined.h
@@ -6,6 +6,7 @@
#define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_
#include "base/basictypes.h"
+#include "base/callback.h"
#include "ppapi/c/ppp_instance.h"
#include "ppapi/shared_impl/ppapi_shared_export.h"
@@ -15,8 +16,12 @@ namespace ppapi {
// necessary.
struct PPAPI_SHARED_EXPORT PPP_Instance_Combined {
public:
- explicit PPP_Instance_Combined(const PPP_Instance_1_0& instance_if);
- explicit PPP_Instance_Combined(const PPP_Instance_1_1& instance_if);
+ typedef const void*(GetInterfaceFunc)(const char*);
+ // Create a PPP_Instance_Combined. Uses the given |get_interface_func| to
+ // query the plugin and find the most recent version of the PPP_Instance
+ // interface.
+ static PPP_Instance_Combined* Create(
+ base::Callback<const void*(const char*)> get_plugin_if);
PP_Bool DidCreate(PP_Instance instance,
uint32_t argc,
@@ -37,6 +42,9 @@ struct PPAPI_SHARED_EXPORT PPP_Instance_Combined {
PP_Bool HandleDocumentLoad(PP_Instance instance, PP_Resource url_loader);
private:
+ explicit PPP_Instance_Combined(const PPP_Instance_1_0& instance_if);
+ explicit PPP_Instance_Combined(const PPP_Instance_1_1& instance_if);
+
// For version 1.0, DidChangeView will be NULL, and DidChangeView_1_0 will
// be set below.
PPP_Instance_1_1 instance_1_1_;

Powered by Google App Engine
This is Rietveld 408576698