| 1 |
commit: f2345c0af633116a69051239ab10d858d5aea69a |
| 2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 13 13:59:14 2017 +0000 |
| 4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 13 19:17:10 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2345c0a |
| 7 |
|
| 8 |
www-client/chromium: dev channel bump (59.0.3067.0) |
| 9 |
|
| 10 |
www-client/chromium/Manifest | 2 +- |
| 11 |
...0.3053.3.ebuild => chromium-59.0.3067.0.ebuild} | 19 +- |
| 12 |
.../chromium/files/chromium-system-icu-r1.patch | 224 +++++++++++++++++++++ |
| 13 |
3 files changed, 235 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 16 |
index 62ce4fb1584..1a62c850710 100644 |
| 17 |
--- a/www-client/chromium/Manifest |
| 18 |
+++ b/www-client/chromium/Manifest |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
DIST chromium-57.0.2987.133.tar.xz 525240460 SHA256 70011770a7e522c92826a3af48d3fd28a46bf8042897d072d20c748cbf828cf7 SHA512 b53fb357d3f11b45a46b3fe52a10b0d20cf8f3fedc8454ceca6b8d1ea9c526493cfeeb4472766e3f23ceba5cd53b089a2639d6a166fbfa91db05153571b59039 WHIRLPOOL 25854c4c1c9b9fde2c0bd9af7c374fe3fe78a19a34703cf54cb157a257c7408bf1bf58c199afbc16009e99bc4a3cdc578e907e78fc45bc781e59ab39b877c374 |
| 21 |
DIST chromium-58.0.3029.14.tar.xz 509043400 SHA256 b7a02ec45d61516552f7377bd066ee1d77a4ededc03c4c53c18373797dc8d8c4 SHA512 b84c422965c694eee4159bd4f8c102fda5e7d8012adf195c2882f9ef3030a0433fac666de85bfcdd4e635d82a57dfa9f3d4e8000dfb8ada2e068348190a4524c WHIRLPOOL dc47733b3344f58fa1a3bc3f1dcac5088d9bbfcffa1c395547ff42367d2164f51cced3f9ad4afc7157834339dbe3fbe6790c835345533c917013770fe11ebec7 |
| 22 |
DIST chromium-58.0.3029.19.tar.xz 509050504 SHA256 ffe5b52faf219bee7675460ac56b3d62a3ee9fd2001f4a854224a1445b8af5e6 SHA512 b1780d4920d14e4861b5e5895accf49d7b65d49345ec243d7d1042ca1d0246cb3b4fcfa383ea3a6ef9a2145bc526be71286af156051a058f4f699b64cce772cb WHIRLPOOL e5e57370aa06ef8ef7b1e923f684148a1035dc3c4282e6a327cbe4f6e7a472ed724e5c4edb3e5ea91ed3620ea6a9d9f23c5ddb52246ff840b7997e3b00bebc8a |
| 23 |
-DIST chromium-59.0.3053.3.tar.xz 516942144 SHA256 55126fa8954093d513a77191ff32b194647f119a0dfbf101c636e5d557c28252 SHA512 5a5d0f6d06ffbaf13e6e1e7442a86418f07ed00654926fad9ba1ae3458f0a67374da3a43d8235abd5a6db0827f57c25a631d537e6475c23488ffc272a65fbfee WHIRLPOOL 1df35cffa2160fdd95f834df10b6f6e07703b9070bd46b7d5631dca66ab0ec4b2d6d947ad9e0c80f0a8f6380b1bf9afd23df6842f827005638b6e710eda8aa3c |
| 24 |
DIST chromium-59.0.3063.4.tar.xz 519742312 SHA256 3ed3240fca23675f59d0bbf32884ba7c1b6d2288cf499b27d7792d499d8d6d60 SHA512 4dfb4948f4632f813b35eed3935cd771c435dce4dfbd77b698c6e7df7a19af037368293d2cd91d44353aa15de0c47cb809fa144258324116b8c18e2fde16ebff WHIRLPOOL cb183a61ce92d3e99befd2b7503100a63eaa64e33b8ae049571138cbe01d768757dc50555111d4ac11546d1cd8f73717d9904a794a3146c54d3afa1420986dc4 |
| 25 |
+DIST chromium-59.0.3067.0.tar.xz 519365816 SHA256 a8edc9aaa2cb24fc227740f4bc3585980c6e01c3a1117b7a77a7802b6c92767f SHA512 877f53f288ec865f623ad2cdbe70d4e2a3728d5af05252275931697041a86fff7e0a0a3ef228d9169ffd2edda7ed636f8dbe1bf1abed0b9900a857a0b86455fc WHIRLPOOL 98d816351e0e3f3ddad3fd11d57e70e9c9dd82d40376e08b6a8416dbf4500aa9eec9c0ad7ee760d7db85697863bd5834223c205273f37e0900d32c1aa7b7c237 |
| 26 |
|
| 27 |
diff --git a/www-client/chromium/chromium-59.0.3053.3.ebuild b/www-client/chromium/chromium-59.0.3067.0.ebuild |
| 28 |
similarity index 97% |
| 29 |
rename from www-client/chromium/chromium-59.0.3053.3.ebuild |
| 30 |
rename to www-client/chromium/chromium-59.0.3067.0.ebuild |
| 31 |
index 6ca1bccd1a2..e58a23908a2 100644 |
| 32 |
--- a/www-client/chromium/chromium-59.0.3053.3.ebuild |
| 33 |
+++ b/www-client/chromium/chromium-59.0.3067.0.ebuild |
| 34 |
@@ -93,6 +93,7 @@ RDEPEND="${COMMON_DEPEND} |
| 35 |
widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) |
| 36 |
" |
| 37 |
# dev-vcs/git - https://bugs.gentoo.org/593476 |
| 38 |
+# sys-apps/sandbox - https://crbug.com/586444 |
| 39 |
DEPEND="${COMMON_DEPEND} |
| 40 |
>=app-arch/gzip-1.7 |
| 41 |
!arm? ( |
| 42 |
@@ -104,6 +105,7 @@ DEPEND="${COMMON_DEPEND} |
| 43 |
dev-util/ninja |
| 44 |
net-libs/nodejs |
| 45 |
sys-apps/hwids[usb(+)] |
| 46 |
+ !<sys-apps/sandbox-2.11 |
| 47 |
>=sys-devel/bison-2.4.3 |
| 48 |
sys-devel/flex |
| 49 |
virtual/pkgconfig |
| 50 |
@@ -200,12 +202,12 @@ src_prepare() { |
| 51 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
| 52 |
"${FILESDIR}/${PN}-FORTIFY_SOURCE.patch" |
| 53 |
"${FILESDIR}/skia-avx2.patch" |
| 54 |
- "${FILESDIR}/${PN}-gn-bootstrap-r4.patch" |
| 55 |
"${FILESDIR}/${PN}-dma-buf-r1.patch" |
| 56 |
+ "${FILESDIR}/${PN}-system-ffmpeg-r5.patch" |
| 57 |
+ "${FILESDIR}/${PN}-system-libjpeg-r1.patch" |
| 58 |
+ "${FILESDIR}/${PN}-system-icu-r1.patch" |
| 59 |
) |
| 60 |
|
| 61 |
- use system-ffmpeg && PATCHES+=( "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" ) |
| 62 |
- |
| 63 |
default |
| 64 |
|
| 65 |
mkdir -p third_party/node/linux/node-linux-x64/bin || die |
| 66 |
@@ -255,6 +257,7 @@ src_prepare() { |
| 67 |
third_party/fips181 |
| 68 |
third_party/flatbuffers |
| 69 |
third_party/flot |
| 70 |
+ third_party/freetype |
| 71 |
third_party/google_input_tools |
| 72 |
third_party/google_input_tools/third_party/closure_library |
| 73 |
third_party/google_input_tools/third_party/closure_library/third_party/closure |
| 74 |
@@ -267,7 +270,6 @@ src_prepare() { |
| 75 |
third_party/leveldatabase |
| 76 |
third_party/libXNVCtrl |
| 77 |
third_party/libaddressinput |
| 78 |
- third_party/libdrm |
| 79 |
third_party/libjingle |
| 80 |
third_party/libphonenumber |
| 81 |
third_party/libsecret |
| 82 |
@@ -296,11 +298,9 @@ src_prepare() { |
| 83 |
third_party/pdfium/third_party/bigint |
| 84 |
third_party/pdfium/third_party/freetype |
| 85 |
third_party/pdfium/third_party/lcms2-2.6 |
| 86 |
- third_party/pdfium/third_party/libjpeg |
| 87 |
third_party/pdfium/third_party/libopenjpeg20 |
| 88 |
third_party/pdfium/third_party/libpng16 |
| 89 |
third_party/pdfium/third_party/libtiff |
| 90 |
- third_party/pdfium/third_party/zlib_v128 |
| 91 |
third_party/ply |
| 92 |
third_party/polymer |
| 93 |
third_party/protobuf |
| 94 |
@@ -353,6 +353,8 @@ src_configure() { |
| 95 |
# for development and debugging. |
| 96 |
myconf_gn+=" is_component_build=$(usex component-build true false)" |
| 97 |
|
| 98 |
+ myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
| 99 |
+ |
| 100 |
# Disable nacl, we can't build without pnacl (http://crbug.com/269560). |
| 101 |
myconf_gn+=" enable_nacl=false" |
| 102 |
|
| 103 |
@@ -370,6 +372,7 @@ src_configure() { |
| 104 |
flac |
| 105 |
harfbuzz-ng |
| 106 |
icu |
| 107 |
+ libdrm |
| 108 |
libjpeg |
| 109 |
libpng |
| 110 |
libwebp |
| 111 |
@@ -511,9 +514,7 @@ src_configure() { |
| 112 |
touch chrome/test/data/webui/i18n_process_css_test.html || die |
| 113 |
|
| 114 |
einfo "Configuring Chromium..." |
| 115 |
- # TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox. |
| 116 |
- tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn} use_allocator=\"none\"" || die |
| 117 |
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
| 118 |
+ tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die |
| 119 |
out/Release/gn gen --args="${myconf_gn}" out/Release || die |
| 120 |
} |
| 121 |
|
| 122 |
|
| 123 |
diff --git a/www-client/chromium/files/chromium-system-icu-r1.patch b/www-client/chromium/files/chromium-system-icu-r1.patch |
| 124 |
new file mode 100644 |
| 125 |
index 00000000000..6356467c21c |
| 126 |
--- /dev/null |
| 127 |
+++ b/www-client/chromium/files/chromium-system-icu-r1.patch |
| 128 |
@@ -0,0 +1,224 @@ |
| 129 |
+Index: third_party/WebKit/Source/platform/text/CharacterEmoji.cpp |
| 130 |
+diff --git a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp |
| 131 |
+index af051b46589bed421afd1da1e44623820c8f9136..60059d25dd808a0a55481d9bec3020b95175e45c 100644 |
| 132 |
+--- a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp |
| 133 |
++++ b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp |
| 134 |
+@@ -192,26 +192,26 @@ static void applyPatternAndFreeze(icu::UnicodeSet* unicodeSet, |
| 135 |
+ DCHECK_EQ(err, U_ZERO_ERROR); |
| 136 |
+ } |
| 137 |
+ |
| 138 |
+-bool Character::isEmoji(UChar32 ch) { |
| 139 |
+- return Character::isEmojiTextDefault(ch) || |
| 140 |
+- Character::isEmojiEmojiDefault(ch); |
| 141 |
++bool Character::IsEmoji(UChar32 ch) { |
| 142 |
++ return Character::IsEmojiTextDefault(ch) || |
| 143 |
++ Character::IsEmojiEmojiDefault(ch); |
| 144 |
+ } |
| 145 |
+ |
| 146 |
+-bool Character::isEmojiTextDefault(UChar32 ch) { |
| 147 |
++bool Character::IsEmojiTextDefault(UChar32 ch) { |
| 148 |
+ DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiTextSet, ()); |
| 149 |
+ if (emojiTextSet.isEmpty()) |
| 150 |
+ applyPatternAndFreeze(&emojiTextSet, kEmojiTextPattern); |
| 151 |
+- return emojiTextSet.contains(ch) && !isEmojiEmojiDefault(ch); |
| 152 |
++ return emojiTextSet.contains(ch) && !IsEmojiEmojiDefault(ch); |
| 153 |
+ } |
| 154 |
+ |
| 155 |
+-bool Character::isEmojiEmojiDefault(UChar32 ch) { |
| 156 |
++bool Character::IsEmojiEmojiDefault(UChar32 ch) { |
| 157 |
+ DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiEmojiSet, ()); |
| 158 |
+ if (emojiEmojiSet.isEmpty()) |
| 159 |
+ applyPatternAndFreeze(&emojiEmojiSet, kEmojiEmojiPattern); |
| 160 |
+ return emojiEmojiSet.contains(ch); |
| 161 |
+ } |
| 162 |
+ |
| 163 |
+-bool Character::isEmojiModifierBase(UChar32 ch) { |
| 164 |
++bool Character::IsEmojiModifierBase(UChar32 ch) { |
| 165 |
+ DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojieModifierBaseSet, ()); |
| 166 |
+ if (emojieModifierBaseSet.isEmpty()) |
| 167 |
+ applyPatternAndFreeze(&emojieModifierBaseSet, kEmojiModifierBasePattern); |
| 168 |
+Index: third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp |
| 169 |
+diff --git a/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp b/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp |
| 170 |
+index 55c4d36e8c217680da9131aac063e38ad3b1fe3d..f3000190d4473daf39f0bc7fe5c262c21ecca4a0 100644 |
| 171 |
+--- a/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp |
| 172 |
++++ b/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp |
| 173 |
+@@ -20,7 +20,7 @@ |
| 174 |
+ namespace blink { |
| 175 |
+ |
| 176 |
+ #if defined(USING_SYSTEM_ICU) |
| 177 |
+-static void generate(FILE*) {} |
| 178 |
++static void Generate(FILE*) {} |
| 179 |
+ #else |
| 180 |
+ |
| 181 |
+ const UChar32 kMaxCodepoint = 0x10FFFF; |
| 182 |
+Index: third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp |
| 183 |
+diff --git a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp |
| 184 |
+index 6d6f6f10e73dd6a413221d1e7f2d1e2a2d674e8b..ddf01cd9e2207bace2a0c4cab461750e86e0bf0d 100644 |
| 185 |
+--- a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp |
| 186 |
++++ b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp |
| 187 |
+@@ -63,16 +63,16 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameRegistrar registrar) { |
| 188 |
+ // apart; ICU treats these names as synonyms. |
| 189 |
+ registrar("ISO-8859-8-I", "ISO-8859-8-I"); |
| 190 |
+ |
| 191 |
+- int32_t num_encodings = ucnv_countAvailable(); |
| 192 |
+- for (int32_t i = 0; i < num_encodings; ++i) { |
| 193 |
++ int32_t nuencoding_s = ucnv_countAvailable(); |
| 194 |
++ for (int32_t i = 0; i < nuencoding_s; ++i) { |
| 195 |
+ const char* name = ucnv_getAvailableName(i); |
| 196 |
+ UErrorCode error = U_ZERO_ERROR; |
| 197 |
+ #if !defined(USING_SYSTEM_ICU) |
| 198 |
+ const char* primary_standard = "HTML"; |
| 199 |
+ const char* secondary_standard = "MIME"; |
| 200 |
+ #else |
| 201 |
+- const char* primaryStandard = "MIME"; |
| 202 |
+- const char* secondaryStandard = "IANA"; |
| 203 |
++ const char* primary_standard = "MIME"; |
| 204 |
++ const char* secondary_standard = "IANA"; |
| 205 |
+ #endif |
| 206 |
+ const char* standard_name = |
| 207 |
+ ucnv_getStandardName(name, primary_standard, &error); |
| 208 |
+@@ -94,20 +94,21 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameRegistrar registrar) { |
| 209 |
+ // encoding for encoding GB_2312-80 and several others. So, we need to |
| 210 |
+ // override this behavior, too. |
| 211 |
+ #if defined(USING_SYSTEM_ICU) |
| 212 |
+- if (!strcmp(standardName, "GB2312") || !strcmp(standardName, "GB_2312-80")) |
| 213 |
+- standardName = "GBK"; |
| 214 |
++ if (!strcmp(standard_name, "GB2312") || !strcmp(standard_name, "GB_2312-80")) { |
| 215 |
++ standard_name = "GBK"; |
| 216 |
+ // Similarly, EUC-KR encodings all map to an extended version, but |
| 217 |
+ // per HTML5, the canonical name still should be EUC-KR. |
| 218 |
+- else if (!strcmp(standardName, "EUC-KR") || |
| 219 |
+- !strcmp(standardName, "KSC_5601") || |
| 220 |
+- !strcmp(standardName, "cp1363")) |
| 221 |
+- standardName = "EUC-KR"; |
| 222 |
++ } else if (!strcmp(standard_name, "EUC-KR") || |
| 223 |
++ !strcmp(standard_name, "KSC_5601") || |
| 224 |
++ !strcmp(standard_name, "cp1363")) { |
| 225 |
++ standard_name = "EUC-KR"; |
| 226 |
+ // And so on. |
| 227 |
+- else if (!strcasecmp(standardName, "iso-8859-9")) |
| 228 |
++ } else if (!strcasecmp(standard_name, "iso-8859-9")) { |
| 229 |
+ // This name is returned in different case by ICU 3.2 and 3.6. |
| 230 |
+- standardName = "windows-1254"; |
| 231 |
+- else if (!strcmp(standardName, "TIS-620")) |
| 232 |
+- standardName = "windows-874"; |
| 233 |
++ standard_name = "windows-1254"; |
| 234 |
++ } else if (!strcmp(standard_name, "TIS-620")) { |
| 235 |
++ standard_name = "windows-874"; |
| 236 |
++ } |
| 237 |
+ #endif |
| 238 |
+ |
| 239 |
+ registrar(standard_name, standard_name); |
| 240 |
+@@ -229,8 +230,8 @@ void TextCodecICU::RegisterCodecs(TextCodecRegistrar registrar) { |
| 241 |
+ // See comment above in registerEncodingNames. |
| 242 |
+ registrar("ISO-8859-8-I", Create, 0); |
| 243 |
+ |
| 244 |
+- int32_t num_encodings = ucnv_countAvailable(); |
| 245 |
+- for (int32_t i = 0; i < num_encodings; ++i) { |
| 246 |
++ int32_t nuencoding_s = ucnv_countAvailable(); |
| 247 |
++ for (int32_t i = 0; i < nuencoding_s; ++i) { |
| 248 |
+ const char* name = ucnv_getAvailableName(i); |
| 249 |
+ UErrorCode error = U_ZERO_ERROR; |
| 250 |
+ const char* standard_name = ucnv_getStandardName(name, "MIME", &error); |
| 251 |
+@@ -272,7 +273,7 @@ void TextCodecICU::CreateICUConverter() const { |
| 252 |
+ DCHECK(!converter_icu_); |
| 253 |
+ |
| 254 |
+ #if defined(USING_SYSTEM_ICU) |
| 255 |
+- const char* name = m_encoding.name(); |
| 256 |
++ const char* name = encoding_.GetName(); |
| 257 |
+ m_needsGBKFallbacks = |
| 258 |
+ name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3]; |
| 259 |
+ #endif |
| 260 |
+@@ -393,16 +394,16 @@ String TextCodecICU::Decode(const char* bytes, |
| 261 |
+ // Chrome's copy of ICU does not have the issue described below. |
| 262 |
+ return result.ToString(); |
| 263 |
+ #else |
| 264 |
+- String resultString = result.toString(); |
| 265 |
++ String resultString = result.ToString(); |
| 266 |
+ |
| 267 |
+ // <http://bugs.webkit.org/show_bug.cgi?id=17014> |
| 268 |
+ // Simplified Chinese pages use the code A3A0 to mean "full-width space", but |
| 269 |
+ // ICU decodes it as U+E5E5. |
| 270 |
+- if (!strcmp(m_encoding.name(), "GBK")) { |
| 271 |
+- if (!strcasecmp(m_encoding.name(), "gb18030")) |
| 272 |
+- resultString.replace(0xE5E5, ideographicSpaceCharacter); |
| 273 |
++ if (!strcmp(encoding_.GetName(), "GBK")) { |
| 274 |
++ if (!strcasecmp(encoding_.GetName(), "gb18030")) |
| 275 |
++ resultString.Replace(0xE5E5, ideographicSpaceCharacter); |
| 276 |
+ // Make GBK compliant to the encoding spec and align with GB18030 |
| 277 |
+- resultString.replace(0x01F9, 0xE7C8); |
| 278 |
++ resultString.Replace(0x01F9, 0xE7C8); |
| 279 |
+ // FIXME: Once https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3 |
| 280 |
+ // is resolved, add U+1E3F => 0xE7C7. |
| 281 |
+ } |
| 282 |
+@@ -506,7 +507,7 @@ static void gbkCallbackEscape(const void* context, |
| 283 |
+ ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err); |
| 284 |
+ return; |
| 285 |
+ } |
| 286 |
+- numericEntityCallback(context, fromUArgs, codeUnits, length, codePoint, |
| 287 |
++ NumericEntityCallback(context, fromUArgs, codeUnits, length, codePoint, |
| 288 |
+ reason, err); |
| 289 |
+ } |
| 290 |
+ |
| 291 |
+@@ -525,7 +526,7 @@ static void gbkCssEscapedEntityCallack(const void* context, |
| 292 |
+ ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err); |
| 293 |
+ return; |
| 294 |
+ } |
| 295 |
+- cssEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint, |
| 296 |
++ CssEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint, |
| 297 |
+ reason, err); |
| 298 |
+ return; |
| 299 |
+ } |
| 300 |
+@@ -548,7 +549,7 @@ static void gbkUrlEscapedEntityCallack(const void* context, |
| 301 |
+ ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err); |
| 302 |
+ return; |
| 303 |
+ } |
| 304 |
+- urlEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint, |
| 305 |
++ UrlEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint, |
| 306 |
+ reason, err); |
| 307 |
+ return; |
| 308 |
+ } |
| 309 |
+@@ -622,7 +623,7 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input, |
| 310 |
+ 0, 0, &err); |
| 311 |
+ #else |
| 312 |
+ ucnv_setFromUCallBack( |
| 313 |
+- m_converterICU, m_needsGBKFallbacks ? gbkCallbackSubstitute |
| 314 |
++ converter_icu_, m_needsGBKFallbacks ? gbkCallbackSubstitute |
| 315 |
+ : UCNV_FROM_U_CALLBACK_SUBSTITUTE, |
| 316 |
+ 0, 0, 0, &err); |
| 317 |
+ #endif |
| 318 |
+@@ -633,8 +634,8 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input, |
| 319 |
+ &err); |
| 320 |
+ #else |
| 321 |
+ ucnv_setFromUCallBack( |
| 322 |
+- m_converterICU, |
| 323 |
+- m_needsGBKFallbacks ? gbkCallbackEscape : numericEntityCallback, 0, 0, |
| 324 |
++ converter_icu_, |
| 325 |
++ m_needsGBKFallbacks ? gbkCallbackEscape : NumericEntityCallback, 0, 0, |
| 326 |
+ 0, &err); |
| 327 |
+ #endif |
| 328 |
+ break; |
| 329 |
+@@ -643,9 +644,9 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input, |
| 330 |
+ ucnv_setFromUCallBack(converter_icu_, UrlEscapedEntityCallback, 0, 0, 0, |
| 331 |
+ &err); |
| 332 |
+ #else |
| 333 |
+- ucnv_setFromUCallBack(m_converterICU, |
| 334 |
++ ucnv_setFromUCallBack(converter_icu_, |
| 335 |
+ m_needsGBKFallbacks ? gbkUrlEscapedEntityCallack |
| 336 |
+- : urlEscapedEntityCallback, |
| 337 |
++ : UrlEscapedEntityCallback, |
| 338 |
+ 0, 0, 0, &err); |
| 339 |
+ #endif |
| 340 |
+ break; |
| 341 |
+@@ -654,9 +655,9 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input, |
| 342 |
+ ucnv_setFromUCallBack(converter_icu_, CssEscapedEntityCallback, 0, 0, 0, |
| 343 |
+ &err); |
| 344 |
+ #else |
| 345 |
+- ucnv_setFromUCallBack(m_converterICU, |
| 346 |
++ ucnv_setFromUCallBack(converter_icu_, |
| 347 |
+ m_needsGBKFallbacks ? gbkCssEscapedEntityCallack |
| 348 |
+- : cssEscapedEntityCallback, |
| 349 |
++ : CssEscapedEntityCallback, |
| 350 |
+ 0, 0, 0, &err); |
| 351 |
+ #endif |
| 352 |
+ break; |
Archives