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

Unified Diff: ppapi/c/ppb_instance.h

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 | « no previous file | ppapi/c/ppp_instance.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/c/ppb_instance.h
diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h
index dbda74d633d68ef9b887869ebc00fcb092bce2e9..b2fa4046b3c070612689ad7992b2db192acb47f7 100644
--- a/ppapi/c/ppb_instance.h
+++ b/ppapi/c/ppb_instance.h
@@ -8,16 +8,10 @@
#include "ppapi/c/pp_bool.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_var.h"
-#define PPB_INSTANCE_INTERFACE_0_4 "PPB_Instance;0.4"
#define PPB_INSTANCE_INTERFACE_0_5 "PPB_Instance;0.5"
#define PPB_INSTANCE_INTERFACE_1_0 "PPB_Instance;1.0"
-#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
#define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_1_0
-#else
-#define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_0_4
-#endif
/**
* @file
@@ -35,11 +29,7 @@
*
*/
-#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
struct PPB_Instance {
-#else
-struct PPB_Instance_1_0 {
-#endif
/**
* BindGraphics() binds the given graphics as the current drawing surface.
* The contents of this device is what will be displayed in the module's
@@ -86,25 +76,7 @@ struct PPB_Instance_1_0 {
};
-#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
-struct PPB_Instance_0_4 {
-#else
-struct PPB_Instance {
-#endif
- struct PP_Var (*GetWindowObject)(PP_Instance instance);
- struct PP_Var (*GetOwnerElementObject)(PP_Instance instance);
- PP_Bool (*BindGraphics)(PP_Instance instance, PP_Resource device);
- PP_Bool (*IsFullFrame)(PP_Instance instance);
- struct PP_Var (*ExecuteScript)(PP_Instance instance,
- struct PP_Var script,
- struct PP_Var* exception);
-};
-
-#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
typedef struct PPB_Instance PPB_Instance_1_0;
-#else
-typedef struct PPB_Instance PPB_Instance_0_4;
-#endif
/**
* @}
« no previous file with comments | « no previous file | ppapi/c/ppp_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698