diff options
author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 00:11:32 +0000 |
---|---|---|
committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 00:11:32 +0000 |
commit | 9fc081e3fdd83b0ab00159f0fb61eb59bdf577cd (patch) | |
tree | a8e2f5406ae08b497cd88d388c6e74147844ae9d /webkit/api | |
parent | de8dbced341b19faeacb2fbc64ad467ee9c8d209 (diff) | |
download | chromium_src-9fc081e3fdd83b0ab00159f0fb61eb59bdf577cd.zip chromium_src-9fc081e3fdd83b0ab00159f0fb61eb59bdf577cd.tar.gz chromium_src-9fc081e3fdd83b0ab00159f0fb61eb59bdf577cd.tar.bz2 |
Make webkit\glue\cpp_*.cc not depend on "config.h"
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/159558
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api')
-rw-r--r-- | webkit/api/public/WebBindings.h | 33 | ||||
-rw-r--r-- | webkit/api/src/WebBindings.cpp | 76 |
2 files changed, 97 insertions, 12 deletions
diff --git a/webkit/api/public/WebBindings.h b/webkit/api/public/WebBindings.h index f6eeb7d..00d055c 100644 --- a/webkit/api/public/WebBindings.h +++ b/webkit/api/public/WebBindings.h @@ -44,12 +44,41 @@ namespace WebKit { // NPN Functions ------------------------------------------------------ // These are all defined in npruntime.h and are well documented. - // NPN_GetStringIdentifier - WEBKIT_API static NPIdentifier getStringIdentifier(const NPUTF8*); + // NPN_CreateObject + WEBKIT_API static NPObject* createObject(NPP npp, NPClass* npClass); // NPN_GetIntIdentifier WEBKIT_API static NPIdentifier getIntIdentifier(int32_t); + // NPN_GetProperty + WEBKIT_API static bool getProperty(NPP npp, NPObject* obj, NPIdentifier propertyName, NPVariant *result); + + // NPN_GetStringIdentifier + WEBKIT_API static NPIdentifier getStringIdentifier(const NPUTF8*); + + // NPN_HasMethod + WEBKIT_API static bool hasMethod(NPP npp, NPObject* npObject, NPIdentifier methodName); + + // NPN_HasProperty + WEBKIT_API static bool hasProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName); + + // NPN_InitializeVariantWithStringCopy (though sometimes prefixed with an underscore) + WEBKIT_API static void initializeVariantWithStringCopy(NPVariant* variant, const NPString* value); + + // NPN_Invoke + WEBKIT_API static bool invoke(NPP npp, NPObject* npObject, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result); + + // NPN_ReleaseObject + WEBKIT_API static void releaseObject(NPObject* npObject); + + // NPN_ReleaseVariantValue + WEBKIT_API static void releaseVariantValue(NPVariant* variant); + + // NPN_RetainObject + WEBKIT_API static NPObject* retainObject(NPObject* npObject); + + // _NPN_UnregisterObject + WEBKIT_API static void unregisterObject(NPObject* npObject); // Miscellaneous utility functions ------------------------------------ diff --git a/webkit/api/src/WebBindings.cpp b/webkit/api/src/WebBindings.cpp index da41c78..b3cf59a 100644 --- a/webkit/api/src/WebBindings.cpp +++ b/webkit/api/src/WebBindings.cpp @@ -54,6 +54,72 @@ using namespace WebCore; namespace WebKit { +NPObject* WebBindings::createObject(NPP npp, NPClass* npClass) +{ + return NPN_CreateObject(npp, npClass); +} + +NPIdentifier WebBindings::getIntIdentifier(int32_t number) +{ + return NPN_GetIntIdentifier(number); +} + +bool WebBindings::getProperty(NPP npp, NPObject* obj, NPIdentifier propertyName, NPVariant *result) +{ + return NPN_GetProperty(npp, obj, propertyName, result); +} + +NPIdentifier WebBindings::getStringIdentifier(const NPUTF8* string) +{ + return NPN_GetStringIdentifier(string); +} + +bool WebBindings::hasMethod(NPP npp, NPObject* npObject, NPIdentifier methodName) +{ + return NPN_HasMethod(npp, npObject, methodName); +} + +bool WebBindings::hasProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName) +{ + return NPN_HasProperty(npp, npObject, propertyName); +} + +void WebBindings::initializeVariantWithStringCopy(NPVariant* variant, const NPString* value) +{ +#if USE(V8) + _NPN_InitializeVariantWithStringCopy(variant, value); +#else + NPN_InitializeVariantWithStringCopy(variant, value); +#endif +} + +bool WebBindings::invoke(NPP npp, NPObject* npObject, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result) +{ + return NPN_Invoke(npp, npObject, methodName, arguments, argumentCount, result); +} + +void WebBindings::releaseObject(NPObject* npObject) +{ + return NPN_ReleaseObject(npObject); +} + +void WebBindings::releaseVariantValue(NPVariant* variant) +{ + NPN_ReleaseVariantValue(variant); +} + +NPObject* WebBindings::retainObject(NPObject* npObject) +{ + return NPN_RetainObject(npObject); +} + +void WebBindings::unregisterObject(NPObject* npObject) +{ +#if USE(V8) + _NPN_UnregisterObject(npObject); +#endif +} + void WebBindings::extractIdentifierData(const NPIdentifier& identifier, const NPUTF8*& string, int32_t& number, bool& isString) { PrivateIdentifier* priv = static_cast<PrivateIdentifier*>(identifier); @@ -70,16 +136,6 @@ void WebBindings::extractIdentifierData(const NPIdentifier& identifier, const NP number = priv->value.number; } -NPIdentifier WebBindings::getStringIdentifier(const NPUTF8* string) -{ - return NPN_GetStringIdentifier(string); -} - -NPIdentifier WebBindings::getIntIdentifier(int32_t number) -{ - return NPN_GetIntIdentifier(number); -} - #if USE(V8) static v8::Local<v8::Value> getEvent(const v8::Handle<v8::Context>& context) |