This reverts commit 2a7c6d5e2a.
Bug: skia:9235
Change-Id: Id6dc51c3254fac69665c525e73798f97a3099a17
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225539
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
These don't show up on the bots with -Werror/-isystem,
but they bug me on local builds where I've forgotten
to set werror = true.
Change-Id: Ief11bb34ca77509441bb4c3874e93de3c51638c6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225403
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Before this fix, skia (and thus Chrome) would fail to compile on macOS when the user (developer) had a case-sensitive file-system.
So I've replaced the incorrect includes of <metal/metal.h> by <Metal/Metal.h>
Change-Id: I6ebcc0f46608f6d840d80d18e5f5baf0744a7f16
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225776
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
c26b7914f0..a1b6761e6e
git log c26b7914f03f..a1b6761e6e3c --date=short --no-merges --format='%ad %ae %s'
2019-07-06 syoussefi@chromium.org Vulkan: Add SSBO and combined resource limits
2019-07-05 m.maiya@samsung.com Vulkan: Enable remaining ProgramBinary end2end tests
2019-07-05 jmadill@chromium.org Capture/Replay: Add frame capture to cpp files.
2019-07-05 jmadill@chromium.org Update presubmit checks.
Created with:
gclient setdep -r third_party/externals/angle2@a1b6761e6e3c
The AutoRoll server is located here: https://autoroll.skia.org/r/angle-skia-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE
TBR=fmalita@google.com
Change-Id: I859343a9970cb765c7962d45534bab47c3c81ff8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225818
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
536c762e1a..ea1730d8b2
Created with:
gclient setdep -r ../src@ea1730d8b2
The AutoRoll server is located here: https://autoroll.skia.org/r/chromium-skia-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-CommandBuffer;skia.primary:Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer
TBR=fmalita@google.com
Change-Id: I46c3c73256fb6affd6aa1c0ab41942c6f0aeb519
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225817
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
c4ef62ec1a..c26b7914f0
git log c4ef62ec1a68..c26b7914f03f --date=short --no-merges --format='%ad %ae %s'
2019-07-04 ynovikov@chromium.org Skip EGLSurfaceTest.SwapInterval on Linux NVIDIA Vulkan.
2019-07-04 clemendeng@google.com ANGLE tests loading wrong opengl32.dll
2019-07-04 clemendeng@google.com Don't remove GL commands that are duplicates of GLES commands
2019-07-04 jmadill@chromium.org Fix header check for GLES 1.0 conformance tests.
2019-07-04 jonahr@google.com Add missing functions to libEGL.def
2019-07-04 geofflang@chromium.org Make egl::Sync a LabeledObject.
2019-07-04 jonahr@google.com Add GLES 3.1 dEQP test results to ANGLE docs
2019-07-04 jmadill@chromium.org Store angle::Format in gl::VertexAttribute.
2019-07-04 angle-autoroll@skia-public.iam.gserviceaccount.com Roll ./third_party/glslang/src 22683b409e6d..4b4b41a63499 (1 commits)
Created with:
gclient setdep -r third_party/externals/angle2@c26b7914f03f
The AutoRoll server is located here: https://autoroll.skia.org/r/angle-skia-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE
TBR=jvanverth@google.com
Change-Id: Id903949217c154463c5dd0a2c700f95637bcaf40
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225678
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
66b5ff586c..c4ef62ec1a
git log 66b5ff586c9c..c4ef62ec1a68 --date=short --no-merges --format='%ad %ae %s'
2019-07-04 ianelliott@google.com Vulkan: Note newly-passing Windows tests.
2019-07-04 timvp@google.com Vulkan: dFdy is incorrect when the framebuffer is flipped
2019-07-03 tobine@google.com Restore flatten invariant behavior
2019-07-03 lfy@google.com GLES1: disable texture3DOES extension
2019-07-03 jonahr@google.com End2end test for WebGL conformance2/uniforms/large-uniform-buffers.html
2019-07-03 m.maiya@samsung.com Vulkan: Implement OES_get_program_binary extension
2019-07-03 jonahr@google.com Skip EGLFeatureControlTest.InvalidDisplay on all Win/Intel
2019-07-03 clemendeng@google.com Load the correct opengl32.dll
2019-07-03 ynovikov@chromium.org Skip ImageTest.Source3DTargetExternal on Ozone
Created with:
gclient setdep -r third_party/externals/angle2@c4ef62ec1a68
The AutoRoll server is located here: https://autoroll.skia.org/r/angle-skia-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE
TBR=jvanverth@google.com
Change-Id: Iaa26ce991a361492b46e7a8e60a736dcacd5ea76
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225637
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
https://crrev.com/9dac536b55887262b4ce846f3db7a7f596542e5e [platform] Return intel or arm for platform.arch based on actual platform.machine(). (ihuh@google.com)
TBR=borenet@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Id7871f931e898a29f5b2f24d912a47f192beba25
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225631
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
All the iterations with SkStrike are moving to
bulk glyph calls. Switch over PDF.
Change-Id: I6aa0a98595d1d111254ccee333fbc162cc4eb6c8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225427
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
+ fix bug in SkBulkGlyphMetricsAndImages where the underlying SkAutoSTArray
was not reset.
Change-Id: I94882da30e858d012aa02f79c5fdfe4bc7d2e8aa
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225541
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
https://crrev.com/6e5f0481e76309308a2cd155504b619915a1b529 [recipe_engine] Add more debug info to os.read shim on OS X. (iannucci@chromium.org)
TBR=borenet@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I0574e22026a9aeac507efed707e2d57fcddefbfb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225578
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
This reverts commit 64860e1807.
Reason for revert: Breaking Chrome roll
Original change's description:
> Assert that lazy proxies are never borrowed or wrapped
>
> Bug: skia:
> Change-Id: Ie59550e29d5212bb0af626cd7b5bee430137289a
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225190
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
TBR=robertphillips@google.com,csmartdalton@google.com
Change-Id: If1ea208cb2f338bc3b9e38bcecb860c81a6c4fc2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225542
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
If you just use the right compiler driver wrapper, recent NDKs automate
lots of the stuff we used to have to do ourselves.
Simplifying further, bump baseline ndk_api from 16 (Jellybean) on 32-bit
machines and 21 (Lollipop) on 64-bit to 21 across the board. This makes
using libc++ a lot easier, as it hooks into a bunch of APIs that were
added in 18 and 21. There's probably some way to work around this, but
the easiest thing is to just roll up.
Tested building {x86,arm}x{32,64} from a Linux host,
and running { arm}x{32,64}.
Kind of flailing around in later CLs trying to get linking not to hang
on Windows. I figure it's got something to do with lld?
Cq-Include-Trybots: skia.primary:Build-Win-Clang-arm64-Release-Android
Change-Id: I340b06fb9d372281146679d932417aaba3196045
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225506
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
5faff91af4..66b5ff586c
git log 5faff91af499..66b5ff586c9c --date=short --no-merges --format='%ad %ae %s'
2019-07-03 cnorthrop@google.com texture3D: Implement functionality and enable for Vulkan
2019-07-03 cnorthrop@google.com texture3D: Compiler changes for sampler3D
2019-07-03 jonahr@google.com Skip EGLFeatureControlTest.InvalidDisplay on Win/Intel/Vulkan
2019-07-03 m.maiya@samsung.com Add missing writes to Program::serialize
2019-07-03 jmadill@chromium.org Add vertex attribute change perf test.
2019-07-03 clemendeng@google.com Windows Desktop GL Implementation
2019-07-03 angle-autoroll@skia-public.iam.gserviceaccount.com Roll ./third_party/glslang/src 73f010813812..22683b409e6d (3 commits)
2019-07-03 angle-autoroll@skia-public.iam.gserviceaccount.com Roll ./third_party/spirv-tools/src e6e3e2ccc6a2..9702d47c6fe4 (1 commits)
2019-07-03 ynovikov@chromium.org Skip ComputeShaderTest.ImageAtomicCounterBuffer
2019-07-02 syoussefi@chromium.org Vulkan: Implement glInvalidate[Sub]Framebuffer
2019-07-02 syoussefi@chromium.org Vulkan: fix depth/stencil-only blit
2019-07-02 shrekshao@google.com More HLSL tests with regex
2019-07-02 jophba@chromium.org Prepare for JsonCpp roll in Chromium
2019-07-02 angle-autoroll@skia-public.iam.gserviceaccount.com Roll ./third_party/glslang/src 4162de4bbfc5..73f010813812 (1 commits)
Created with:
gclient setdep -r third_party/externals/angle2@66b5ff586c9c
The AutoRoll server is located here: https://autoroll.skia.org/r/angle-skia-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE
TBR=jvanverth@google.com
Change-Id: Iaa20e7c12d5f371d9d3ce50607ca4c73b65d7218
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225556
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
config is completely redundant. No caller really cares what the backend
format is.
Change-Id: I93f1feb3ee61db6c21b7915bab3ee3fba5656f92
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225194
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Add encapsulations for buffers, and strike handling. Change all the
calls in SkFont over to the new system as an example.
Change-Id: Ib3c751d4f5bb6b04c6a92bbf907f47152f48d6b0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225426
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Also remove dead GrCaps method (getSampleCount)
Change-Id: I6641f688472fb5ce1b2c3872dd5cdc70b32c4700
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225422
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Change-Id: I0795eaf6c1416f08c9c602eb15a02b27d97519f5
Bug: skia:9235
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225424
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Change-Id: I3680ea31bf279cc6bde58c15a3dfa6b49815cf7e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225138
Auto-Submit: Hal Canary <halcanary@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Cq-Include-Trybots: skia.primary:Test-Android-Clang-Pixel-CPU-Snapdragon821-arm-Release-All-Android_ASAN
Change-Id: I14abc54f97c083287ee98ccab1ed0f63cb9bd0e7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225483
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
In order to effectively use the explicit backend texture allocation API Chrome needs a way to use them with surface characterizations
Change-Id: Ic61eff9f3b6b0e8280481149d7c08d37a2fe7ec0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222781
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Change-Id: I961af6c2f143df6fd1109c2659df9424d1086705
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225443
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Something's trying to link libc++.so by default,
so ask it to link libc++.a with -static-libstdc++.
Either way, the linker can't find libc++ without
adding another library directory path.
I think both changes should be harmlessly ignored
before r20.
Change-Id: I5b67e1dcb8b40548dae5a8300151e4392ae551f9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225436
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
recipe_engine:
https://crrev.com/2e24f9a6923e685d7068cdef1e6c54c9cf24babf [recipe_engine] Add debug os.read method on darwin. (iannucci@chromium.org)
TBR=borenet@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ib807a7536bfa9a74e68613d50d2617502871496f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225410
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
depot_tools:
https://crrev.com/f21ffb4f9826378ac8d16f094fb01c22dd0ec766 Copy presubmit logic up into the presubmit recipe module. (jbudorick@chromium.org)
TBR=borenet@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I18a74a191eb0ddc58b0e2b4fb25cd5e3ce89dee0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225396
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Most layer animators are scoped at the LayerController level - except for
animators related to layer transforms.
The reason for this exception is that dependent/child layers require up-to-date
transform chains even when the parent layer is inactive.
Currently, to escape LayerController scoping, layer transform animators
are stored directly in the parent (composition) scope. This works fine
for the initial purpose, but discards layer->transform-animator ownership
info.
Upcoming features (motion blur) require knowledge of all animators associated
with a given layer, and the current scheme gets in the way.
To address this problem, update the layer controller logic to
1) store all layer animators (including transform-related) in the controller
scope
2) always dispatch ticks to transform-related animators
No functional changes are expected.
TBR=
Change-Id: I60a443a51d11754dfbc953f28e57cb1c13c3d647
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225195
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Noticed we were only dumping the final register
programs for the integer code. Might as well also
track the value programs.
Change-Id: I417c5c655b632691557bbbb136dcbd3f3167af9a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225324
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
