diff options
| author | bungeman@chromium.org <bungeman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 13:33:24 +0000 |
|---|---|---|
| committer | bungeman@chromium.org <bungeman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 13:33:24 +0000 |
| commit | 15c7a712bf0f5769d1e690af81d48068ce7c32b0 (patch) | |
| tree | f98a9c3154e1d4379a762190ab4d0277cf33bbbb | |
| parent | 5050d7eaa6773b686268f6c4e15ede4a38f3d372 (diff) | |
| download | chromium_src-15c7a712bf0f5769d1e690af81d48068ce7c32b0.zip chromium_src-15c7a712bf0f5769d1e690af81d48068ce7c32b0.tar.gz chromium_src-15c7a712bf0f5769d1e690af81d48068ce7c32b0.tar.bz2 | |
Skia roll 4962140:b0b0feb
TBR=jvanverth@google.com
NOTRY=True
Review URL: https://codereview.chromium.org/316213005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275428 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/BUILD.gn | 6 | ||||
| -rw-r--r-- | skia/skia_gn_files.gypi | 6 | ||||
| -rw-r--r-- | skia/skia_library.gypi | 12 |
4 files changed, 21 insertions, 5 deletions
@@ -45,7 +45,7 @@ vars = { "lss_revision": "26", "sfntly_revision": "228", "lighttpd_revision": "33737", - "skia_revision": "4962140c9e6623b29417a2fb9ad903641fb0159c", + "skia_revision": "b0b0feb71f0841497c041aa4aca2b10e032224e0", # 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/BUILD.gn b/skia/BUILD.gn index b154e20..74f6843 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -331,11 +331,15 @@ component("skia") { } else { sources -= [ "//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/SkFontMgr_win_dw.cpp", "//third_party/skia/src/ports/SkOSFile_win.cpp", "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp", + "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp", + "//third_party/skia/src/ports/SkScalerContext_win_dw.h", "//third_party/skia/src/ports/SkTLS_win.cpp", + "//third_party/skia/src/ports/SkTypeface_win_dw.cpp", + "//third_party/skia/src/ports/SkTypeface_win_dw.h", ] } if (!is_android) { diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi index d9b404c..bcec6e8 100644 --- a/skia/skia_gn_files.gypi +++ b/skia/skia_gn_files.gypi @@ -31,17 +31,21 @@ '<(skia_src_path)/ports/SkFontHost_FreeType.cpp', '<(skia_src_path)/ports/SkFontHost_mac.cpp', '<(skia_src_path)/ports/SkFontHost_win.cpp', - '<(skia_src_path)/ports/SkFontHost_win_dw.cpp', '<(skia_src_path)/ports/SkFontMgr_default_gdi.cpp', + '<(skia_src_path)/ports/SkFontMgr_win_dw.cpp', '<(skia_src_path)/ports/SkGlobalInitialization_chromium.cpp', '<(skia_src_path)/ports/SkImageDecoder_empty.cpp', '<(skia_src_path)/ports/SkOSFile_posix.cpp', '<(skia_src_path)/ports/SkRemotableFontMgr_win_dw.cpp', '<(skia_src_path)/ports/SkOSFile_stdio.cpp', '<(skia_src_path)/ports/SkOSFile_win.cpp', + '<(skia_src_path)/ports/SkScalerContext_win_dw.cpp', + '<(skia_src_path)/ports/SkScalerContext_win_dw.h', '<(skia_src_path)/ports/SkTime_Unix.cpp', '<(skia_src_path)/ports/SkTLS_pthread.cpp', '<(skia_src_path)/ports/SkTLS_win.cpp', + '<(skia_src_path)/ports/SkTypeface_win_dw.cpp', + '<(skia_src_path)/ports/SkTypeface_win_dw.h', '<(skia_src_path)/sfnt/SkOTTable_name.cpp', '<(skia_src_path)/sfnt/SkOTTable_name.h', '<(skia_src_path)/sfnt/SkOTUtils.cpp', diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 9677b8a..a201518 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -51,15 +51,19 @@ '../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/SkFontMgr_win_dw.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/SkScalerContext_win_dw.cpp', + '../third_party/skia/src/ports/SkScalerContext_win_dw.h', '../third_party/skia/src/ports/SkTime_Unix.cpp', '../third_party/skia/src/ports/SkTLS_pthread.cpp', '../third_party/skia/src/ports/SkTLS_win.cpp', + '../third_party/skia/src/ports/SkTypeface_win_dw.cpp', + '../third_party/skia/src/ports/SkTypeface_win_dw.h', '../third_party/skia/src/sfnt/SkOTTable_name.cpp', '../third_party/skia/src/sfnt/SkOTTable_name.h', @@ -292,9 +296,13 @@ ], },{ # 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/ports/SkFontMgr_win_dw.cpp', '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp', + '../third_party/skia/src/ports/SkScalerContext_win_dw.cpp', + '../third_party/skia/src/ports/SkScalerContext_win_dw.h', + '../third_party/skia/src/ports/SkTypeface_win_dw.cpp', + '../third_party/skia/src/ports/SkTypeface_win_dw.h', '../third_party/skia/src/utils/win/SkDWrite.h', '../third_party/skia/src/utils/win/SkDWrite.cpp', |