diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 17:13:19 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 17:13:19 +0000 |
| commit | 1d93409e598469c93aa3af3ec10f91b3478ade61 (patch) | |
| tree | 26e26e0705162b172c5bc191491234b5f3a64d98 /skia | |
| parent | 3a5031b87103fa7ea04158cc021bb95e60fa86c4 (diff) | |
| download | chromium_src-1d93409e598469c93aa3af3ec10f91b3478ade61.zip chromium_src-1d93409e598469c93aa3af3ec10f91b3478ade61.tar.gz chromium_src-1d93409e598469c93aa3af3ec10f91b3478ade61.tar.bz2 | |
Roll Skia DEPS to r10851
R=reed@google.com
Review URL: https://codereview.chromium.org/22999034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia_library.gypi | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 28f58ce..23e5b7c 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -118,6 +118,8 @@ '../third_party/skia/src/ports/SkFontConfigParser_android.cpp', '../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_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', @@ -156,6 +158,11 @@ '../third_party/skia/src/utils/SkProxyCanvas.cpp', '../third_party/skia/src/utils/SkRTConf.cpp', '../third_party/skia/include/utils/SkRTConf.h', + '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp', + '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h', + '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp', + '../third_party/skia/src/utils/win/SkDWriteGeometrySink.h', + '../third_party/skia/src/utils/win/SkHRESULT.cpp', '../third_party/skia/include/pdf/SkPDFDevice.h', '../third_party/skia/include/pdf/SkPDFDocument.h', @@ -398,6 +405,24 @@ '../third_party/skia/src/ports/SkTime_Unix.cpp', '../third_party/skia/src/ports/SkTLS_pthread.cpp', ], + 'include_dirs': [ + '../third_party/skia/include/utils/win', + '../third_party/skia/src/utils/win', + ], + 'defines': [ + 'SK_FONTHOST_USES_FONTMGR', + ], + },{ # not 'OS == "win"' + 'sources!': [ + '../third_party/skia/src/ports/SkFontHost_win_dw.cpp', + '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp', + + '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp', + '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h', + '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp', + '../third_party/skia/src/utils/win/SkDWriteGeometrySink.h', + '../third_party/skia/src/utils/win/SkHRESULT.cpp', + ], }], # TODO(scottmg): http://crbug.com/177306 ['clang==1', { @@ -444,6 +469,7 @@ 'SKIA_IGNORE_GPU_MIPMAPS', + # this flag forces Skia not to use typographic metrics with GDI. 'SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS', 'SK_DEFAULT_FONT_CACHE_LIMIT=<(default_font_cache_limit)', |