Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: Source/platform/fonts/linux/FontCacheLinux.cpp

Issue 307243002: Fix font family based fallback font selection (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Windows link fix. Created 6 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 19 matching lines...) Expand all
30 #include "public/platform/linux/WebFontInfo.h" 30 #include "public/platform/linux/WebFontInfo.h"
31 #include "public/platform/linux/WebSandboxSupport.h" 31 #include "public/platform/linux/WebSandboxSupport.h"
32 #include "public/platform/Platform.h" 32 #include "public/platform/Platform.h"
33 #include "wtf/text/CString.h" 33 #include "wtf/text/CString.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, Font Cache::PlatformFallbackFont* fallbackFont) 37 void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, Font Cache::PlatformFallbackFont* fallbackFont)
38 { 38 {
39 blink::WebFallbackFont webFallbackFont; 39 blink::WebFallbackFont webFallbackFont;
40 if (blink::Platform::current()->sandboxSupport()) { 40 if (blink::Platform::current()->sandboxSupport())
41 blink::Platform::current()->sandboxSupport()->getFallbackFontForCharacte r(c, preferredLocale, &webFallbackFont); 41 blink::Platform::current()->sandboxSupport()->getFallbackFontForCharacte r(c, preferredLocale, &webFallbackFont);
42 } else { 42 else
43 blink::WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallback Font); 43 blink::WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallback Font);
44 }
45 fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name)); 44 fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name));
46 fallbackFont->filename = webFallbackFont.filename; 45 fallbackFont->filename = webFallbackFont.filename;
46 fallbackFont->fontconfigInterfaceId = webFallbackFont.fontconfigInterfaceId;
47 fallbackFont->ttcIndex = webFallbackFont.ttcIndex; 47 fallbackFont->ttcIndex = webFallbackFont.ttcIndex;
48 fallbackFont->isBold = webFallbackFont.isBold; 48 fallbackFont->isBold = webFallbackFont.isBold;
49 fallbackFont->isItalic = webFallbackFont.isItalic; 49 fallbackFont->isItalic = webFallbackFont.isItalic;
50 } 50 }
51 51
52 } 52 }
OLDNEW
« no previous file with comments | « Source/platform/fonts/android/FontCacheAndroid.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698