Changeset 64312 in webkit

Timestamp:

Jul 29, 2010 3:21:43 PM (14 years ago)

Author:

andersca@apple.com

Message:

Implement NPN_Enumerate
​https://bugs.webkit.org/show_bug.cgi?id=43215

Reviewed by Sam Weinig.

• WebProcess/Plugins/JSNPObject.cpp:

(WebKit::npIdentifierFromIdentifier):
Get the UTF-8 string representation instead of the lossy ASCII representation.

(WebKit::JSNPObject::getOwnPropertyNames):
Implement by calling the NPClass::enumerate function.

• WebProcess/Plugins/JSNPObject.h:
• WebProcess/Plugins/NPJSObject.cpp:

(WebKit::NPJSObject::enumerate):
Implement by calling JSObject::getPropertyNames.

(WebKit::NPJSObject::npClass):
(WebKit::NPJSObject::NP_Enumerate):
Call NPJSObject::enumerate.

• WebProcess/Plugins/NPJSObject.h:
• WebProcess/Plugins/NPRuntimeUtilities.cpp:

(WebKit::createNPObject):
Fix a comment.

• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:

(WebKit::NPN_Enumerate):
Call the NPClass::enumerate function.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/JSNPObject.cpp (modified) (3 diffs)
• WebProcess/Plugins/JSNPObject.h (modified) (1 diff)
• WebProcess/Plugins/NPJSObject.cpp (modified) (3 diffs)
• WebProcess/Plugins/NPJSObject.h (modified) (2 diffs)
• WebProcess/Plugins/NPRuntimeUtilities.cpp (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-29  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Implement NPN_Enumerate
+        https://bugs.webkit.org/show_bug.cgi?id=43215
+
+        * WebProcess/Plugins/JSNPObject.cpp:
+        (WebKit::npIdentifierFromIdentifier):
+        Get the UTF-8 string representation instead of the lossy ASCII representation.
+        
+        (WebKit::JSNPObject::getOwnPropertyNames):
+        Implement by calling the NPClass::enumerate function.
+
+        * WebProcess/Plugins/JSNPObject.h:
+        * WebProcess/Plugins/NPJSObject.cpp:
+        (WebKit::NPJSObject::enumerate):
+        Implement by calling JSObject::getPropertyNames.
+
+        (WebKit::NPJSObject::npClass):
+        (WebKit::NPJSObject::NP_Enumerate):
+        Call NPJSObject::enumerate.
+
+        * WebProcess/Plugins/NPJSObject.h:
+        * WebProcess/Plugins/NPRuntimeUtilities.cpp:
+        (WebKit::createNPObject):
+        Fix a comment.
+
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_Enumerate):
+        Call the NPClass::enumerate function.
+
 2010-07-29  John Sullivan  <sullivan@apple.com>
 

trunk/WebKit2/WebProcess/Plugins/JSNPObject.cpp

@@ -34 +34 @@
 #include <JavaScriptCore/JSLock.h>
 #include <WebCore/IdentifierRep.h>
+#include <WebCore/PlatformString.h>
 
 using namespace WebCore;
@@ -42 +43 @@
 static NPIdentifier npIdentifierFromIdentifier(const Identifier& identifier)
 {
-    return static_cast<NPIdentifier>(IdentifierRep::get(identifier.ascii()));
+    return static_cast<NPIdentifier>(IdentifierRep::get(identifier.ustring().UTF8String().data()));
 }
 
@@ -228 +229 @@
 }
 
+void JSNPObject::getOwnPropertyNames(ExecState* exec, PropertyNameArray& propertyNameArray, EnumerationMode mode)
+{
+    if (!m_npObject) {
+        throwInvalidAccessError(exec);
+        return;
+    }
+
+    if (!NP_CLASS_STRUCT_VERSION_HAS_ENUM(m_npObject->_class) || !m_npObject->_class->enumerate)
+        return;
+
+    NPIdentifier* identifiers = 0;
+    uint32_t identifierCount = 0;
+    
+    {
+        JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
+
+        // FIXME: Handle enumerate setting an exception.
+        // FIXME: Find out what happens if calling enumerate causes the plug-in to go away.
+        // FIXME: Should we throw an exception if enumerate returns false?
+        if (!m_npObject->_class->enumerate(m_npObject, &identifiers, &identifierCount))
+            return;
+    }
+
+    for (uint32_t i = 0; i < identifierCount; ++i) {
+        IdentifierRep* identifierRep = static_cast<IdentifierRep*>(identifiers[i]);
+        
+        Identifier identifier;
+        if (identifierRep->isString()) {
+            const char* string = identifierRep->string();
+            int length = strlen(string);
+            
+            identifier = Identifier(exec, String::fromUTF8WithLatin1Fallback(string, length).impl());
+        } else
+            identifier = Identifier::from(exec, identifierRep->number());
+
+        propertyNameArray.add(identifier);
+    }
+
+    // This should use NPN_MemFree, but we know that it uses free under the hood.
+    free(identifiers);
+}
+
 JSValue JSNPObject::propertyGetter(ExecState* exec, JSValue slotBase, const Identifier& propertyName)
 {

trunk/WebKit2/WebProcess/Plugins/JSNPObject.h

@@ -62 +62 @@
     virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&);
 
+    virtual void getOwnPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, JSC::EnumerationMode mode = JSC::ExcludeDontEnumProperties);
+
     static JSC::JSValue propertyGetter(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
     static JSC::JSValue methodGetter(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);

trunk/WebKit2/WebProcess/Plugins/NPJSObject.cpp

@@ -172 +172 @@
 }
 
+bool NPJSObject::enumerate(NPIdentifier** identifiers, uint32_t* identifierCount)
+{
+    ExecState* exec = m_objectMap->globalExec();
+    if (!exec)
+        return false;
+    
+    JSLock lock(SilenceAssertionsOnly);
+
+    PropertyNameArray propertyNames(exec);
+    m_jsObject->getPropertyNames(exec, propertyNames);
+
+    // This should use NPN_MemAlloc, but we know that it uses malloc under the hood.
+    NPIdentifier* nameIdentifiers = static_cast<NPIdentifier*>(malloc(sizeof(NPIdentifier) * propertyNames.size()));
+
+    for (size_t i = 0; i < propertyNames.size(); ++i)
+        nameIdentifiers[i] = static_cast<NPIdentifier>(IdentifierRep::get(propertyNames[i].ustring().UTF8String().data()));
+
+    *identifiers = nameIdentifiers;
+    *identifierCount = propertyNames.size();
+
+    return true;
+}
+
 bool NPJSObject::construct(const NPVariant *arguments, uint32_t argumentCount, NPVariant *result)
 {
@@ -238 +261 @@
         NP_SetProperty,
         0,
-        0,
+        NP_Enumerate,
         NP_Construct
     };
@@ -289 +312 @@
 }
 
+bool NPJSObject::NP_Enumerate(NPObject* npObject, NPIdentifier** identifiers, uint32_t* identifierCount)
+{
+    return toNPJSObject(npObject)->enumerate(identifiers, identifierCount);
+}
+
 bool NPJSObject::NP_Construct(NPObject* npObject, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
 {

trunk/WebKit2/WebProcess/Plugins/NPJSObject.h

@@ -66 +66 @@
     bool hasProperty(NPIdentifier propertyName);
     bool getProperty(NPIdentifier propertyName, NPVariant* result);
+    bool enumerate(NPIdentifier** identifiers, uint32_t* identifierCount);
     bool construct(const NPVariant* arguments, uint32_t argumentCount, NPVariant* result);
 
@@ -79 +80 @@
     static bool NP_GetProperty(NPObject*, NPIdentifier propertyName, NPVariant* result);
     static bool NP_SetProperty(NPObject*, NPIdentifier propertyName, const NPVariant* value);
+    static bool NP_Enumerate(NPObject*, NPIdentifier** identifiers, uint32_t* identifierCount);
     static bool NP_Construct(NPObject*, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result);
     

trunk/WebKit2/WebProcess/Plugins/NPRuntimeUtilities.cpp

@@ -36 +36 @@
         npObject = npClass->allocate(npp, npClass);
     else {
-        // This should really call NPN_MemAlloc, but we know that it uses malloc
-        // under the hood so it's fine.
+        // This should use NPN_MemAlloc, but we know that it uses malloc under the hood.
         npObject = static_cast<NPObject*>(malloc(sizeof(NPObject)));
     }

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

@@ -632 +632 @@
 }
     
-static bool NPN_Enumerate(NPP npp, NPObject* npobj, NPIdentifier** identifier, uint32_t* count)
-{
-    notImplemented();
+static bool NPN_Enumerate(NPP, NPObject* npObject, NPIdentifier** identifiers, uint32_t* identifierCount)
+{
+    if (NP_CLASS_STRUCT_VERSION_HAS_ENUM(npObject->_class) && npObject->_class->enumerate)
+        return npObject->_class->enumerate(npObject, identifiers, identifierCount);
+
     return false;
 }