Title: [121516] trunk
Revision
121516
Author
[email protected]
Date
2012-06-28 21:20:18 -0700 (Thu, 28 Jun 2012)

Log Message

[BlackBerry] Selection items show as garbage for non-ascii characters.
https://bugs.webkit.org/show_bug.cgi?id=89969

Add charset utf-8 to the select popup's page.

Patch by Jason Liu <[email protected]> on 2012-06-28
Reviewed by Antonio Gomes.

.:

* ManualTests/blackberry/select-popup-items-unicode-display.html: Added.

Source/WebKit/blackberry:

* WebCoreSupport/SelectPopupClient.cpp:
(WebCore::SelectPopupClient::generateHTML):

Modified Paths

Added Paths

Diff

Modified: trunk/ChangeLog (121515 => 121516)


--- trunk/ChangeLog	2012-06-29 03:59:05 UTC (rev 121515)
+++ trunk/ChangeLog	2012-06-29 04:20:18 UTC (rev 121516)
@@ -1,3 +1,14 @@
+2012-06-28  Jason Liu  <[email protected]>
+
+        [BlackBerry] Selection items show as garbage for non-ascii characters.
+        https://bugs.webkit.org/show_bug.cgi?id=89969
+
+        Add charset utf-8 to the select popup's page.
+
+        Reviewed by Antonio Gomes.
+
+        * ManualTests/blackberry/select-popup-items-unicode-display.html: Added.
+
 2012-06-28  Christophe Dumez  <[email protected]>
 
         [EFL] Enable support for HTML5 datalist

Added: trunk/ManualTests/blackberry/select-popup-items-unicode-display.html (0 => 121516)


--- trunk/ManualTests/blackberry/select-popup-items-unicode-display.html	                        (rev 0)
+++ trunk/ManualTests/blackberry/select-popup-items-unicode-display.html	2012-06-29 04:20:18 UTC (rev 121516)
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <p>This tests if we can show unicode correctly. It is for <a href=""
+    <p>
+      If you can see chinese(北京, 澳门) after pressing the droplist, this test passes.
+   </p>
+    <select>
+        <option selected="selected">北京</option>
+        <option>ShenYang</option>
+        <option>澳门</option>
+    </select>
+  </body>
+</html>

Modified: trunk/Source/WebKit/blackberry/ChangeLog (121515 => 121516)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-06-29 03:59:05 UTC (rev 121515)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-06-29 04:20:18 UTC (rev 121516)
@@ -1,3 +1,15 @@
+2012-06-28  Jason Liu  <[email protected]>
+
+        [BlackBerry] Selection items show as garbage for non-ascii characters.
+        https://bugs.webkit.org/show_bug.cgi?id=89969
+
+        Add charset utf-8 to the select popup's page.
+
+        Reviewed by Antonio Gomes.
+
+        * WebCoreSupport/SelectPopupClient.cpp:
+        (WebCore::SelectPopupClient::generateHTML):
+
 2012-06-28  Leo Yang  <[email protected]>
 
         [BlackBerry] Checkerboard shown when clicking on error page buttons

Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp (121515 => 121516)


--- trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp	2012-06-29 03:59:05 UTC (rev 121515)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp	2012-06-29 04:20:18 UTC (rev 121516)
@@ -65,7 +65,7 @@
     const int* itemType, bool* selecteds)
 {
     StringBuilder source;
-    source.append("<html><head><style>\n");
+    source.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/><style>\n");
     // Include CSS file.
     source.append(popupControlBlackBerryCss,
             sizeof(popupControlBlackBerryCss));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to