[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

ap at apple.com ap at apple.com
Thu Apr 8 02:06:59 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit e70f6042c12bcb3fe4bf5da3277ce46ee2df83ac
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 22:24:02 2010 +0000

            Reviewed by Adam Roben.
    
            https://bugs.webkit.org/show_bug.cgi?id=35600
            shouldBe() fails when comparing an array to null.
    
            * fast/js/resources/js-test-pre.js: (areArraysEqual): This function is expected to be called
            with weird arguments, as it's used with array-like objects like WebGLByteArray. Made it
            resilient against exceptions raised when dealing with those.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55430 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 064fbb3..03434f6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-02  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35600
+        shouldBe() fails when comparing an array to null.
+
+        * fast/js/resources/js-test-pre.js: (areArraysEqual): This function is expected to be called
+        with weird arguments, as it's used with array-like objects like WebGLByteArray. Made it
+        resilient against exceptions raised when dealing with those.
+
 2010-03-02  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/fast/js/resources/js-test-pre.js b/LayoutTests/fast/js/resources/js-test-pre.js
index b91812f..3df61de 100644
--- a/LayoutTests/fast/js/resources/js-test-pre.js
+++ b/LayoutTests/fast/js/resources/js-test-pre.js
@@ -37,11 +37,15 @@ function testFailed(msg)
 
 function areArraysEqual(_a, _b)
 {
-    if (_a.length !== _b.length)
-        return false;
-    for (var i = 0; i < _a.length; i++)
-        if (_a[i] !== _b[i])
+    try {
+        if (_a.length !== _b.length)
             return false;
+        for (var i = 0; i < _a.length; i++)
+            if (_a[i] !== _b[i])
+                return false;
+    } catch (ex) {
+        return false;
+    }
     return true;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list