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

Unified Diff: ppapi/cpp/module.cc

Issue 7038044: First step to remove scripting from PPP_Instance and PPB_Instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 7 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
« no previous file with comments | « ppapi/cpp/instance.cc ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/module.cc
diff --git a/ppapi/cpp/module.cc b/ppapi/cpp/module.cc
index 3883a5c29af4fbeb2b623759b91861675f165432..6791d0a7085a2be9aff9bb55390256c4a1fcec48 100644
--- a/ppapi/cpp/module.cc
+++ b/ppapi/cpp/module.cc
@@ -115,6 +115,7 @@ PP_Bool Instance_HandleDocumentLoad(PP_Instance pp_instance,
instance->HandleDocumentLoad(URLLoader(pp_url_loader)));
}
+#ifndef PPAPI_INSTANCE_REMOVE_SCRIPTING
PP_Var Instance_GetInstanceObject(PP_Instance pp_instance) {
Module* module_singleton = Module::Get();
if (!module_singleton)
@@ -124,6 +125,7 @@ PP_Var Instance_GetInstanceObject(PP_Instance pp_instance) {
return Var().Detach();
return instance->GetInstanceObject().Detach();
}
+#endif
static PPP_Instance instance_interface = {
&Instance_DidCreate,
@@ -132,7 +134,9 @@ static PPP_Instance instance_interface = {
&Instance_DidChangeFocus,
&Instance_HandleInputEvent,
&Instance_HandleDocumentLoad,
+#ifndef PPAPI_INSTANCE_REMOVE_SCRIPTING
&Instance_GetInstanceObject
+#endif
};
void Messaging_HandleMessage(PP_Instance pp_instance, PP_Var var) {
« no previous file with comments | « ppapi/cpp/instance.cc ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698