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

Unified Diff: skia/SConscript

Issue 10414: Use Skia to render fonts (Closed)
Patch Set: Created 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | skia/ports/SkFontHost_FreeType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/SConscript
diff --git a/skia/SConscript b/skia/SConscript
index 283d3719f512f91365015d795c0b4395d4df6073..8dfd26a8b6b7d02ff916612afb62586a023726fb 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -154,6 +154,16 @@ input_files = [
'sgl/SkXfermode.cpp',
]
+if env['PLATFORM'] == 'posix':
+ # On Linux we use Skia to render fonts with FreeType and fontconfig
+ input_files.remove('sgl/SkTypeface_fake.cpp')
+ input_files.remove('ports/SkFontHost_none.cpp')
+ input_files.append('sgl/SkTypeface.cpp')
+ input_files.append('ports/SkFontHost_FreeType.cpp')
+ input_files.append('ports/SkFontHost_gamma.cpp')
+ input_files.append('ports/SkFontHost_fontconfig.cpp')
+ input_files.append('images/SkMMapStream.cpp')
+
if env['PLATFORM'] in ('darwin', 'posix'):
input_files.append('ports/SkThread_pthread.cpp')
« no previous file with comments | « no previous file | skia/ports/SkFontHost_FreeType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698