[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 42d8f4a3feefa20bd508de7e8fe3e66ceafdcce9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 28 21:36:54 2010 +0000

    2010-12-28  Helder Correia  <helder at sencha.com>
    
            Reviewed by Sam Weinig.
    
            JSON.parse must exist as a function taking 2 parameters
            https://bugs.webkit.org/show_bug.cgi?id=51666
    
            Support for revivers was introduced in bug 26591, but the function
            length has since remained unchanged.
    
            Test: ietestcenter/Javascript/15.12.2-0-2.html
    
            * runtime/JSONObject.cpp:
    2010-12-28  Helder Correia  <helder at sencha.com>
    
            Reviewed by Sam Weinig.
    
            JSON.parse must exist as a function taking 2 parameters
            https://bugs.webkit.org/show_bug.cgi?id=51666
    
            Support for revivers was introduced in bug 26591, but the function
            length has since remained unchanged.
    
            * ietestcenter/Javascript/15.12.2-0-2-expected.txt: Change expected
              result to success.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74721 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 94e522c..ef175c7 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-28  Helder Correia  <helder at sencha.com>
+
+        Reviewed by Sam Weinig.
+
+        JSON.parse must exist as a function taking 2 parameters
+        https://bugs.webkit.org/show_bug.cgi?id=51666
+
+        Support for revivers was introduced in bug 26591, but the function
+        length has since remained unchanged.
+
+        Test: ietestcenter/Javascript/15.12.2-0-2.html
+
+        * runtime/JSONObject.cpp:
+
 2010-12-27  Jake Helfert  <jake at jakeonthenet.com>
 
         Reviewed and reworked by Darin Adler.
diff --git a/JavaScriptCore/runtime/JSONObject.cpp b/JavaScriptCore/runtime/JSONObject.cpp
index b5477a1..ed9f1bd 100644
--- a/JavaScriptCore/runtime/JSONObject.cpp
+++ b/JavaScriptCore/runtime/JSONObject.cpp
@@ -606,7 +606,7 @@ const ClassInfo JSONObject::info = { "JSON", 0, 0, ExecState::jsonTable };
 
 /* Source for JSONObject.lut.h
 @begin jsonTable
-  parse         JSONProtoFuncParse             DontEnum|Function 1
+  parse         JSONProtoFuncParse             DontEnum|Function 2
   stringify     JSONProtoFuncStringify         DontEnum|Function 1
 @end
 */
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f84ac8f..faecf54 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-28  Helder Correia  <helder at sencha.com>
+
+        Reviewed by Sam Weinig.
+
+        JSON.parse must exist as a function taking 2 parameters
+        https://bugs.webkit.org/show_bug.cgi?id=51666
+
+        Support for revivers was introduced in bug 26591, but the function
+        length has since remained unchanged.
+
+        * ietestcenter/Javascript/15.12.2-0-2-expected.txt: Change expected
+          result to success.
+
 2010-12-23  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/LayoutTests/ietestcenter/Javascript/15.12.2-0-2-expected.txt b/LayoutTests/ietestcenter/Javascript/15.12.2-0-2-expected.txt
index d8dbf4c..4c384e6 100644
--- a/LayoutTests/ietestcenter/Javascript/15.12.2-0-2-expected.txt
+++ b/LayoutTests/ietestcenter/Javascript/15.12.2-0-2-expected.txt
@@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 PASS ES5Harness.preconditionPassed is true
-FAIL ES5Harness.testPassed should be true (of type boolean). Was undefined (of type undefined).
+PASS ES5Harness.testPassed is true
 PASS successfullyParsed is true
 
 TEST COMPLETE

-- 
WebKit Debian packaging