Changeset 64174 in webkit

Timestamp:

Jul 27, 2010 4:15:41 PM (14 years ago)

Author:

andersca@apple.com

Message:

Implement JSNPObject::propertyGetter
​https://bugs.webkit.org/show_bug.cgi?id=43091

Reviewed by Sam Weinig.

WebKit2:

• WebProcess/Plugins/JSNPObject.cpp:

(WebKit::JSNPObject::propertyGetter):
Ask the NPObject for its property.

• WebProcess/Plugins/NPRuntimeObjectMap.cpp:

(WebKit::NPRuntimeObjectMap::jsNPObjectDestroyed):
Add a stub.

(WebKit::NPRuntimeObjectMap::convertNPVariantToValue):
Implement this for everything except objects.

LayoutTests:

• platform/mac-wk2/Skipped:

Add a test I forgot to add, and remove plugins/npruntime/embed-property.html because it passes now.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/Skipped (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/JSNPObject.cpp (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-27  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Implement JSNPObject::propertyGetter
+        https://bugs.webkit.org/show_bug.cgi?id=43091
+
+        * platform/mac-wk2/Skipped:
+        Add a test I forgot to add, and remove plugins/npruntime/embed-property.html because it passes now.
+
 2010-07-27  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/mac-wk2/Skipped

@@ -1389 +1389 @@
 java
 platform/mac/plugins
+plugins/attach-during-destroy.html
 plugins/clicking-missing-plugin-fires-delegate.html
 plugins/destroy-during-npp-new.html
@@ -1412 +1413 @@
 plugins/netscape-plugin-setwindow-size.html
 plugins/npruntime/bindings-test.html
-plugins/npruntime/embed-property.html
 plugins/npruntime/enumerate.html
 plugins/npruntime/get-int-identifier-special-values.html

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-27  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Implement JSNPObject::propertyGetter
+        https://bugs.webkit.org/show_bug.cgi?id=43091
+
+        * WebProcess/Plugins/JSNPObject.cpp:
+        (WebKit::JSNPObject::propertyGetter):
+        Ask the NPObject for its property.
+
+        * WebProcess/Plugins/NPRuntimeObjectMap.cpp:
+        (WebKit::NPRuntimeObjectMap::jsNPObjectDestroyed):
+        Add a stub.
+
+        (WebKit::NPRuntimeObjectMap::convertNPVariantToValue):
+        Implement this for everything except objects.
+
 2010-07-27  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/WebProcess/Plugins/JSNPObject.cpp

@@ -26 +26 @@
 #include "JSNPObject.h"
 
+#include "NPRuntimeObjectMap.h"
 #include "NPRuntimeUtilities.h"
 #include <JavaScriptCore/Error.h>
 #include <JavaScriptCore/JSGlobalObject.h>
+#include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/ObjectPrototype.h>
 #include <WebCore/IdentifierRep.h>
@@ -72 +74 @@
 }
 
-JSValue JSNPObject::propertyGetter(ExecState*, JSValue, const Identifier&)
+JSValue JSNPObject::propertyGetter(ExecState* exec, JSValue slotBase, const Identifier& propertyName)
 {
+    JSNPObject* thisObj = static_cast<JSNPObject*>(asObject(slotBase));
+
+    if (!thisObj->m_npObject)
+        return throwInvalidAccessError(exec);
+
+    if (!thisObj->m_npObject->_class->getProperty)
+        return jsUndefined();
+
+    NPVariant property;
+    VOID_TO_NPVARIANT(property);
+
+    bool result;
+    {
+        JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
+        NPIdentifier npIdentifier = npIdentifierFromIdentifier(propertyName);
+        result = thisObj->m_npObject->_class->getProperty(thisObj->m_npObject, npIdentifier, &property);
+        
+        // FIXME: Handle getProperty setting an exception.
+        // FIXME: Find out what happens if calling getProperty causes the plug-in to go away.
+    }
+
+    if (!result)
+        return jsUndefined();
+
+    return thisObj->m_objectMap->convertNPVariantToValue(exec, property);
     // FIXME: Implement.
     return jsUndefined();

trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp

@@ -29 +29 @@
 #include "NPJSObject.h"
 #include "NPRuntimeUtilities.h"
+#include "NotImplemented.h"
 #include "PluginView.h"
 #include <WebCore/Frame.h>
@@ -70 +71 @@
 }
 
+void NPRuntimeObjectMap::jsNPObjectDestroyed(JSNPObject* jsNPObject)
+{
+    // FIXME: Implement.
+}
+
+JSValue NPRuntimeObjectMap::convertNPVariantToValue(JSC::ExecState* exec, const NPVariant& variant)
+{
+    switch (variant.type) {
+    case NPVariantType_Void:
+        return jsUndefined();
+
+    case NPVariantType_Null:
+        return jsNull();
+
+    case NPVariantType_Bool:
+        return jsBoolean(variant.value.boolValue);
+
+    case NPVariantType_Int32:
+        return jsNumber(exec, variant.value.intValue);
+
+    case NPVariantType_Double:
+        return jsNumber(exec, variant.value.doubleValue);
+
+    case NPVariantType_String:
+        return jsString(exec, String::fromUTF8WithLatin1Fallback(variant.value.stringValue.UTF8Characters, 
+                                                                 variant.value.stringValue.UTF8Length));
+    case NPVariantType_Object:
+    default:
+        notImplemented();
+        break;
+    }
+    
+    return jsUndefined();
+}
+
 void NPRuntimeObjectMap::invalidate()
 {

trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h

@@ -30 +30 @@
 
 struct NPObject;
+typedef struct _NPVariant NPVariant;
 
 namespace JSC {
@@ -35 +36 @@
     class JSGlobalObject;
     class JSObject;
+    class JSValue;
 }
 
 namespace WebKit {
 
+class JSNPObject;
 class NPJSObject;
 class PluginView;
@@ -56 +59 @@
     JSC::JSObject* getOrCreateJSObject(JSC::ExecState*, JSC::JSGlobalObject*, NPObject*);
 
+    void jsNPObjectDestroyed(JSNPObject*);
+
+    JSC::JSValue convertNPVariantToValue(JSC::ExecState*, const NPVariant&);
 
     // Called when the plug-in is destroyed. Will invalidate all the NPObjects.