Source/core/platform/graphics/chromium/FontCacheAndroid.cpp - Issue 23503080: Pass DOM locale to Skia in FontCache::getFontDataForCharacter

Side by Side Diff

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

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

Side by Side Diff: Source/core/platform/graphics/chromium/FontCacheAndroid.cpp

Issue 23503080: Pass DOM locale to Skia in FontCache::getFontDataForCharacter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@fontcleanup

Patch Set: Created 7 years, 3 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 unified diff | Download patch

« ManualTests/font-fallback-locale.html ('K') | « Source/core/platform/graphics/FontDescription.cpp ('k') | no next file » | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2011 Google Inc. All rights reserved.	2 * Copyright (c) 2011 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 24 matching lines...) Expand all Loading...
35 #include "core/platform/graphics/FontDescription.h"	35 #include "core/platform/graphics/FontDescription.h"

36 #include "core/platform/graphics/SimpleFontData.h"	36 #include "core/platform/graphics/SimpleFontData.h"

37	37

38 #include "SkTypeface_android.h"	38 #include "SkTypeface_android.h"

39	39

40 namespace WebCore {	40 namespace WebCore {

41	41

42 PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c)	42 PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c)

43 {	43 {

44 SkString skiaFamilyName;	44 SkString skiaFamilyName;

45 if (!SkGetFallbackFamilyNameForChar(c, &skiaFamilyName) \|\| skiaFamilyName.is Empty())	45 if (!SkGetFallbackFamilyNameForChar(c, font.fontDescription().locale().strin g().ascii().data(), &skiaFamilyName)

	46 \|\| skiaFamilyName.isEmpty())

46 return 0;	47 return 0;

47 return getFontResourceData(getFontResourcePlatformData(font.fontDescription( ), AtomicString(skiaFamilyName.c_str()), DoNotRetain), DoNotRetain);	48 return getFontResourceData(getFontResourcePlatformData(font.fontDescription( ), AtomicString(skiaFamilyName.c_str()), DoNotRetain), DoNotRetain);

48 }	49 }

49	50

50 } // namespace WebCore	51 } // namespace WebCore

OLD	NEW