summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/chromium/public/WebBindings.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/chromium/public/WebBindings.h')
-rw-r--r--Source/WebKit/chromium/public/WebBindings.h25
1 files changed, 8 insertions, 17 deletions
diff --git a/Source/WebKit/chromium/public/WebBindings.h b/Source/WebKit/chromium/public/WebBindings.h
index cb33781..149bff3 100644
--- a/Source/WebKit/chromium/public/WebBindings.h
+++ b/Source/WebKit/chromium/public/WebBindings.h
@@ -40,6 +40,7 @@ namespace WebKit {
class WebDragData;
class WebElement;
+class WebNode;
class WebRange;
// A haphazard collection of functions for dealing with plugins.
@@ -55,7 +56,7 @@ public:
WEBKIT_API static NPObject* createObject(NPP, NPClass*);
// NPN_Enumerate
- WEBKIT_API static bool enumerate(NPP, NPObject*, NPIdentifier**, uint32_t* count);
+ WEBKIT_API static bool enumerate(NPP, NPObject*, NPIdentifier**, uint32_t* identifierCount);
// NPN_Evaluate
WEBKIT_API static bool evaluate(NPP, NPObject*, NPString* script, NPVariant* result);
@@ -67,7 +68,7 @@ public:
WEBKIT_API static NPIdentifier getIntIdentifier(int32_t number);
// NPN_GetProperty
- WEBKIT_API static bool getProperty(NPP, NPObject*, NPIdentifier propertyName, NPVariant *result);
+ WEBKIT_API static bool getProperty(NPP, NPObject*, NPIdentifier property, NPVariant *result);
// NPN_GetStringIdentifier
WEBKIT_API static NPIdentifier getStringIdentifier(const NPUTF8* string);
@@ -76,10 +77,10 @@ public:
WEBKIT_API static void getStringIdentifiers(const NPUTF8** names, int32_t nameCount, NPIdentifier*);
// NPN_HasMethod
- WEBKIT_API static bool hasMethod(NPP, NPObject*, NPIdentifier methodName);
+ WEBKIT_API static bool hasMethod(NPP, NPObject*, NPIdentifier method);
// NPN_HasProperty
- WEBKIT_API static bool hasProperty(NPP, NPObject*, NPIdentifier propertyName);
+ WEBKIT_API static bool hasProperty(NPP, NPObject*, NPIdentifier property);
// NPN_IdentifierIsString
WEBKIT_API static bool identifierIsString(NPIdentifier);
@@ -91,10 +92,10 @@ public:
WEBKIT_API static int32_t intFromIdentifier(NPIdentifier);
// NPN_Invoke
- WEBKIT_API static bool invoke(NPP, NPObject*, NPIdentifier methodName, const NPVariant* args, uint32_t count, NPVariant* result);
+ WEBKIT_API static bool invoke(NPP, NPObject*, NPIdentifier method, const NPVariant* args, uint32_t argCount, NPVariant* result);
// NPN_InvokeDefault
- WEBKIT_API static bool invokeDefault(NPP, NPObject*, const NPVariant* args, uint32_t count, NPVariant* result);
+ WEBKIT_API static bool invokeDefault(NPP, NPObject*, const NPVariant* args, uint32_t argCount, NPVariant* result);
// NPN_ReleaseObject
WEBKIT_API static void releaseObject(NPObject*);
@@ -127,17 +128,6 @@ public:
// undefined. If iString is false, the opposite is true.
WEBKIT_API static void extractIdentifierData(const NPIdentifier&, const NPUTF8*& string, int32_t& number, bool& isString);
- // Return true (success) if the given npobj is the current drag event in browser dispatch,
- // and is accessible based on context execution frames and their security origins and
- // WebKit clipboard access policy. If so, return the event id and the clipboard data (WebDragData).
- // This only works with V8. If compiled without V8, it'll always return false.
- WEBKIT_API static bool getDragData(NPObject* event, int* eventId, WebDragData*);
-
- // Invoke the event access policy checks listed above with GetDragData(). No need for clipboard
- // data or event_id outputs, just confirm the given npobj is the current & accessible drag event.
- // This only works with V8. If compiled without V8, it'll always return false.
- WEBKIT_API static bool isDragEvent(NPObject* event);
-
// Return true (success) if the given npobj is a range object.
// If so, return that range as a WebRange object.
WEBKIT_API static bool getRange(NPObject* range, WebRange*);
@@ -148,6 +138,7 @@ public:
WEBKIT_API static NPObject* makeIntArray(const WebVector<int>&);
WEBKIT_API static NPObject* makeStringArray(const WebVector<WebString>&);
+ WEBKIT_API static NPObject* makeNode(const WebNode&);
// Exceptions -------------------------------------------------------------