diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
| commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
| tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc | |
| parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) | |
| download | qtwebengine-chromium-7961cea6d1041e3e454dae6a1da660b453efd238.tar.gz | |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc b/chromium/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc index 225e850f7c1..790da169577 100644 --- a/chromium/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc +++ b/chromium/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/fonts/opentype/font_settings.h" #include "third_party/blink/renderer/platform/fonts/web_font_decoder.h" #include "third_party/blink/renderer/platform/fonts/web_font_typeface_factory.h" -#include "third_party/blink/renderer/platform/shared_buffer.h" +#include "third_party/blink/renderer/platform/wtf/shared_buffer.h" #include "third_party/skia/include/core/SkStream.h" #include "third_party/skia/include/core/SkTypeface.h" @@ -137,7 +137,7 @@ FontPlatformData FontCustomPlatformData::GetFontPlatformData( italic && !base_typeface_->isItalic(), orientation); } -SkString FontCustomPlatformData::FamilyNameForInspector() const { +String FontCustomPlatformData::FamilyNameForInspector() const { SkTypeface::LocalizedStrings* font_family_iterator = base_typeface_->createFamilyNameIterator(); SkTypeface::LocalizedString localized_string; @@ -150,7 +150,8 @@ SkString FontCustomPlatformData::FamilyNameForInspector() const { } } font_family_iterator->unref(); - return localized_string.fString; + return String::FromUTF8(localized_string.fString.c_str(), + localized_string.fString.size()); } scoped_refptr<FontCustomPlatformData> FontCustomPlatformData::Create( |