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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit e5129d347fa6c2ad99841a1f55e9c5decfac0742
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 26 22:22:48 2009 +0000

    2009-10-26  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] Use "%lli" to format "long long" on WIN_OS to fix HTML5 WebDB crash
            https://bugs.webkit.org/show_bug.cgi?id=30777
    
            No new tests as the crash can be reproduced by existing storage
            LayoutTests (by hitting an assert in debug mode Webkit on WIN_OS).
    
            * platform/text/String.cpp:
            (WebCore::String::number): Qt's QString::vsprintf does not
            understand the "%I64u" format string. Always use the "%lli"
            format string for Qt port.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50103 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2129ddd..134a499 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-26  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Use "%lli" to format "long long" on WIN_OS to fix HTML5 WebDB crash
+        https://bugs.webkit.org/show_bug.cgi?id=30777
+
+        No new tests as the crash can be reproduced by existing storage
+        LayoutTests (by hitting an assert in debug mode Webkit on WIN_OS).
+
+        * platform/text/String.cpp:
+        (WebCore::String::number): Qt's QString::vsprintf does not
+        understand the "%I64u" format string. Always use the "%lli"
+        format string for Qt port.
+
 2009-10-26  Tony Chang  <tony at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/text/String.cpp b/WebCore/platform/text/String.cpp
index bef2674..44582a9 100644
--- a/WebCore/platform/text/String.cpp
+++ b/WebCore/platform/text/String.cpp
@@ -441,7 +441,7 @@ String String::number(unsigned long n)
 
 String String::number(long long n)
 {
-#if PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS) && !PLATFORM(QT)
     return String::format("%I64i", n);
 #else
     return String::format("%lli", n);
@@ -450,7 +450,7 @@ String String::number(long long n)
 
 String String::number(unsigned long long n)
 {
-#if PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS) && !PLATFORM(QT)
     return String::format("%I64u", n);
 #else
     return String::format("%llu", n);

-- 
WebKit Debian packaging