Manual roll external/skia 8f3d36c..cd8689f
https://skia.googlesource.com/skia.git/+log/8f3d36c..cd8689f
cd8689f Roll third_party/externals/angle2 3fd614d06e50..f0e3c19a0c02 (1 commits)
df99a9f Roll skia/third_party/skcms f1e2b45d18fa..b2fffd2ecf2e (1 commits)
340818e add more tests for SkCubicMap
14884cd Beautify GlyphTransform sample.
cbd83bb don't adapt gray colors to 565
767fddf Roll third_party/externals/angle2 c1551dc2a7dc..3fd614d06e50 (2 commits)
64703d1 Roll recipe dependencies (trivial).
77af386 [sksg] Explicit text alignment
d4c1d35 Roll recipe dependencies (trivial).
cf7258a add bench for cubicmap
e49966c Roll third_party/externals/angle2 21e5e85a4976..c1551dc2a7dc (1 commits)
0251b1b fix SkPath documentation
04d1632 Add internal tree implementation to EdgeList.
f8bfdde Roll recipe dependencies (trivial).
a0ba612 [PathKit] Adding test infrastructure to support Gold output
004669b Roll recipe dependencies (trivial).
084d996 [PathKit] Fix bindings to account for SkPath methods returning this
b631742 return this from maker calls, so we can chain the calls
31a0944 Roll recipe dependencies (trivial).
c97a339 added optimizations to speed up skinning
137ca52 Remove prePathMatrix from SkDevice::drawPath
916c498 Consolidate the scissor enums into one "GrScissorTest" enum
49bb9c1 Roll third_party/externals/angle2 2363356f52f6..21e5e85a4976 (1 commits)
572eee0 Roll recipe dependencies (trivial).
d4bffed Update CCPRGeometry to use pool for op.
41f7bcf Roll recipe dependencies (trivial).
0d4a183 add tests for cubicmap
7f25670 Roll third_party/externals/angle2 35bc74d6d139..2363356f52f6 (1 commits)
6a2a197 implement SkConvertPixels color xform with steps
0edad3e inline strcmp for faster json parsing
aa166bd Update FreeType to use isSubpixel and isVertical.
cdbb076 Roll recipe dependencies (trivial).
ba6f533 Implement SubPixel mode support for FreeType COLR/CPAL
e4643cc Remove unused parameter from drawPathWithMaskFilter
d19fed1 [skottie] Eliminate some temp SkString allocations
e28c791 pass sprite opacity to color xform when blitting.
32c7d4d Roll third_party/externals/swiftshader 378c434627aa..80ab360d2622 (1 commits)
Test: Presubmit checks will test this change.
Manual roll due to the following conflicts:
src/core/SkBlitter_Sprite.cpp:
<<<<<<<<<<<<<<<<<<HEAD
fAlloc->make<SkColorSpaceXformSteps>(srcCS, kPremul_SkAlphaType,
==================
auto srcAT = fSource.isOpaque() ? kOpaque_SkAlphaType
: kPremul_SkAlphaType;
fAlloc->make<SkColorSpaceXformSteps>(srcCS, srcAT,
>>>>>>>>>>>>>>>>>>cd8689f
src/core/SkColorSpaceXformSteps.cpp:
<<<<<<<<<<<<<<<<<<HEAD
// We can exploit that srcs are opaque, but it doesn't make sense to ask for opaque output.
SkASSERT(dstAT != kOpaque_SkAlphaType);
==================
// It's mildly interesting to know the output is opaque, but mechanically that's just unpremul.
if (dstAT == kOpaque_SkAlphaType) {
dstAT = kUnpremul_SkAlphaType;
}
>>>>>>>>>>>>>>>>>>cd8689f
These conflicts seem to be the result of the manual merge of
https://skia-review.googlesource.com/c/skia/+/147100 in ag/4768110
Change-Id: Id90b9f367de428d50b0b8d82fc715f46a3d67df2