Attachment #549394 for bug #661050

View | Details | Raw Unified | Return to bug 661050
Collapse All | Expand All





  size_t result_length = view.length() * sizeof(*source);
  std::string result(result_length, '\0');
  icu::UnicodeString utf16(unicodeSource, view.length());
  // ICU components for std::string compatibility are not enabled in build...
  bool done = false;
  while (!done) {
    icu::CheckedArrayByteSink sink(&result[0], result_length);
    utf16.toUTF8(sink);
    result_length = sink.NumberOfBytesAppended();
    result.resize(result_length);

}  // namespace

std::unique_ptr<StringBuffer> Utf8ToStringView(const std::string& message) {
  icu::UnicodeString utf16 =
    icu::UnicodeString::fromUTF8(icu::StringPiece(message.data(),
      message.length()));
  StringView view(reinterpret_cast<const uint16_t*>(utf16.getBuffer()),
                  utf16.length());
  return StringBuffer::create(view);

Lines 523-529 const char* GetVersion(const char* type, Link Here

(-)a/vendor/node/src/node_i18n.cc (-1 / +1 lines)
523	} else if (!strcmp(type, TYPE_UNICODE)) {	523	} else if (!strcmp(type, TYPE_UNICODE)) {
524	return U_UNICODE_VERSION;	524	return U_UNICODE_VERSION;
525	} else if (!strcmp(type, TYPE_TZ)) {	525	} else if (!strcmp(type, TYPE_TZ)) {
526	return TimeZone::getTZDataVersion(*status);	526	return icu::TimeZone::getTZDataVersion(*status);
527	} else if (!strcmp(type, TYPE_CLDR)) {	527	} else if (!strcmp(type, TYPE_CLDR)) {
528	UVersionInfo versionArray;	528	UVersionInfo versionArray;
529	ulocdata_getCLDRVersion(versionArray, status);	529	ulocdata_getCLDRVersion(versionArray, status);

Return to bug 661050

Lines 74-84 std::string StringViewToUtf8(const StringView& view) { Link Here

(-)a/vendor/node/src/inspector_io.cc (-4 / +5 lines)
74		74
75	size_t result_length = view.length() * sizeof(*source);	75	size_t result_length = view.length() * sizeof(*source);
76	std::string result(result_length, '\0');	76	std::string result(result_length, '\0');
77	UnicodeString utf16(unicodeSource, view.length());	77	icu::UnicodeString utf16(unicodeSource, view.length());
78	// ICU components for std::string compatibility are not enabled in build...	78	// ICU components for std::string compatibility are not enabled in build...
79	bool done = false;	79	bool done = false;
80	while (!done) {	80	while (!done) {
81	CheckedArrayByteSink sink(&result[0], result_length);	81	icu::CheckedArrayByteSink sink(&result[0], result_length);
82	utf16.toUTF8(sink);	82	utf16.toUTF8(sink);
83	result_length = sink.NumberOfBytesAppended();	83	result_length = sink.NumberOfBytesAppended();
84	result.resize(result_length);	84	result.resize(result_length);
Lines 111-118 void ReleasePairOnAsyncClose(uv_handle_t* async) { Link Here
111	} // namespace	111	} // namespace
112		112
113	std::unique_ptr<StringBuffer> Utf8ToStringView(const std::string& message) {	113	std::unique_ptr<StringBuffer> Utf8ToStringView(const std::string& message) {
114	UnicodeString utf16 =	114	icu::UnicodeString utf16 =
115	UnicodeString::fromUTF8(StringPiece(message.data(), message.length()));	115	icu::UnicodeString::fromUTF8(icu::StringPiece(message.data(),
		116	message.length()));
116	StringView view(reinterpret_cast<const uint16_t*>(utf16.getBuffer()),	117	StringView view(reinterpret_cast<const uint16_t*>(utf16.getBuffer()),
117	utf16.length());	118	utf16.length());
118	return StringBuffer::create(view);	119	return StringBuffer::create(view);