diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | skia/skia_library.gypi | 26 |
2 files changed, 28 insertions, 2 deletions
@@ -29,8 +29,8 @@ vars = { "ffmpeg_hash": "894e6f715645528e815aee2dad45b59704238dcd", "sfntly_revision": "134", - "skia_revision": "10840", - "skia_hash": "56b2bc64a1158b2c66e08853fdbc7939a8693810", + "skia_revision": "10851", + "skia_hash": "1a0c180c61757aedbc534afadaa6592813a03efd", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. 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)', |