Changeset 418 for trunk/icedtea-web/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc

Timestamp:

Feb 11, 2013, 8:53:47 PM (13 years ago)

Author:

dmik

Message:

Merge icedtea-web v1.3 to trunk.

Location:

trunk/icedtea-web

Files:

• . (modified) (1 prop)
• plugin/icedteanp/IcedTeaJavaRequestProcessor.cc (modified) (5 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc

@@ -921 +921 @@
     {
         className = "java.lang.String";
-#if MOZILLA_VERSION_COLLAPSED < 1090200
-        stringArg += NPVARIANT_TO_STRING(variant).utf8characters;
-#else
-        stringArg += NPVARIANT_TO_STRING(variant).UTF8Characters;
-#endif
+        stringArg = IcedTeaPluginUtilities::NPVariantAsString(variant);
     } else if (NPVARIANT_IS_OBJECT(variant))
     {
@@ -938 +934 @@
             PLUGIN_DEBUG("NPObject is not a Java object\n");
             NPIdentifier length_id = browser_functions.getstringidentifier("length");
+            bool isJSObjectArray = false;
 
             // FIXME: We currently only handle <= 2 dim arrays. Do we really need more though?
@@ -953 +950 @@
                 IcedTeaPluginUtilities::itoa(NPVARIANT_TO_INT32(length), &length_str);
 
-                if (NPVARIANT_TO_INT32(length) > 0)
+                if (NPVARIANT_TO_INT32(length) >= 0)
                 {
                     NPIdentifier id_0 = browser_functions.getintidentifier(0);
@@ -973 +970 @@
                         getArrayTypeForJava(instance, first_element, &java_array_type);
                     }
-                } else
-                    java_array_type.append("jsobject");
+                }
+
+                // For JSObject arrays, we create a regular object (accessible via JSObject.getSlot())
+                if (NPVARIANT_TO_INT32(length) < 0 || !java_array_type.compare("jsobject"))
+                {
+                    isJSObjectArray = true;
+                    goto createRegularObject;
+                }
 
                 java_result = java_request.newArray(java_array_type, length_str);
@@ -1012 +1015 @@
                 // Got here => no errors above. We're good to return!
                 return;
-            } else // Else it is not an array
+            }
+
+            createRegularObject:
+            if (!IcedTeaPluginUtilities::isObjectJSArray(instance, obj) || isJSObjectArray) // Else it is not an array
             {