Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 17 matching lines...) Expand all Loading... | |
| 28 #include "platform/fonts/SimpleFontData.h" | 28 #include "platform/fonts/SimpleFontData.h" |
| 29 #include "public/platform/linux/WebFallbackFont.h" | 29 #include "public/platform/linux/WebFallbackFont.h" |
| 30 #include "public/platform/linux/WebSandboxSupport.h" | 30 #include "public/platform/linux/WebSandboxSupport.h" |
| 31 #include "public/platform/Platform.h" | 31 #include "public/platform/Platform.h" |
| 32 #include "ui/gfx/font_fallback_linux.h" | 32 #include "ui/gfx/font_fallback_linux.h" |
| 33 #include "wtf/text/CString.h" | 33 #include "wtf/text/CString.h" |
| 34 | 34 |
| 35 namespace blink { | 35 namespace blink { |
| 36 | 36 |
| 37 FontCache::FontCache() : m_purgePreventCount(0) { | 37 FontCache::FontCache() : m_purgePreventCount(0) { |
| 38 if (s_staticFontManager) { | 38 if (s_staticFontManager) { |
|
f(malita)
2017/01/09 15:25:34
I don't think we need to conditional anymore, just
bungeman-chromium
2017/01/09 19:15:28
Done.
| |
| 39 adopted(s_staticFontManager); | |
| 40 m_fontManager = sk_ref_sp(s_staticFontManager); | 39 m_fontManager = sk_ref_sp(s_staticFontManager); |
| 41 } else { | 40 } else { |
| 42 m_fontManager = nullptr; | 41 m_fontManager = nullptr; |
| 43 } | 42 } |
| 44 } | 43 } |
| 45 | 44 |
| 46 static AtomicString& mutableSystemFontFamily() { | 45 static AtomicString& mutableSystemFontFamily() { |
| 47 DEFINE_STATIC_LOCAL(AtomicString, systemFontFamily, ()); | 46 DEFINE_STATIC_LOCAL(AtomicString, systemFontFamily, ()); |
| 48 return systemFontFamily; | 47 return systemFontFamily; |
| 49 } | 48 } |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 167 std::unique_ptr<FontPlatformData> platformData( | 166 std::unique_ptr<FontPlatformData> platformData( |
| 168 new FontPlatformData(*substitutePlatformData)); | 167 new FontPlatformData(*substitutePlatformData)); |
| 169 platformData->setSyntheticBold(shouldSetSyntheticBold); | 168 platformData->setSyntheticBold(shouldSetSyntheticBold); |
| 170 platformData->setSyntheticItalic(shouldSetSyntheticItalic); | 169 platformData->setSyntheticItalic(shouldSetSyntheticItalic); |
| 171 return fontDataFromFontPlatformData(platformData.get(), DoNotRetain); | 170 return fontDataFromFontPlatformData(platformData.get(), DoNotRetain); |
| 172 } | 171 } |
| 173 | 172 |
| 174 #endif // !OS(ANDROID) | 173 #endif // !OS(ANDROID) |
| 175 | 174 |
| 176 } // namespace blink | 175 } // namespace blink |
| OLD | NEW |