summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-20 09:47:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-06-07 11:15:42 +0000
commit189d4fd8fad9e3c776873be51938cd31a42b6177 (patch)
tree6497caeff5e383937996768766ab3bb2081a40b2 /chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.cc
parent8bc75099d364490b22f43a7ce366b366c08f4164 (diff)
downloadqtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.cc')
-rw-r--r--chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.cc b/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.cc
index b3ba2c2d1d5..0305428c243 100644
--- a/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.cc
+++ b/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.cc
@@ -35,9 +35,11 @@
#include "third_party/blink/renderer/platform/wtf/text/case_map.h"
#include "third_party/blink/renderer/platform/wtf/text/character_names.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
+#include "third_party/blink/renderer/platform/wtf/text/string_utf8_adaptor.h"
#include "third_party/blink/renderer/platform/wtf/text/unicode.h"
#include "third_party/blink/renderer/platform/wtf/text/utf8.h"
#include "third_party/blink/renderer/platform/wtf/vector.h"
+#include "third_party/perfetto/include/perfetto/tracing/traced_value.h"
namespace WTF {
@@ -592,8 +594,9 @@ String String::FromUTF8(const LChar* string_start, size_t string_length) {
if (!length)
return g_empty_string;
- if (CharactersAreAllASCII(string_start, length))
- return StringImpl::Create(string_start, length);
+ ASCIIStringAttributes attributes = CharacterAttributes(string_start, length);
+ if (attributes.contains_only_ascii)
+ return StringImpl::Create(string_start, length, attributes);
Vector<UChar, 1024> buffer(length);
UChar* buffer_start = buffer.data();
@@ -639,4 +642,9 @@ void String::Show() const {
}
#endif
+void String::WriteIntoTracedValue(perfetto::TracedValue context) const {
+ StringUTF8Adaptor adaptor(*this);
+ std::move(context).WriteString(adaptor.data(), adaptor.size());
+}
+
} // namespace WTF