[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:39:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 014ea926766b9c2cf08aa5579136081310fbc812
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 15 03:48:01 2010 +0000
2010-12-14 Koan-Sin Tan <koansin.tan at gmail.com>
Reviewed by Alexey Proskuryakov.
Kana should be part of CJK Ideographs in WebCore/platform/graphics/Font.cpp
https://bugs.webkit.org/show_bug.cgi?id=51012
Test if kana displayed correctly in vertical text with broken font.
* fast/blockflow/japanese-rl-text-with-broken-font.html: Added.
* platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.checksum: Added.
* platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.png: Added.
* platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.txt: Added.
2010-12-14 Koan-Sin Tan <koansin.tan at gmail.com>
Reviewed by Alexey Proskuryakov.
Kana should be part of CJK Ideographs in WebCore/platform/graphics/Font.cpp
https://bugs.webkit.org/show_bug.cgi?id=51012
Kana should be displayed correctly in vertical text with broken font.
Test: fast/blockflow/japanese-rl-text-with-broken-font.html
* platform/graphics/Font.cpp:
(WebCore::Font::isCJKIdeographOrSymbol): add katakana, hiraganna, and Halfwidth and Fullwidth Forms
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74096 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3cbb829..8580318 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-14 Koan-Sin Tan <koansin.tan at gmail.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Kana should be part of CJK Ideographs in WebCore/platform/graphics/Font.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=51012
+
+ Test if kana displayed correctly in vertical text with broken font.
+
+ * fast/blockflow/japanese-rl-text-with-broken-font.html: Added.
+ * platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.checksum: Added.
+ * platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.png: Added.
+ * platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.txt: Added.
+
2010-12-14 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/blockflow/japanese-rl-text-with-broken-font.html b/LayoutTests/fast/blockflow/japanese-rl-text-with-broken-font.html
new file mode 100644
index 0000000..8099b15
--- /dev/null
+++ b/LayoutTests/fast/blockflow/japanese-rl-text-with-broken-font.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html style="border:10px solid maroon; -webkit-writing-mode:vertical-rl">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<style>
+ at font-face {
+ src: url(resources/MakibaFont13.ttf);
+ font-family: MakibaFace;
+}
+body {
+ font-family: "MakibaFace";
+ font-size: 16pt;
+}
+</style>
+</head>
+<body style="border:5px solid black;">
+せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますかならタイトルとアドレスだけでなく、訪問したウェブページのコンテンツからも検索することができます。せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますか ならタイトルとアドレスだけでなく、訪問したウェブページのコンテンツからも検索することができます。訪問したウェブページのコンテンツからも検索することができます。せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますか ならタイトルとアドレスだけでなく、訪問
+</body>
diff --git a/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.checksum b/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.checksum
new file mode 100644
index 0000000..e7fd120
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.checksum
@@ -0,0 +1 @@
+c0bf09a1b46364e1cada43754fbe52f9
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.png b/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.png
new file mode 100644
index 0000000..aaf662d
Binary files /dev/null and b/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.txt b/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.txt
new file mode 100644
index 0000000..6d5801c
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/blockflow/japanese-rl-text-with-broken-font-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (523,0) size 277x600
+ RenderBlock {HTML} at (0,0) size 277x600 [border: (10px solid #800000)]
+ RenderBody {BODY} at (18,18) size 241x564 [border: (5px solid #000000)]
+ RenderText {#text} at (5,5) size 231x546
+ text run at (5,5) width 546: "\x{305B}\x{3063}\x{304B}\x{304F}\x{898B}\x{3064}\x{3051}\x{305F}\x{3059}\x{3070}\x{3089}\x{3057}\x{3044}\x{8A18}\x{4E8B}\x{304C}\x{3069}\x{3053}\x{306B}\x{3042}\x{3063}\x{305F}\x{304B}\x{5FD8}\x{308C}\x{3066}"
+ text run at (26,5) width 546: "\x{3057}\x{307E}\x{3063}\x{305F}\x{7D4C}\x{9A13}\x{306F}\x{3042}\x{308A}\x{307E}\x{3059}\x{304B}\x{306A}\x{3089}\x{30BF}\x{30A4}\x{30C8}\x{30EB}\x{3068}\x{30A2}\x{30C9}\x{30EC}\x{30B9}\x{3060}\x{3051}\x{3067}"
+ text run at (47,5) width 546: "\x{306A}\x{304F}\x{3001}\x{8A2A}\x{554F}\x{3057}\x{305F}\x{30A6}\x{30A7}\x{30D6}\x{30DA}\x{30FC}\x{30B8}\x{306E}\x{30B3}\x{30F3}\x{30C6}\x{30F3}\x{30C4}\x{304B}\x{3089}\x{3082}\x{691C}\x{7D22}\x{3059}\x{308B}"
+ text run at (68,5) width 546: "\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002}\x{305B}\x{3063}\x{304B}\x{304F}\x{898B}\x{3064}\x{3051}\x{305F}\x{3059}\x{3070}\x{3089}\x{3057}\x{3044}\x{8A18}\x{4E8B}\x{304C}\x{3069}\x{3053}"
+ text run at (89,5) width 536: "\x{306B}\x{3042}\x{3063}\x{305F}\x{304B}\x{5FD8}\x{308C}\x{3066}\x{3057}\x{307E}\x{3063}\x{305F}\x{7D4C}\x{9A13}\x{306F}\x{3042}\x{308A}\x{307E}\x{3059}\x{304B} \x{306A}\x{3089}\x{30BF}\x{30A4}\x{30C8}"
+ text run at (110,5) width 546: "\x{30EB}\x{3068}\x{30A2}\x{30C9}\x{30EC}\x{30B9}\x{3060}\x{3051}\x{3067}\x{306A}\x{304F}\x{3001}\x{8A2A}\x{554F}\x{3057}\x{305F}\x{30A6}\x{30A7}\x{30D6}\x{30DA}\x{30FC}\x{30B8}\x{306E}\x{30B3}\x{30F3}\x{30C6}"
+ text run at (131,5) width 546: "\x{30F3}\x{30C4}\x{304B}\x{3089}\x{3082}\x{691C}\x{7D22}\x{3059}\x{308B}\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002}\x{8A2A}\x{554F}\x{3057}\x{305F}\x{30A6}\x{30A7}\x{30D6}\x{30DA}\x{30FC}"
+ text run at (152,5) width 546: "\x{30B8}\x{306E}\x{30B3}\x{30F3}\x{30C6}\x{30F3}\x{30C4}\x{304B}\x{3089}\x{3082}\x{691C}\x{7D22}\x{3059}\x{308B}\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002}\x{305B}\x{3063}\x{304B}\x{304F}"
+ text run at (173,5) width 546: "\x{898B}\x{3064}\x{3051}\x{305F}\x{3059}\x{3070}\x{3089}\x{3057}\x{3044}\x{8A18}\x{4E8B}\x{304C}\x{3069}\x{3053}\x{306B}\x{3042}\x{3063}\x{305F}\x{304B}\x{5FD8}\x{308C}\x{3066}\x{3057}\x{307E}\x{3063}\x{305F}"
+ text run at (194,5) width 536: "\x{7D4C}\x{9A13}\x{306F}\x{3042}\x{308A}\x{307E}\x{3059}\x{304B} \x{306A}\x{3089}\x{30BF}\x{30A4}\x{30C8}\x{30EB}\x{3068}\x{30A2}\x{30C9}\x{30EC}\x{30B9}\x{3060}\x{3051}\x{3067}\x{306A}\x{304F}\x{3001}"
+ text run at (215,5) width 42: "\x{8A2A}\x{554F}"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ebe2aaa..65aeade 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-14 Koan-Sin Tan <koansin.tan at gmail.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Kana should be part of CJK Ideographs in WebCore/platform/graphics/Font.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=51012
+
+ Kana should be displayed correctly in vertical text with broken font.
+
+ Test: fast/blockflow/japanese-rl-text-with-broken-font.html
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::isCJKIdeographOrSymbol): add katakana, hiraganna, and Halfwidth and Fullwidth Forms
+
2010-12-14 Dan Bernstein <mitz at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/platform/graphics/Font.cpp b/WebCore/platform/graphics/Font.cpp
index 09b00f0..0c9ea39 100644
--- a/WebCore/platform/graphics/Font.cpp
+++ b/WebCore/platform/graphics/Font.cpp
@@ -398,6 +398,14 @@ bool Font::isCJKIdeographOrSymbol(UChar32 c)
if (c >= 0x3000 && c <= 0x303F)
return true;
+ // Hiragana
+ if (c >= 0x3040 && c <= 0x309F)
+ return true;
+
+ // Katakana
+ if (c >= 0x30A0 && c <= 0x30FF)
+ return true;
+
// Bopomofo
if (c >= 0x3100 && c <= 0x312F)
return true;
@@ -418,6 +426,11 @@ bool Font::isCJKIdeographOrSymbol(UChar32 c)
if (c >= 0xFE30 && c <= 0xFE4F)
return true;
+ // Halfwidth and Fullwidth Forms
+ // Usually only used in CJK
+ if (c >= 0xFF00 && c <= 0xFFEF)
+ return true;
+
// Emoji.
if (c >= 0x1F200 && c <= 0x1F6F)
return true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list