1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
From 2c4d3c61aa33f3169e7923ea3433c71e3df0952f Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@chromium.org>
Date: Mon, 7 Nov 2022 22:08:05 +0000
Subject: [PATCH 1/2] Prepare for ICU72 landing
The date format may output U+202F Narrow SPACE between time
and AM/PM. So switch to use UTF8 and not restrict to ASCII which
will break when the output is not only ASCII.
Bug: 1371208
Change-Id: I05f9daadfba5c45d618f15ae23340da373f2f36a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4007076
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1068343}
(cherry picked from commit ce2ffed84b95e2b7c068d6f066d86cd034212425)
---
.../safe_browsing/content/browser/web_ui/safe_browsing_ui.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
index 92597a9d3a4..e6e7514a082 100644
--- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
@@ -457,7 +457,7 @@ namespace {
std::string UserReadableTimeFromMillisSinceEpoch(int64_t time_in_milliseconds) {
base::Time time =
base::Time::UnixEpoch() + base::Milliseconds(time_in_milliseconds);
- return base::UTF16ToASCII(base::TimeFormatShortDateAndTime(time));
+ return base::UTF16ToUTF8(base::TimeFormatShortDateAndTime(time));
}
void AddStoreInfo(const DatabaseManagerInfo::DatabaseInfo::StoreInfo store_info,
From 8ba9d96da703978655cddf07d58b0a15f0a43a10 Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@chromium.org>
Date: Tue, 8 Nov 2022 00:13:16 +0000
Subject: [PATCH 2/2] Prepare the landing of ICU72/Unicode 15
See
https://www.unicode.org/emoji/charts-15.0/emoji-released.html
https://www.unicode.org/charts/PDF/U1F680.pdf
https://www.unicode.org/charts/PDF/U1FA70.pdf
for the newly added emoji to
Transport and Map Symbols
Symbols and Pictographs Extended-A blocks.
Update the kIsCJKIdeographOrSymbolRanges to Unicode 15
Needed to avoid test breakage of
CharacterTest.HammerEmojiVsCJKIdeographOrSymbol
Bug: 1371208
Change-Id: Ic7b319ba18f3aded46b252d8b484e3b1bc43eff4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4007098
Reviewed-by: Stephen Chenney <schenney@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1068422}
(cherry picked from commit d93a774bf6fac8ddaaa1041ea6ad2dd8e5ff4539)
---
.../platform/text/character_property_data.h | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/third_party/blink/renderer/platform/text/character_property_data.h b/third_party/blink/renderer/platform/text/character_property_data.h
index 9005c20a379..ee690563c28 100644
--- a/third_party/blink/renderer/platform/text/character_property_data.h
+++ b/third_party/blink/renderer/platform/text/character_property_data.h
@@ -107,7 +107,7 @@ static const UChar32 kIsCJKIdeographOrSymbolRanges[] = {
0x1F3FB, 0x1F3FF,
// Transport
- 0x1F6DD, 0x1F6DF,
+ 0x1F6DC, 0x1F6DF,
// Colored circles and squares for use with emoji.
0x1F7E0, 0x1F7EB,
@@ -118,25 +118,25 @@ static const UChar32 kIsCJKIdeographOrSymbolRanges[] = {
0x1F900, 0x1F90F,
// ZIPPER-MOUTH FACE...SIGN OF THE HORNS
0x1F910, 0x1F918, 0x1F919, 0x1F97F, 0x1F980, 0x1F9BF, 0x1F9C0, 0x1F9FF,
- // Clothing
- 0x1FA70, 0x1FA74,
- // Medical symbols
- 0x1FA78, 0x1FA7C,
+ // Clothing, heart and Medical symbols
+ 0x1FA70, 0x1FA7C,
// Toys and sport symbols
- 0x1FA80, 0x1FA86,
+ 0x1FA80, 0x1FA88,
// Miscellaneous objects
- 0x1FA90, 0x1FAAC,
// Animals and nature
- 0x1FAB0, 0x1FABA,
+ 0x1FA90, 0x1FABD,
+ // Animal
// Body parts
// People
- 0x1FAC0, 0x1FAC5,
+ 0x1FABF, 0x1FAC5,
+ // animal-mammal
+ 0x1FACE, 0x1FACF,
// Food and drink
- 0x1FAD0, 0x1FAD9,
+ 0x1FAD0, 0x1FADB,
// Face
- 0x1FAE0, 0x1FAE7,
+ 0x1FAE0, 0x1FAE8,
// Hand
- 0x1FAF0, 0x1FAF6,
+ 0x1FAF0, 0x1FAF8,
};
// https://html.spec.whatwg.org/C/#prod-potentialcustomelementname
|