[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4236a2aa13bdb8c996a9dc65a4f3bd60ebe1afbe
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 23:08:03 2010 +0000

    2010-11-10  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Adler.
    
            plugins/npruntime/enumerate.html shouldn't depend on object enumeration order
            https://bugs.webkit.org/show_bug.cgi?id=49338
    
            The ES spec doesn't specify the order, so the test shouldn't depend on it.
            Unfortunately, the test still fails in Chromium.
    
            * platform/chromium/test_expectations.txt:
            * plugins/npruntime/enumerate.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6feec3f..29ce094 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-10  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        plugins/npruntime/enumerate.html shouldn't depend on object enumeration order
+        https://bugs.webkit.org/show_bug.cgi?id=49338
+
+        The ES spec doesn't specify the order, so the test shouldn't depend on it.
+        Unfortunately, the test still fails in Chromium.
+
+        * platform/chromium/test_expectations.txt:
+        * plugins/npruntime/enumerate.html:
+
 2010-11-10  Stephen White  <senorblanco at chromium.org>
 
         Unreviewed; test expectations and baselines.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 25d974e..df635fc 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -715,9 +715,8 @@ BUGJAMESR WIN LINUX : editing/spelling/spelling-hasspellingmarker.html = TEXT
 // Low priority, unclear if test expectations are correct (see bug)
 BUG6139 : fast/forms/select-writing-direction-natural.html = FAIL
 
-// We don't support NPN_Enumerate, but don't know of any plugin
-// which depends on that functionality.  So we ignore this for beta.
-BUG21901 : plugins/npruntime/enumerate.html = FAIL
+// Object.keys on an NPObject produces the wrong output.
+BUG21901 : plugins/npruntime/enumerate.html = TEXT
 
 // Expectations for this test changed upstream. We should fix this test, but
 // it doesn't need to block the current release
diff --git a/LayoutTests/plugins/npruntime/enumerate.html b/LayoutTests/plugins/npruntime/enumerate.html
index ae55bcf..6a0f5d2 100644
--- a/LayoutTests/plugins/npruntime/enumerate.html
+++ b/LayoutTests/plugins/npruntime/enumerate.html
@@ -4,16 +4,16 @@ function runTest()
 {
     if (window.layoutTestController)
         layoutTestController.dumpAsText();
-        
+
     var plugin = document.getElementById("testPlugin");
     var result = document.getElementById('result');
-    
+
     // First test NPN_Enumerate from the plugin's side
     var testObject = { "one" : 1, "two" : 2, "three" : 3, 4 : 4 }
     var outArray = [];    
     plugin.testEnumerate(testObject, outArray);
 
-    if (outArray.toString() != 'one,two,three,4') {
+    if (outArray.sort().toString() != '4,one,three,two') {
         result.innerHTML = 'FAILURE: Array returned from plugin was ' + outArray.toString();
         return;
     }
@@ -24,14 +24,14 @@ function runTest()
         propNames.push(v);
     }
     
-    if (propNames.toString() != 'foo,bar') {
+    if (propNames.sort().toString() != 'bar,foo') {
         result.innerHTML = 'FAILURE: Plugin object properties was ' + propNames.toString();
         return;
     }
 
     // Now try enumerating a plugin object's properties using Object.keys
     var keys = Object.keys(plugin.testObject);
-    if (keys.toString() != 'foo,bar') {
+    if (keys.sort().toString() != 'bar,foo') {
         result.innerHTML = 'FAILURE: Plugin object properties returned by Object.keys were ' + keys.toString();
         return;
     }

-- 
WebKit Debian packaging