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

Unified Diff: skia/skia_library.gypi

Issue 19477005: Improve Skia configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: skia/skia_library.gypi
===================================================================
--- skia/skia_library.gypi (revision 225491)
+++ skia/skia_library.gypi (working copy)
@@ -93,13 +93,12 @@
'../third_party/skia/src/ports/SkFontHost_mac.cpp',
'../third_party/skia/src/ports/SkFontHost_win.cpp',
'../third_party/skia/src/ports/SkFontHost_win_dw.cpp',
+ #'../third_party/skia/src/ports/SkFontMgr_default_dw.cpp',
'../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp',
'../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp',
'../third_party/skia/src/ports/SkOSFile_posix.cpp',
'../third_party/skia/src/ports/SkOSFile_stdio.cpp',
'../third_party/skia/src/ports/SkOSFile_win.cpp',
- '../third_party/skia/src/ports/SkThread_pthread.cpp',
bungeman-chromium 2013/09/26 22:42:46 The changes to this file would have to be done wit
- '../third_party/skia/src/ports/SkThread_win.cpp',
'../third_party/skia/src/ports/SkTime_Unix.cpp',
'../third_party/skia/src/ports/SkTLS_pthread.cpp',
'../third_party/skia/src/ports/SkTLS_win.cpp',
@@ -373,7 +372,6 @@
[ 'OS == "win"', {
'sources!': [
'../third_party/skia/src/ports/SkOSFile_posix.cpp',
- '../third_party/skia/src/ports/SkThread_pthread.cpp',
'../third_party/skia/src/ports/SkTime_Unix.cpp',
'../third_party/skia/src/ports/SkTLS_pthread.cpp',
],
@@ -387,6 +385,7 @@
},{ # not 'OS == "win"'
'sources!': [
'../third_party/skia/src/ports/SkFontHost_win_dw.cpp',
+ '../third_party/skia/src/ports/SkFontMgr_default_dw.cpp',
djsollen 2013/09/27 13:52:25 seems like this is unrelated to the rest of the CL
bungeman-skia 2013/09/27 17:59:13 Yes, I suppose I should remove these for this CL.
'../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp',
'../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp',

Powered by Google App Engine
This is Rietveld 408576698