Changeset 28366 in webkit

Timestamp:

Dec 3, 2007, 2:07:43 PM (18 years ago)

Author:

mitz@apple.com

Message:

JavaScriptCore:

Reviewed by Darin Adler.

• fix an ASSERT when getIntIdentifier is called with 0 or -1

• bindings/npruntime.cpp: (_NPN_GetIntIdentifier): We cannot use the hashmap for 0 and -1 since they are the empty value and the deleted value. Instead, keep the identifiers for those two integers in a static array.

WebKitTools:

Reviewed by Darin Adler.

• added a testGetIntIdentifier() method to TestNetscapePlugIn

• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c: (pluginInvoke):

LayoutTests:

Reviewed by Darin Adler.

• added a test of the behavior of getIntIdentifier with the integers 0 and -1

• plugins/getintidentifier-special-values-expected.txt: Added.
• plugins/getintidentifier-special-values.html: Added.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/bindings/npruntime.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/getintidentifier-special-values-expected.txt (added)
• LayoutTests/plugins/getintidentifier-special-values.html (added)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-12-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix an ASSERT when getIntIdentifier is called with 0 or -1
+
+        * bindings/npruntime.cpp:
+        (_NPN_GetIntIdentifier): We cannot use the hashmap for 0 and -1 since
+        they are the empty value and the deleted value. Instead, keep the
+        identifiers for those two integers in a static array.
+
 2007-12-02  Darin Adler  <darin@apple.com>
 

trunk/JavaScriptCore/bindings/npruntime.cpp

@@ -97 +97 @@
 NPIdentifier _NPN_GetIntIdentifier(int32_t intid)
 {
-    PrivateIdentifier* identifier = 0;
-    
-    identifier = getIntIdentifierMap()->get(intid);
-    if (identifier == 0) {
-        identifier = (PrivateIdentifier*)malloc(sizeof(PrivateIdentifier));
-        // We never release identifier names, so this dictionary will grow.
-        identifier->isString = false;
-        identifier->value.number = intid;
-
-        getIntIdentifierMap()->set(intid, identifier);
+    PrivateIdentifier* identifier;
+
+    if (intid == 0 || intid == -1) {
+        static PrivateIdentifier* negativeOneAndZeroIdentifiers[2];
+
+        identifier = negativeOneAndZeroIdentifiers[intid + 1];
+        if (!identifier) {
+            identifier = (PrivateIdentifier*)malloc(sizeof(PrivateIdentifier));
+            identifier->isString = false;
+            identifier->isString = intid;
+
+            negativeOneAndZeroIdentifiers[intid + 1] = identifier;
+        }
+    } else {
+        identifier = getIntIdentifierMap()->get(intid);
+        if (!identifier) {
+            identifier = (PrivateIdentifier*)malloc(sizeof(PrivateIdentifier));
+            // We never release identifier names, so this dictionary will grow.
+            identifier->isString = false;
+            identifier->value.number = intid;
+
+            getIntIdentifierMap()->set(intid, identifier);
+        }
     }
     return (NPIdentifier)identifier;

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-12-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - added a test of the behavior of getIntIdentifier with the integers
+          0 and -1
+
+        * plugins/getintidentifier-special-values-expected.txt: Added.
+        * plugins/getintidentifier-special-values.html: Added.
+
 2007-12-03  Rob Buis  <buis@kde.org>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-12-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - added a testGetIntIdentifier() method to TestNetscapePlugIn
+
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c:
+        (pluginInvoke):
+
 2007-12-03  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c

@@ -94 +94 @@
 #define ID_DESTROY_STREAM           6
 #define ID_TEST_ENUMERATE           7
-#define NUM_METHOD_IDENTIFIERS      8
+#define ID_TEST_GETINTIDENTIFIER    8
+#define NUM_METHOD_IDENTIFIERS      9
 
 static NPIdentifier pluginMethodIdentifiers[NUM_METHOD_IDENTIFIERS];
@@ -105 +106 @@
     "testInvokeDefault",
     "destroyStream",
-    "testEnumerate"
+    "testEnumerate",
+    "testGetIntIdentifier"
 };
 
@@ -283 +285 @@
                 NPObject* outArray = NPVARIANT_TO_OBJECT(args[1]);
                 NPIdentifier pushIdentifier = browser->getstringidentifier("push");
-                
+
                 for (uint32_t i = 0; i < count; i++) {
                     NPUTF8* string = browser->utf8fromidentifier(identifiers[i]);
@@ -297 +299 @@
                     browser->memfree(string);
                 }
-                
+
                 browser->memfree(identifiers);
             }
@@ -308 +310 @@
         INT32_TO_NPVARIANT(npError, *result);
         return true;        
-    } 
+    } else if (name == pluginMethodIdentifiers[ID_TEST_GETINTIDENTIFIER]) {
+        if (argCount == 1 && NPVARIANT_IS_DOUBLE(args[0])) {
+            NPIdentifier identifier = browser->getintidentifier((int)NPVARIANT_TO_DOUBLE(args[0]));
+            INT32_TO_NPVARIANT((int32)identifier, *result);
+            return true;
+        }
+    }
     return false;
 }