Merge branch 'chrome/m60' into update-m60
authorMatthew Leibowitz <mattleibow@live.com>
Thu, 10 Aug 2017 22:58:50 +0000 (00:58 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Thu, 10 Aug 2017 22:58:50 +0000 (00:58 +0200)
commit4094d9315c662f56f0befe685914257017390697
tree1039ec696a357d735f578f20b72ba9d631b4ab93
parent3ddc29e133e4394e05539916462b8d0551c74904
parentd1f2d15b36f6a6a9d199581b998a7ca924a1f1a8
Merge branch 'chrome/m60' into update-m60
BUILD.gn
gn/BUILD.gn
gn/core.gni
gn/effects.gni
include/core/SkDocument.h
src/core/SkConvertPixels.cpp
src/ports/SkFontMgr_win_dw.cpp
src/ports/SkOSFile_win.cpp
src/xps/SkXPSDevice.cpp