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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 68e0beb485d788ad4c0fb38f687ee9af87280960
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 23 13:02:13 2009 +0000

    [Symbian] Fix lastIndexOf() for Symbian
    https://bugs.webkit.org/show_bug.cgi?id=31773
    
    Patch by Laszlo Gombos <laszlo.1.gombos at nokia.com> on 2009-11-23
    Reviewed by Kenneth Rohde Christiansen.
    
    Symbian soft floating point library has problems with operators
    comparing NaN to numbers. Without a workaround lastIndexOf()
    function does not work.
    
    Patch developed by David Leong.
    
    * runtime/StringPrototype.cpp:
    (JSC::stringProtoFuncLastIndexOf):Add an extra test
    to check for NaN for Symbian.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 415dba2..b51f245 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-11-23  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Symbian] Fix lastIndexOf() for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=31773
+
+        Symbian soft floating point library has problems with operators
+        comparing NaN to numbers. Without a workaround lastIndexOf() 
+        function does not work.
+
+        Patch developed by David Leong.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::stringProtoFuncLastIndexOf):Add an extra test 
+        to check for NaN for Symbian.
+
 2009-11-23  Steve Block  <steveblock at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/JavaScriptCore/runtime/StringPrototype.cpp b/JavaScriptCore/runtime/StringPrototype.cpp
index a0713b8..a0cc9f1 100644
--- a/JavaScriptCore/runtime/StringPrototype.cpp
+++ b/JavaScriptCore/runtime/StringPrototype.cpp
@@ -469,6 +469,11 @@ JSValue JSC_HOST_CALL stringProtoFuncLastIndexOf(ExecState* exec, JSObject*, JSV
         dpos = 0;
     else if (!(dpos <= len)) // true for NaN
         dpos = len;
+#if PLATFORM(SYMBIAN)
+    // Work around for broken NaN compare operator
+    else if (isnan(dpos))
+        dpos = len;
+#endif
     return jsNumber(exec, s.rfind(u2, static_cast<int>(dpos)));
 }
 

-- 
WebKit Debian packaging