diff options
| author | Cary Clark <caryclark@google.com> | 2016-03-24 10:23:13 -0400 |
|---|---|---|
| committer | Cary Clark <caryclark@google.com> | 2016-03-24 10:23:13 -0400 |
| commit | cf6bffb79f6e62d096908e6629daba5525728272 (patch) | |
| tree | 06eb3f3712074025024a48b0f9f67a2c6eb2b144 /skia | |
| parent | ea10a0dcae1b593fa9d85ae867c19be5c34ca8ed (diff) | |
| download | pdfium-cf6bffb79f6e62d096908e6629daba5525728272.tar.xz | |
fix windows build; add blend modes
Use FreeType instead of Direct Write on Windows. Since PDFium
currently uses the graphics engine to draw but not to measure,
the graphics engine needs to always use FreeType to get
consistent metrics.
Add a translation from PDF's blend modes to Skia's xfer modes.
Turn on subpixel positioning for text to get more precise
glyph placement.
Pass the alpha through to get proper bitmap transparency.
Address earlier nits.
R=dsinclair@chromium.org, tsepez@chromium.org, dsinclair
Review URL: https://codereview.chromium.org/1812263002 .
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia_library.gypi | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index fea93a3abc..bd29a5a984 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -36,10 +36,6 @@ '../third_party/skia/src/ports/SkDiscardableMemory_none.cpp', '../third_party/skia/src/fonts/SkFontMgr_indirect.cpp', - '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', - - '../third_party/skia/src/ports/SkFontMgr_empty_factory.cpp', - '../third_party/skia/src/fonts/SkFontMgr_indirect.cpp', '../third_party/skia/src/fonts/SkRemotableFontMgr.cpp', '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp', @@ -52,7 +48,9 @@ "../third_party/skia/src/ports/SkFontMgr_android.cpp", "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp", '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp', - '../third_party/skia/src/ports/SkFontMgr_win_dw.cpp', + '../third_party/skia/src/ports/SkFontMgr_custom.cpp', + '../third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp', + '../third_party/skia/src/ports/SkGlobalInitialization_default.cpp', '../third_party/skia/src/ports/SkMemory_malloc.cpp', '../third_party/skia/src/ports/SkOSFile_posix.cpp', @@ -79,7 +77,6 @@ '../third_party/skia/src/utils/SkMD5.cpp', '../third_party/skia/src/utils/SkMeshUtils.cpp', '../third_party/skia/src/utils/SkNinePatch.cpp', - '../third_party/skia/src/utils/SkOSFile.cpp', '../third_party/skia/src/utils/SkParsePath.cpp', #windows @@ -112,6 +109,8 @@ '../third_party/skia/src/sfnt', '../third_party/skia/src/utils', '../third_party/skia/src/lazy', + # TODO(dsinclair): Right way to use third_party.gyp:fx_freetype? + '../third_party/freetype/include', ], 'conditions': [ ['skia_support_gpu != 0', { @@ -144,6 +143,9 @@ # Keeping _win.cpp "../third_party/skia/src/utils/SkThreadUtils_pthread.cpp", ], + 'dependencies': [ + '../third_party/third_party.gyp:fx_freetype' + ], },{ 'sources!': [ # Keeping _pthread.cpp @@ -169,10 +171,6 @@ '-Wno-unused', '-Wno-unused-function', ], - # TODO(dsinclair): Right way to use third_party.gyp:fx_freetype? - 'include_dirs': [ - '../third_party/freetype/include', - ], }], [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { 'sources!': [ @@ -182,7 +180,7 @@ '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp', ], }], - [ 'OS=="win" or OS=="mac" or OS=="ios"', { + [ 'OS=="mac" or OS=="ios"', { 'sources!': [ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', |