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

Side by Side Diff: Source/platform/fonts/win/FontCacheSkiaWin.cpp

Issue 205343010: Use FontPlatformDataHarfBuzz.h on Windows (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Computer, Inc. 2 * Copyright (C) 2006, 2007 Apple Computer, Inc.
3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 19 matching lines...) Expand all
30 */ 30 */
31 31
32 #include "config.h" 32 #include "config.h"
33 #include "platform/fonts/FontCache.h" 33 #include "platform/fonts/FontCache.h"
34 34
35 #include "RuntimeEnabledFeatures.h" 35 #include "RuntimeEnabledFeatures.h"
36 #include "SkFontMgr.h" 36 #include "SkFontMgr.h"
37 #include "SkTypeface_win.h" 37 #include "SkTypeface_win.h"
38 #include "platform/fonts/FontDescription.h" 38 #include "platform/fonts/FontDescription.h"
39 #include "platform/fonts/SimpleFontData.h" 39 #include "platform/fonts/SimpleFontData.h"
40 #include "platform/fonts/harfbuzz/FontPlatformDataHarfbuzz.h"
40 #include "platform/fonts/win/FontFallbackWin.h" 41 #include "platform/fonts/win/FontFallbackWin.h"
41 #include "platform/fonts/win/FontPlatformDataWin.h"
42 42
43 namespace WebCore { 43 namespace WebCore {
44 44
45 FontCache::FontCache() 45 FontCache::FontCache()
46 : m_purgePreventCount(0) 46 : m_purgePreventCount(0)
47 { 47 {
48 SkFontMgr* fontManager; 48 SkFontMgr* fontManager;
49 49
50 if (s_useDirectWrite) { 50 if (s_useDirectWrite) {
51 fontManager = SkFontMgr_New_DirectWrite(); 51 fontManager = SkFontMgr_New_DirectWrite();
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 name.data(), 206 name.data(),
207 fontSize, 207 fontSize,
208 fontDescription.weight() >= FontWeightBold && !tf->isBold() || fontDescr iption.isSyntheticBold(), 208 fontDescription.weight() >= FontWeightBold && !tf->isBold() || fontDescr iption.isSyntheticBold(),
209 fontDescription.style() == FontStyleItalic && !tf->isItalic() || fontDes cription.isSyntheticItalic(), 209 fontDescription.style() == FontStyleItalic && !tf->isItalic() || fontDes cription.isSyntheticItalic(),
210 fontDescription.orientation(), 210 fontDescription.orientation(),
211 s_useSubpixelPositioning); 211 s_useSubpixelPositioning);
212 return result; 212 return result;
213 } 213 }
214 214
215 } 215 }
OLDNEW
« no previous file with comments | « Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp ('k') | Source/platform/fonts/win/FontPlatformDataWin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698