Merge branch 'chrome/m67' into dev/update-m67
authorMatthew Leibowitz <mattleibow@live.com>
Wed, 27 Jun 2018 16:19:56 +0000 (18:19 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Wed, 27 Jun 2018 16:19:56 +0000 (18:19 +0200)
commit1f8a19aaf4492738b095889f38d2eb337684db2c
tree48aba3b24c557caee9bf4a920583bffd1c04940c
parentfc4ecd621b8fb95a0d922221d9fffa66e2bcece4
parentbaf6686f92df805d3e25e80a0f3c79597cb3a6a5
Merge branch 'chrome/m67' into dev/update-m67

# Conflicts:
# gn/core.gni
# gn/effects.gni
# infra/bots/gen_tasks.go
# infra/bots/tasks.json
# src/c/sk_effects.cpp
# src/core/SkBitmapDevice.cpp
# src/core/SkScalerContext.cpp
# src/gpu/ops/GrSmallPathRenderer.h
# src/ports/SkFontHost_mac.cpp
# src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp
13 files changed:
.gitignore
BUILD.gn
gn/BUILD.gn
gn/BUILDCONFIG.gn
gn/core.gni
gn/effects.gni
gn/toolchain/BUILD.gn
include/private/GrSurfaceProxy.h
src/ports/SkOSFile_win.cpp
src/utils/win/SkDWrite.cpp
src/xps/SkXPSDevice.cpp
tests/ProxyRefTest.cpp
third_party/freetype2/BUILD.gn