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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 40aa37f09b2a55e56f16a5dfecb455de16493f6f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 12:23:36 2010 +0000

    2010-10-15  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Reviewed by Nikolas Zimmermann.
    
            [EFL] REGRESSION(69798) UCHAR can't be converted to String.
            https://bugs.webkit.org/show_bug.cgi?id=47698
    
            Create String value using String(const char*, 1) instead of operator[].
    
            No tests. No functionality changed.
    
            * platform/efl/PlatformKeyboardEventEfl.cpp:
            (WebCore::createWindowsKeyMap):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69849 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4fd9532..bf23153 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-15  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        [EFL] REGRESSION(69798) UCHAR can't be converted to String.
+        https://bugs.webkit.org/show_bug.cgi?id=47698
+
+        Create String value using String(const char*, 1) instead of operator[].
+
+        No tests. No functionality changed.
+
+        * platform/efl/PlatformKeyboardEventEfl.cpp:
+        (WebCore::createWindowsKeyMap):
+
 2010-10-15  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp b/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp
index 0645cd5..2888b22 100644
--- a/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp
+++ b/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp
@@ -131,9 +131,9 @@ static void createWindowsKeyMap()
     gWindowsKeyMap.set("quotedbl",     VK_OEM_7);
 
     // Alphabet
-    String alphabet = "abcdefghijklmnopqrstuvwxyz";
+    const char* alphabet = "abcdefghijklmnopqrstuvwxyz";
     for (unsigned int i = 0; i < 26; i++) {
-        String key = alphabet[i];
+        String key(alphabet + i, 1);
         gWindowsKeyMap.set(key, VK_A + i);
     }
 

-- 
WebKit Debian packaging