summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/bindings/npapi.h
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2008-10-21 07:00:00 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2008-10-21 07:00:00 -0700
commit9364f22aed35e1a1e9d07c121510f80be3ab0502 (patch)
treed49911209b132da58d838efa852daf28d516df21 /JavaScriptCore/bindings/npapi.h
parent87eb0cb35bad8784770ebc807e6c982432e47107 (diff)
downloadexternal_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.zip
external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.gz
external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.bz2
Initial Contribution
Diffstat (limited to 'JavaScriptCore/bindings/npapi.h')
-rw-r--r--JavaScriptCore/bindings/npapi.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/JavaScriptCore/bindings/npapi.h b/JavaScriptCore/bindings/npapi.h
index ba8b6c7..d7ff9f3 100644
--- a/JavaScriptCore/bindings/npapi.h
+++ b/JavaScriptCore/bindings/npapi.h
@@ -105,7 +105,13 @@
/*----------------------------------------------------------------------*/
#define NP_VERSION_MAJOR 0
+#ifdef ANDROID_PLUGINS
+// Implements NPN_PluginThreadAsyncCall. Sandbox WebKit is version 20
+// and should override this change when merged.
+#define NP_VERSION_MINOR 19
+#else
#define NP_VERSION_MINOR 18
+#endif
@@ -706,6 +712,11 @@ void NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion);
void NPN_ForceRedraw(NPP instance);
void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled);
void NPN_PopPopupsEnabledState(NPP instance);
+#ifdef ANDROID_PLUGINS
+// Sandbox WebKit is version 20 NPAPI and implements
+// NPN_PluginThreadAsyncCall. Remove this change when merged.
+void NPN_PluginThreadAsyncCall(NPP instance, void (*func)(void *), void *userData);
+#endif
#ifdef __cplusplus
} /* end extern "C" */