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

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

Issue 1685053002: blink fonts: Load Android SkFontMgr on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@windows_change
Patch Set: Addressed nyquist's comments. Created 4 years, 10 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 14 matching lines...) Expand all
25 #include "platform/fonts/FontCache.h" 25 #include "platform/fonts/FontCache.h"
26 26
27 #include "public/platform/linux/WebFallbackFont.h" 27 #include "public/platform/linux/WebFallbackFont.h"
28 #include "public/platform/linux/WebFontInfo.h" 28 #include "public/platform/linux/WebFontInfo.h"
29 #include "public/platform/linux/WebSandboxSupport.h" 29 #include "public/platform/linux/WebSandboxSupport.h"
30 #include "public/platform/Platform.h" 30 #include "public/platform/Platform.h"
31 #include "wtf/text/CString.h" 31 #include "wtf/text/CString.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 FontCache::FontCache()
36 : m_purgePreventCount(0)
37 {
38 if (s_fontManager) {
39 adopted(s_fontManager);
40 m_fontManager = s_fontManager;
41 } else {
42 m_fontManager = nullptr;
43 }
44 }
45
35 void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, Font Cache::PlatformFallbackFont* fallbackFont) 46 void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, Font Cache::PlatformFallbackFont* fallbackFont)
36 { 47 {
37 WebFallbackFont webFallbackFont; 48 WebFallbackFont webFallbackFont;
38 if (Platform::current()->sandboxSupport()) 49 if (Platform::current()->sandboxSupport())
39 Platform::current()->sandboxSupport()->getFallbackFontForCharacter(c, pr eferredLocale, &webFallbackFont); 50 Platform::current()->sandboxSupport()->getFallbackFontForCharacter(c, pr eferredLocale, &webFallbackFont);
40 else 51 else
41 WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont); 52 WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont);
42 fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name)); 53 fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name));
43 fallbackFont->filename = webFallbackFont.filename; 54 fallbackFont->filename = webFallbackFont.filename;
44 fallbackFont->fontconfigInterfaceId = webFallbackFont.fontconfigInterfaceId; 55 fallbackFont->fontconfigInterfaceId = webFallbackFont.fontconfigInterfaceId;
45 fallbackFont->ttcIndex = webFallbackFont.ttcIndex; 56 fallbackFont->ttcIndex = webFallbackFont.ttcIndex;
46 fallbackFont->isBold = webFallbackFont.isBold; 57 fallbackFont->isBold = webFallbackFont.isBold;
47 fallbackFont->isItalic = webFallbackFont.isItalic; 58 fallbackFont->isItalic = webFallbackFont.isItalic;
48 } 59 }
49 60
50 } // namespace blink 61 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698