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

Unified Diff: ppapi/cpp/module.cc

Issue 7362012: Remove untrusted scripting support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/cpp/instance.cc ('k') | ppapi/cpp/private/instance_private.h » ('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 412a38fe336bcf0fc90154e0395dd83d53948a63..927710ad8abf9cc66515ef1020dce7e6a3ca0c14 100644
--- a/ppapi/cpp/module.cc
+++ b/ppapi/cpp/module.cc
@@ -132,28 +132,13 @@ PP_Bool Instance_HandleDocumentLoad(PP_Instance pp_instance,
return PP_FromBool(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)
- return Var().Detach();
- Instance* instance = module_singleton->InstanceForPPInstance(pp_instance);
- if (!instance)
- return Var().Detach();
- return instance->GetInstanceObject().Detach();
-}
-#endif
-
static PPP_Instance instance_interface = {
&Instance_DidCreate,
&Instance_DidDestroy,
&Instance_DidChangeView,
&Instance_DidChangeFocus,
&Instance_HandleInputEvent,
- &Instance_HandleDocumentLoad,
-#ifndef PPAPI_INSTANCE_REMOVE_SCRIPTING
- &Instance_GetInstanceObject
-#endif
+ &Instance_HandleDocumentLoad
};
// PPP_Messaging implementation ------------------------------------------------
« no previous file with comments | « ppapi/cpp/instance.cc ('k') | ppapi/cpp/private/instance_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698