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

Side by Side Diff: Source/core/platform/graphics/skia/FontCacheSkia.cpp

Issue 48113009: Move Font related classes to Source/platform/fonts (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix mac export Created 7 years, 1 month 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) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (c) 2006, 2007, 2008, 2009 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 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 32
33 #include "SkFontMgr.h" 33 #include "SkFontMgr.h"
34 #include "SkTypeface.h" 34 #include "SkTypeface.h"
35 #include "core/platform/graphics/AlternateFontFamily.h" 35 #include "core/platform/graphics/AlternateFontFamily.h"
36 #include "core/platform/graphics/Font.h" 36 #include "core/platform/graphics/Font.h"
37 #include "core/platform/graphics/FontCache.h" 37 #include "core/platform/graphics/FontCache.h"
38 #include "core/platform/graphics/FontDescription.h"
39 #include "core/platform/graphics/SimpleFontData.h" 38 #include "core/platform/graphics/SimpleFontData.h"
40 #include "platform/NotImplemented.h" 39 #include "platform/NotImplemented.h"
40 #include "platform/fonts/FontDescription.h"
41 #include "wtf/Assertions.h" 41 #include "wtf/Assertions.h"
42 #include "wtf/text/AtomicString.h" 42 #include "wtf/text/AtomicString.h"
43 #include "wtf/text/CString.h" 43 #include "wtf/text/CString.h"
44 #include <unicode/locid.h> 44 #include <unicode/locid.h>
45 45
46 namespace WebCore { 46 namespace WebCore {
47 47
48 void FontCache::platformInit() 48 void FontCache::platformInit()
49 { 49 {
50 } 50 }
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 name.data(), 174 name.data(),
175 fontSize, 175 fontSize,
176 fontDescription.weight() >= FontWeightBold && !tf->isBold(), 176 fontDescription.weight() >= FontWeightBold && !tf->isBold(),
177 fontDescription.italic() && !tf->isItalic(), 177 fontDescription.italic() && !tf->isItalic(),
178 fontDescription.orientation()); 178 fontDescription.orientation());
179 return result; 179 return result;
180 } 180 }
181 #endif // !OS(WINDOWNS) 181 #endif // !OS(WINDOWNS)
182 182
183 } // namespace WebCore 183 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698