Changeset 64316 in webkit

Timestamp:

Jul 29, 2010 3:42:17 PM (14 years ago)

Author:

andersca@apple.com

Message:

Implement NPN_SetProperty
​https://bugs.webkit.org/show_bug.cgi?id=43217

Reviewed by Sam Weinig.

• WebProcess/Plugins/NPJSObject.cpp:

(WebKit::NPJSObject::setProperty):
Convert the NPVariant to a JSValue and set it on the underlying JSObject.

(WebKit::NPJSObject::NP_SetProperty):
Call NPJSObject::setProperty.

• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:

(WebKit::NPN_GetProperty):
Remove unused parameter name.

(WebKit::NPN_SetProperty):
Call the NPClass::setProperty function.

Location:

trunk/WebKit2

Files:

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

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-29  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Implement NPN_SetProperty
+        https://bugs.webkit.org/show_bug.cgi?id=43217
+
+        * WebProcess/Plugins/NPJSObject.cpp:
+        (WebKit::NPJSObject::setProperty):
+        Convert the NPVariant to a JSValue and set it on the underlying JSObject.
+
+        (WebKit::NPJSObject::NP_SetProperty):
+        Call NPJSObject::setProperty.
+
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_GetProperty):
+        Remove unused parameter name.
+
+        (WebKit::NPN_SetProperty):
+        Call the NPClass::setProperty function.
+
 2010-07-29  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/Plugins/NPJSObject.cpp

@@ -172 +172 @@
 }
 
+bool NPJSObject::setProperty(NPIdentifier propertyName, const NPVariant* value)
+{
+    IdentifierRep* identifierRep = static_cast<IdentifierRep*>(propertyName);
+    
+    ExecState* exec = m_objectMap->globalExec();
+    if (!exec)
+        return false;
+    
+    JSLock lock(SilenceAssertionsOnly);
+
+    JSValue jsValue = m_objectMap->convertNPVariantToJSValue(exec, m_objectMap->globalObject(), *value);
+    if (identifierRep->isString()) {
+        PutPropertySlot slot;
+        m_jsObject->put(exec, identifierFromIdentifierRep(exec, identifierRep), jsValue, slot);
+    } else
+        m_jsObject->put(exec, identifierRep->number(), jsValue);
+    exec->clearException();
+    
+    return true;
+}
+
 bool NPJSObject::enumerate(NPIdentifier** identifiers, uint32_t* identifierCount)
 {
@@ -306 +327 @@
 }
 
-bool NPJSObject::NP_SetProperty(NPObject*, NPIdentifier propertyName, const NPVariant* value)
-{
-    notImplemented();
-    return false;
+bool NPJSObject::NP_SetProperty(NPObject* npObject, NPIdentifier propertyName, const NPVariant* value)
+{
+    return toNPJSObject(npObject)->setProperty(propertyName, value);
 }
 

trunk/WebKit2/WebProcess/Plugins/NPJSObject.h

@@ -66 +66 @@
     bool hasProperty(NPIdentifier propertyName);
     bool getProperty(NPIdentifier propertyName, NPVariant* result);
+    bool setProperty(NPIdentifier propertyName, const NPVariant* value);
     bool enumerate(NPIdentifier** identifiers, uint32_t* identifierCount);
     bool construct(const NPVariant* arguments, uint32_t argumentCount, NPVariant* result);

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

@@ -573 +573 @@
 }
 
-static bool NPN_GetProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName, NPVariant* result)
+static bool NPN_GetProperty(NPP, NPObject* npObject, NPIdentifier propertyName, NPVariant* result)
 {
     if (npObject->_class->hasProperty && npObject->_class->getProperty) {
@@ -584 +584 @@
 }
 
-static bool NPN_SetProperty(NPP npp, NPObject* npobj, NPIdentifier propertyName, const NPVariant* value)
-{
-    notImplemented();
+static bool NPN_SetProperty(NPP, NPObject* npObject, NPIdentifier propertyName, const NPVariant* value)
+{
+    if (npObject->_class->setProperty)
+        return npObject->_class->setProperty(npObject, propertyName, value);
+
     return false;
 }