third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp - Issue 2161683002: Add LayoutLocale class

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

Issue 2161683002: Add LayoutLocale class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: unittest fix Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/platform/fonts/FontLocale.h ('K') | « third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaperTest.cpp ('k') | third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

index f1f34e3cc1be7d9fb10921a900ce57182250f7eb..91b815ec73495f5d5aecc4b9888199847b3a3ce3 100644

--- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

+++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

@@ -558,9 +558,7 @@ PassRefPtr<ShapeResult> HarfBuzzShaper::shapeResult()

HarfBuzzScopedPtr<hb_buffer_t> harfBuzzBuffer(hb_buffer_create(), hb_buffer_destroy);

const FontDescription& fontDescription = m_font->getFontDescription();

- const String& localeString = fontDescription.locale();

- CString locale = localeString.latin1();

- const hb_language_t language = hb_language_from_string(locale.data(), locale.length());

+ const hb_language_t language = static_cast<const hb_language_t>(fontDescription.localeOrDefault().harfbuzzLanguage());

bool needsCapsHandling = fontDescription.variantCaps() != FontDescription::CapsNormal;

OpenTypeCapsSupport capsSupport;

@@ -649,7 +647,7 @@ PassRefPtr<ShapeResult> HarfBuzzShaper::shapeResult()

CaseMappingHarfBuzzBufferFiller(

caseMapIntend,

- fontDescription.locale(),

+ fontDescription.localeOrDefault().localeString(),

harfBuzzBuffer.get(),

m_normalizedBuffer.get(),

m_normalizedBufferLength,