Skip to content

GitLab

T
tangled
Commit 15c7a712 authored by bungeman@chromium.org's avatar bungeman@chromium.org
Browse files
Options

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
parent 5050d7ea
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 5 deletions
DEPS
View file @ 15c7a712
......@@ -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.
......
skia/BUILD.gn
View file @ 15c7a712
......@@ -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) {
......
skia/skia_gn_files.gypi
View file @ 15c7a712
......@@ -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',
......
skia/skia_library.gypi
View file @ 15c7a712
......@@ -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',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment