This reverts commit d234c9e6b9.
Reason for revert: GM/TSAN unhappiness
Original change's description:
> Switch bots to use ViaDDL (i.e., ddl-gl) instead of old --ddl flag
>
> Change-Id: I9c5f27bacf7d9fa7a9ac123379e2556913810cba
> Reviewed-on: https://skia-review.googlesource.com/116464
> Reviewed-by: Eric Boren <borenet@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=borenet@google.com,robertphillips@google.com
Change-Id: I95388ee582bdd9561b8ebf24250f58b361657b7c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/116621
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Change-Id: I9c5f27bacf7d9fa7a9ac123379e2556913810cba
Reviewed-on: https://skia-review.googlesource.com/116464
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
To run on these older bots, looks like we need to statically link
libstdc++ and libgcc. Luckily that is straightforward.
Change-Id: If523067df196e943c2ba2f64c52eea0711dbfcbd
Reviewed-on: https://skia-review.googlesource.com/115743
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Bug: skia:
Change-Id: Ie72dee00c5160ce329c74a12d64bc68ce264c1bf
Reviewed-on: https://skia-review.googlesource.com/115990
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
No-Try: true
Change-Id: Iaf292ac9875312d3f1fcc81fdc64c3c587f68286
Reviewed-on: https://skia-review.googlesource.com/113674
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
BUG=chromium:731979
Change-Id: Ief5917b06e6c9164cc3bccdd89da169d1e169ba7
Reviewed-on: https://skia-review.googlesource.com/115703
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Should be used for running karma tests on skia-elements and also
for running lottiecap on bots.
Bug: skia:
Change-Id: I5c48cb741017be4eda014faea77ab88dec2e9637
Reviewed-on: https://skia-review.googlesource.com/115622
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Change-Id: Icbbbe7275cf9bc62cbc175d4453affa12ded495a
Reviewed-on: https://skia-review.googlesource.com/115526
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
BUG=chromium:815092
Change-Id: I7ec1d448c94bbdb6931fb315d6daf3d882430497
Reviewed-on: https://skia-review.googlesource.com/115362
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Change-Id: I0d1aa9a137809349e34ab773b5ee41b69e813f9e
Reviewed-on: https://skia-review.googlesource.com/115220
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
In compile recipes, add a dummy define (e.g.
-DDUMMY_clang_linux_version=42) to the compiler flags so that ninja will
recompile from scratch when the toolchain changes.
Bug: skia:7720
Change-Id: I9a330b21af364b3aa6a1eebbe6ac2022cfa82fdc
Reviewed-on: https://skia-review.googlesource.com/115160
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Bug: skia:7720
Change-Id: I044ca5281354b21c9deffa408ad7ec20c51d2e2e
Reviewed-on: https://skia-review.googlesource.com/115122
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This reverts commit be5947c2f3.
Bug: skia:
Change-Id: I06dc15b31042d7827511d0ac2a7f4262c3f09622
Reviewed-on: https://skia-review.googlesource.com/115079
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This reverts commit c9a642edf2.
Reason for revert: 1010102 gms broke
Original change's description:
> New read pixels implementation that is simpler but does all conversions on CPU.
>
> Change-Id: Ia548cd24a8544b35a233311706faf48de353b7cf
> Reviewed-on: https://skia-review.googlesource.com/109902
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com
Change-Id: I7724a6eef79885ba2a32c1ac871e5b2a9a3c0c12
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/115140
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Bug: skia:7050
Change-Id: I53b141bf76ab4773909df968f69ba04dc29e0dc9
Reviewed-on: https://skia-review.googlesource.com/114960
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This reverts commit 2ab6f7e580.
Reason for revert: Server back with more cores
Original change's description:
> Remove Android Framework bot from CQ while server is being upgraded
>
> NoTry: true
> Bug: skia:7716
> Change-Id: I67695c5f45ac5b9c57d0599ba2ab2e825fa75e4b
> Reviewed-on: https://skia-review.googlesource.com/114788
> Reviewed-by: Ravi Mistry <rmistry@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Ravi Mistry <rmistry@google.com>
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
TBR=benjaminwagner@google.com,rmistry@google.com
Change-Id: I01626d9a4de98a27a350b053cb1aa7612d71d136
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7716
Reviewed-on: https://skia-review.googlesource.com/114820
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Bug: skia:
Change-Id: Id4c613385a6948af9808dfbaef8f437e765fb9b5
Reviewed-on: https://skia-review.googlesource.com/114571
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Change-Id: If9402ad5a3ae7d17221cf1bca621b8aad4d9e9d0
Reviewed-on: https://skia-review.googlesource.com/114466
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Bug: skia:
Change-Id: I1eca549d38b64869a763951b8469712d620e24bf
Reviewed-on: https://skia-review.googlesource.com/114516
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This reverts commit aa504cddb9.
Reason for revert: Kevin asked me to revert since this broke things
Original change's description:
> Scale the GPU when running perf on Pixel(2)
>
> This is a similar followup to:
> https://skia-review.googlesource.com/c/skia/+/93561
>
> Bug: skia:
> Change-Id: I9b11dbf3d063fd64b1dd712cf1c596618f2c9ffc
> Reviewed-on: https://skia-review.googlesource.com/114340
> Reviewed-by: Eric Boren <borenet@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>
TBR=borenet@google.com,kjlubick@google.com
Change-Id: Idbc7234f2b7ff8c5e632680903836e1f4eaa50d5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/114425
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
The experiment with using Goma to speed up Windows compiles was very
close to being successful, but at this point the ongoing maintenance
does not seem to be worth the 50-70 seconds saved.
Change-Id: Ie3900b9a681e448a3e47634efbab7695ebccad33
Reviewed-on: https://skia-review.googlesource.com/114363
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
It is well after December 2017
Bug: skia:
Change-Id: I3e48735dac9885606bdecab301379a1312966ff1
Reviewed-on: https://skia-review.googlesource.com/114361
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
No-Try: true
Change-Id: I119c7853299b6eef65f991b41cbb2afb0a35f431
Reviewed-on: https://skia-review.googlesource.com/113673
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Also switch CQ Win 32-bit Build from MSVC to Clang.
No-Try: true
Change-Id: Ic312ee611b1e99143480840c08a9266a4d8b448b
Reviewed-on: https://skia-review.googlesource.com/113672
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Change-Id: Iea0f841f7c9a3449213c549ba310ab2a3d928ca2
Reviewed-on: https://skia-review.googlesource.com/114093
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Enable /arch:SSE2 for Win x86 builds (both MSVC and Clang).
Change-Id: I0618e938b6542b60fae3947b7e0dcde22650ba54
Reviewed-on: https://skia-review.googlesource.com/56721
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This tryjob is currently just experimental/non-blocking, and we are
severely short on capacity due to chromium:821040.
Bug: chromium:821040
Change-Id: I36b193cecd4f7ecf4c6f5769e869ee37a1285582
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/114221
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Bug: skia:
Change-Id: Ic739fd2d24ee2e9ed2c8b0dfdfc7118005350400
Reviewed-on: https://skia-review.googlesource.com/113300
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Adds procdump_win asset.
Enable ProcDump for some of the jobs failing in skia:7177 as a test
case. If it has no ill effect, we can proceed with enabling it for all
Win bots (and remove "ProcDump" tag).
Bug: skia:7626, skia:7177
Change-Id: I50c67ecfca86fe0c6d91d5f970f81485cc9cfd0a
Reviewed-on: https://skia-review.googlesource.com/113265
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
It was released yesterday.
Change-Id: Ied9ef3c65fcee0ac7af785c6642fb899d6bd4b0d
Reviewed-on: https://skia-review.googlesource.com/113380
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
This version is the latest from Windows Update, which is not available from Intel. It is an earlier
version than the one used in https://skia-review.googlesource.com/c/skia/+/106202, but all later
drivers seem to have the same issue that caused that CL to be reverted.
Bug: skia:7490, skia:6398
Change-Id: I96f4262d16066dbd1a05dadd66df32b29d1bd9d6
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/111064
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
- adds building the testlab driver (run_testlab) as a separate step
- adds gcloud isolate necessary to run testlab
- adds Testlab support and uploading a verified AKP to GCS (with
meta data attached).
Bug: skia:
Change-Id: I1bf265f46c99360eb3a9eb684886f93de48085fe
Reviewed-on: https://skia-review.googlesource.com/111603
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Stephan Altmueller <stephana@google.com>
It's not clear that we should ever decode to this format.
Bug: skia:7686
Change-Id: I9f2cc6e72d89d06bf9491d695b4f64b99bfa0392
Reviewed-on: https://skia-review.googlesource.com/111841
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This reverts commit ded47a5014.
Bug: skia:
Change-Id: I7d7552e6ccc8591cae91426407ab13b628b93b68
Reviewed-on: https://skia-review.googlesource.com/111760
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This reverts commit 44b61204d9.
Reason for revert: TSAN bot crashing
Original change's description:
> Add 1010102 support to Ganesh
>
> Adds gl1010102, gles1010102, vk1010102, and mtl1010102
> configs to DM.
>
> This uses the same saveLayer approach as CPU, switching
> to 8888 so that we have enough alpha precision.
>
> Change-Id: I9f5b63747ec01031c8db97dadfc42f77e4863ccb
> Reviewed-on: https://skia-review.googlesource.com/110500
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
TBR=mtklein@google.com,bsalomon@google.com,brianosman@google.com
Change-Id: I782e740763044c1ae78fb219161e37eec7617c74
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/111580
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This affects GTX660, GTX960, and GTX1070.
No-Try: true
Change-Id: I16a307dde0daa72a70728bfd8da4da2786dac0e5
Reviewed-on: https://skia-review.googlesource.com/111101
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Adds gl1010102, gles1010102, vk1010102, and mtl1010102
configs to DM.
This uses the same saveLayer approach as CPU, switching
to 8888 so that we have enough alpha precision.
Change-Id: I9f5b63747ec01031c8db97dadfc42f77e4863ccb
Reviewed-on: https://skia-review.googlesource.com/110500
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This affects GTX660, RadeonHD7770, and GTX1070.
Change-Id: I7b91aa4a8a3893597bb164a32e5e6b2560a84d9b
Reviewed-on: https://skia-review.googlesource.com/109812
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Make indirect path in writeSurfacePixels2 use a copy rather than a draw.
Fix issue in GrVkGpu where render target dirty region is not updated after copy-as-draw
Remove unnecessary resolve of MSAA RT in GrVkCopyManager.
Splits WritePixelsNonTexture_Gpu test into MSAA and non-MSAA variants. MSAA variant blacklisted
on Adreno because of:
Bug: skia:7663
~~~~~~AND~~~~~~~
Revert "Suppress CopySurface test on Nexus 7"
This reverts commit b42b6169d5.
Bug: skia:7658
Change-Id: I8337d718efb41e266537744bbf5ff8b1545322a7
Reviewed-on: https://skia-review.googlesource.com/110700
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This affects GTX960.
Change-Id: I42807d9e51bb7dd3b665db805631f3c9a475056c
Reviewed-on: https://skia-review.googlesource.com/109811
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This affects RadeonR9M470X.
Change-Id: I6d11ee553aced18494a07c5b8703060d105567f7
Reviewed-on: https://skia-review.googlesource.com/109809
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Affects IntelIris6100 and IntelHD4400.
No-Try: true
Change-Id: I50927e051ca37a7c39982da937e538698fa34e2d
Reviewed-on: https://skia-review.googlesource.com/108189
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This affects IntelIris540.
Change-Id: I37fba0a8472fb809f212e8472add6451ffcb8e77
Reviewed-on: https://skia-review.googlesource.com/109808
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Bug: skia:7497
Change-Id: If40c5a318b1becbe81bac4b1543ceab30c3f840b
Reviewed-on: https://skia-review.googlesource.com/110440
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
The load_f16 and store_f16 stages are assuming they can load
each pixel at a time with 8 byte alignment, but as declared
the buffers are only guaranteed 2 byte alignment.
Bug: skia:7497
Change-Id: I47b29f13b48f90d2b15540979c3d87ba25dcc506
Reviewed-on: https://skia-review.googlesource.com/110321
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Bug: skia:
Change-Id: I5bf9e2e09af1cb7392138c9b871d315588ffbf62
Reviewed-on: https://skia-review.googlesource.com/110241
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This affects IntelIris6100 and IntelHD4400.
Change-Id: I95a1eee3169ad6ad3c7873fd40f9f00069d5c0ab
Reviewed-on: https://skia-review.googlesource.com/109807
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Bug: skia:7646
Change-Id: Iddf55940230c99fea9d838a1b03a8c3bb476262e
Reviewed-on: https://skia-review.googlesource.com/109360
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Bug: skia:
Change-Id: I0415690911a52059eaaf7f32c81b7a4c66117d5b
Reviewed-on: https://skia-review.googlesource.com/109162
Commit-Queue: Stephan Altmueller <stephana@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Bug: skia:
Change-Id: Ib0e9ddb621056ddce2422b53f312ec42d4d7aa3c
Reviewed-on: https://skia-review.googlesource.com/107880
Commit-Queue: Stephan Altmueller <stephana@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Bug: skia:
NOTRY=true
Change-Id: I9b79044df1a265a086e77fbadcaab69bf86babe1
Reviewed-on: https://skia-review.googlesource.com/108521
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
also
Revert "Increase ninja thread count for Windows builds."
This reverts commit 98c4231592.
This reverts commit 50a808a518.
Bug: skia:
Change-Id: I7cc50b0bec6e1ad9f9d971a5c88c029488bb80ed
Reviewed-on: https://skia-review.googlesource.com/108504
Reviewed-by: Stephan Altmueller <stephana@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Stephan Altmueller <stephana@google.com>
Bug: skia:7609
Change-Id: I3c23df024afda53d50409ef19e1de9274a664111
Reviewed-on: https://skia-review.googlesource.com/108440
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Bug: skia:7609
Change-Id: Iaaaa2390d87656a4fa40e44fc31c35573abec7b5
Reviewed-on: https://skia-review.googlesource.com/108186
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Bug: skia:7562
Change-Id: I21eb1d9aa6717edcd89d958149e1ad250b4bf154
Reviewed-on: https://skia-review.googlesource.com/107944
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Bug: skia:7562
Change-Id: I56e0991999644c02890008123b25f141aed0b70e
Reviewed-on: https://skia-review.googlesource.com/107520
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Change-Id: Ib637360e2f09cd2851771595590203da6195a314
Reviewed-on: https://skia-review.googlesource.com/107600
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Change-Id: Icc3f3cc144d6d3d2ee467822436df94559d6ff37
Reviewed-on: https://skia-review.googlesource.com/107580
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This reverts commit e1c2945b5f.
Reason for revert: no crashes since
Original change's description:
> serialize NexusPlayer bots
>
> Temporarily serialize the NexusPlayer Test bots to help diagnose
> skia:7614.
>
> Bug: skia:7614
>
> Change-Id: I190327070f27e53d8344820f2215bad00f12e1ab
> Reviewed-on: https://skia-review.googlesource.com/106621
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
TBR=mtklein@chromium.org,caryclark@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: skia:7614
Change-Id: I1c7508c3f9a171d14cad1b77506d98772ef4ef60
Reviewed-on: https://skia-review.googlesource.com/107620
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
These cuts reduce the number of files by 2/3 and the size by 1/3
There's not too much more that could be trimmed - now the size
is dominated by the specially compiled LLVM/Clang binaries
Bug: skia:7186
Change-Id: Ie88fb6f2277eafbefac0f676daaca809dcb53f62
Reviewed-on: https://skia-review.googlesource.com/107061
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Previously, we needed vulkan-1.dll from the Vulkan runtime because some
drivers did not include the Vulkan loader. Now, all drivers include this
DLL and using the version from assets causes problems for newer Intel
drivers.
Bug: skia:7490
Change-Id: I7bd37fb0d2c88a4753f354ab2bc88761562ced2f
Reviewed-on: https://skia-review.googlesource.com/107060
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
