aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Roll third_party/externals/swiftshader b7334daedbfb..6b21ba98f6e4 (1 commits)Gravatar swiftshader-skia-autoroll2018-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://swiftshader.googlesource.com/SwiftShader.git/+log/b7334daedbfb..6b21ba98f6e4 git log b7334daedbfb..6b21ba98f6e4 --date=short --no-merges --format='%ad %ae %s' 2018-07-05 capn@google.com Prevent LTO from eliminating releaseTexImage() calls. Created with: gclient setdep -r third_party/externals/swiftshader@6b21ba98f6e4 The AutoRoll server is located here: https://swiftshader-skia-roll.skia.org 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:Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader TBR=ethannicholas@google.com Change-Id: I759937f274ad09cc6320defbd31d8c226af4da8e Reviewed-on: https://skia-review.googlesource.com/139361 Reviewed-by: swiftshader-skia-autoroll <swiftshader-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: swiftshader-skia-autoroll <swiftshader-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Roll third_party/externals/angle2 a72ebeba2127..bf6dc37972c5 (3 commits)Gravatar angle-skia-autoroll2018-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/a72ebeba2127..bf6dc37972c5 git log a72ebeba2127..bf6dc37972c5 --date=short --no-merges --format='%ad %ae %s' 2018-07-04 lucferron@chromium.org Vulkan: Flip viewport on y for the backbuffer only 2018-07-04 geofflang@chromium.org EGL: Support unvirtualized contexts and unsafe multithreading. 2018-07-04 geofflang@chromium.org EGL: Skip creation of the dummy pbuffer when surfaceless is supported. Created with: gclient setdep -r third_party/externals/angle2@bf6dc37972c5 The AutoRoll server is located here: https://angle-skia-roll.skia.org 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:Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE TBR=ethannicholas@google.com Change-Id: I2edb03917e79566b5b7fe72df808c773ff5f708f Reviewed-on: https://skia-review.googlesource.com/139360 Reviewed-by: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Roll third_party/externals/swiftshader 517a57f4ba88..b7334daedbfb (1 commits)Gravatar swiftshader-skia-autoroll2018-07-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://swiftshader.googlesource.com/SwiftShader.git/+log/517a57f4ba88..b7334daedbfb git log 517a57f4ba88..b7334daedbfb --date=short --no-merges --format='%ad %ae %s' 2018-07-04 capn@google.com Remove invalid glGetIntegerv() enums. Created with: gclient setdep -r third_party/externals/swiftshader@b7334daedbfb The AutoRoll server is located here: https://swiftshader-skia-roll.skia.org 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:Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader TBR=ethannicholas@google.com Change-Id: I20e283d4d780bdc53535d768caf6fc8a926a40d6 Reviewed-on: https://skia-review.googlesource.com/139322 Reviewed-by: swiftshader-skia-autoroll <swiftshader-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: swiftshader-skia-autoroll <swiftshader-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Roll third_party/externals/angle2 2b06054dd41f..a72ebeba2127 (1 commits)Gravatar angle-skia-autoroll2018-07-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/2b06054dd41f..a72ebeba2127 git log 2b06054dd41f..a72ebeba2127 --date=short --no-merges --format='%ad %ae %s' 2018-07-04 lucferron@chromium.org Vulkan: Fix issue in DynamicBuffer Created with: gclient setdep -r third_party/externals/angle2@a72ebeba2127 The AutoRoll server is located here: https://angle-skia-roll.skia.org 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:Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE TBR=ethannicholas@google.com Change-Id: I685a5515f8cf953cf33b5f3c8e7269d9d82b270c Reviewed-on: https://skia-review.googlesource.com/139321 Reviewed-by: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Roll third_party/externals/swiftshader 539468cef869..517a57f4ba88 (3 commits)Gravatar swiftshader-skia-autoroll2018-07-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://swiftshader.googlesource.com/SwiftShader.git/+log/539468cef869..517a57f4ba88 git log 539468cef869..517a57f4ba88 --date=short --no-merges --format='%ad %ae %s' 2018-07-04 capn@google.com Fix protecting exported symbols from overrides. 2018-07-04 capn@google.com Use an internal symbol to determine library directory. 2018-07-04 capn@google.com Fix CMake architecture string comparison. Created with: gclient setdep -r third_party/externals/swiftshader@517a57f4ba88 The AutoRoll server is located here: https://swiftshader-skia-roll.skia.org 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:Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader TBR=ethannicholas@google.com Change-Id: I47290154f83e4246de2e52ecdeb3f2f0e3e547cd Reviewed-on: https://skia-review.googlesource.com/139320 Reviewed-by: swiftshader-skia-autoroll <swiftshader-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: swiftshader-skia-autoroll <swiftshader-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Update markdown filesGravatar skia-bookmaker2018-07-04
| | | | | | | | | | | | Automatic commit by the Housekeeper-Nightly-Bookmaker bot. TBR=rmistry@google.com NO_MERGE_BUILDS Change-Id: I3e1b077686e625c0c69561532f1bc95155319340 Reviewed-on: https://skia-review.googlesource.com/139301 Reviewed-by: <skia-bookmaker@skia-swarming-bots.iam.gserviceaccount.com> Commit-Queue: <skia-bookmaker@skia-swarming-bots.iam.gserviceaccount.com>
* Add some new PolyUtils tests.Gravatar Jim Van Verth2018-07-03
| | | | | | | | | | | | | Also: * clean up PolyUtils checks to be correct and consistent. * fix some bugs discovered by the unit tests. Bug: skia: Change-Id: I1a8e07d13cb44fecc67344154dc1002f3f910f5d Reviewed-on: https://skia-review.googlesource.com/138592 Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
* [skottie] Do not discard SkPath's FillType when interpolatingGravatar Florin Malita2018-07-03
| | | | | | | | | | | The fill type is not reflected in shape keyframes, but it is tracked in the scene graph. Make sure we don't overwrite when interpolating. TBR= Change-Id: I281a61c3f4181ce34f772b36b83d0c7a64e265f6 Reviewed-on: https://skia-review.googlesource.com/139176 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
* Use TextureProxy size directly in GrYUVToRGBEffect FragmentProcessorGravatar Weiliang Chen2018-07-03
| | | | | | | | | | | Instead of take extra input to indicate size for texture proxies of different planes, directly use texture proxy's size. Bug: skia:7903 Change-Id: I5d6c859510f7390948c6dcfbdd17343faa786aca Reviewed-on: https://skia-review.googlesource.com/130964 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Weiliang Chen <weiliangc@chromium.org>
* Roll skia/third_party/skcms f447e42de725..8342d776db5a (2 commits)Gravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | https://skia.googlesource.com/skcms.git/+log/f447e42de725..8342d776db5a 2018-07-03 mtklein@chromium.org avoid C-only flexible array members 2018-07-03 mtklein@chromium.org convert skcms to c++ The AutoRoll server is located here: https://skcms-skia-roll.skia.org 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=master.tryserver.blink:linux_trusty_blink_rel TBR=ethannicholas@google.com Change-Id: Iee3a21f2f7a4c939e8f5dbd773528994d4858113 Reviewed-on: https://skia-review.googlesource.com/139267 Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Revert "added skeletal animation support to GPU backend"Gravatar Ruiqi Mao2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6307340e8a6a9d3a7517def7f5eaaadffd07d14. Reason for revert: patch/atlas failing in gold Original change's description: > added skeletal animation support to GPU backend > > added caching of SkVertices > > Docs-Preview: https://skia.org/?cl=138596 > Bug: skia: > Change-Id: Ia750f55f5f6d0de250d9e9c5619f4d1ac856f9f5 > Reviewed-on: https://skia-review.googlesource.com/138596 > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Ruiqi Mao <ruiqimao@google.com> TBR=robertphillips@google.com,brianosman@google.com,reed@google.com,ruiqimao@google.com Change-Id: Idfaf016a7ff4cdd8af2543d510706f489d04417a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/139281 Reviewed-by: Ruiqi Mao <ruiqimao@google.com> Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
* Disable NVPR path renderer in DDL modeGravatar Robert Phillips2018-07-03
| | | | | | | | | I have confirmed locally that the NVPR path renderer is not DDL compatible. Change-Id: If2d0050079b562f22cc77da41f9f879d97ceb333 Reviewed-on: https://skia-review.googlesource.com/139264 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
* remove unit tests baked into SkAAClipGravatar Mike Klein2018-07-03
| | | | | | | | | | | | | | | The gOnce guards are racy. This code is probably stable enough to just remove the tests, given the umpteen other ways it's tested. Bug: skia:8128 Change-Id: Id08b1cacd1696d36f3f54542df8aa00aaf63f2d8 Reviewed-on: https://skia-review.googlesource.com/139171 Commit-Queue: Mike Klein <mtklein@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: Mike Klein <mtklein@chromium.org> Reviewed-by: Brian Osman <brianosman@google.com>
* Reland "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors."Gravatar Greg Daniel2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 34aa059c1502d67c9a5f4db449667a8709b69fb9. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors." > > This reverts commit ff2181e62e79ffd2ce628fc8c05b5457d4f54163. > > Reason for revert: suspect it's behind Chrome roll failure > > Original change's description: > > Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors. > > > > Bug: skia: > > Change-Id: I1466668e3502cd1e6e1f6aed4105e0f626d293dd > > Reviewed-on: https://skia-review.googlesource.com/138987 > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > Reviewed-by: Robert Phillips <robertphillips@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > Change-Id: I4cba44858aafffbadc45e18349b93c741d7cfc66 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/139220 > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Bug: skia: Change-Id: Ib1fd10c126862824f3e31c420c697ac749c637f5 Reviewed-on: https://skia-review.googlesource.com/139221 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
* Revert "Remove gCreateTypefaceDelegate."Gravatar Ethan Nicholas2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3241149b8cc607aaeaf7897cd1e7f712354dda7e. Reason for revert: TSAN failures, e.g. https://chromium-swarm.appspot.com/task?id=3e7a42da25efd510&refresh=10 Original change's description: > Remove gCreateTypefaceDelegate. > > The PortableFontMgr is used instead. > > Change-Id: I03ecdcbef380dde2b206293e17a325cad69d7514 > Reviewed-on: https://skia-review.googlesource.com/139165 > Reviewed-by: Mike Klein <mtklein@google.com> > Commit-Queue: Ben Wagner <bungeman@google.com> TBR=mtklein@google.com,bungeman@google.com Change-Id: I9799f0637c1d39ee397c30645aa569b93dfee593 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/139280 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
* cloudbuild.yaml also needs a top level timeout.Gravatar Joe Gregorio2018-07-03
| | | | | | | | | Bug: skia: Change-Id: Idab02c36778feab40bf6750646929d037db7321a Reviewed-on: https://skia-review.googlesource.com/139168 Reviewed-by: Joe Gregorio <jcgregorio@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Joe Gregorio <jcgregorio@google.com>
* Roll skia/third_party/skcms 678e47d97bc5..f447e42de725 (1 commits)Gravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | https://skia.googlesource.com/skcms.git/+log/678e47d97bc5..f447e42de725 2018-07-03 mtklein@chromium.org centralize and clean up disabled warnings The AutoRoll server is located here: https://skcms-skia-roll.skia.org 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=master.tryserver.blink:linux_trusty_blink_rel TBR=ethannicholas@google.com Change-Id: Ic4b606d3193354d2cc8c8a7efca3fe8148b58925 Reviewed-on: https://skia-review.googlesource.com/139241 Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Fix allocation size of vk transfer buffer during copy.Gravatar Greg Daniel2018-07-03
| | | | | | | | Bug: skia: Change-Id: Id89964d5afd29de0ee7c4c6dd9b024891ffbfe82 Reviewed-on: https://skia-review.googlesource.com/139162 Reviewed-by: Timothy Liang <timliang@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Remove gCreateTypefaceDelegate.Gravatar Ben Wagner2018-07-03
| | | | | | | | | The PortableFontMgr is used instead. Change-Id: I03ecdcbef380dde2b206293e17a325cad69d7514 Reviewed-on: https://skia-review.googlesource.com/139165 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Add timeouts to cloudbuild.yamlGravatar Joe Gregorio2018-07-03
| | | | | | | | | Bug: skia: Change-Id: Ibe95223343bbb9980bca84c336ac3ef162a13c2a Reviewed-on: https://skia-review.googlesource.com/139164 Auto-Submit: Joe Gregorio <jcgregorio@google.com> Reviewed-by: Joe Gregorio <jcgregorio@google.com> Commit-Queue: Joe Gregorio <jcgregorio@google.com>
* Revert "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors."Gravatar Ethan Nicholas2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ff2181e62e79ffd2ce628fc8c05b5457d4f54163. Reason for revert: suspect it's behind Chrome roll failure Original change's description: > Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors. > > Bug: skia: > Change-Id: I1466668e3502cd1e6e1f6aed4105e0f626d293dd > Reviewed-on: https://skia-review.googlesource.com/138987 > Commit-Queue: Greg Daniel <egdaniel@google.com> > Reviewed-by: Robert Phillips <robertphillips@google.com> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I4cba44858aafffbadc45e18349b93c741d7cfc66 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/139220 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
* added skeletal animation support to GPU backendGravatar Ruiqi Mao2018-07-03
| | | | | | | | | | | | added caching of SkVertices Docs-Preview: https://skia.org/?cl=138596 Bug: skia: Change-Id: Ia750f55f5f6d0de250d9e9c5619f4d1ac856f9f5 Reviewed-on: https://skia-review.googlesource.com/138596 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
* Roll third_party/externals/angle2 92da844eb754..2b06054dd41f (1 commits)Gravatar angle-skia-autoroll2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/92da844eb754..2b06054dd41f git log 92da844eb754..2b06054dd41f --date=short --no-merges --format='%ad %ae %s' 2018-07-03 jie.a.chen@intel.com Vulkan: Insert a barrier after buffer copy Created with: gclient setdep -r third_party/externals/angle2@2b06054dd41f The AutoRoll server is located here: https://angle-skia-roll.skia.org 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:Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE TBR=ethannicholas@google.com Change-Id: I88a5bbac80a68ac501cb4d91cc00bdf6ff0a6f14 Reviewed-on: https://skia-review.googlesource.com/139200 Reviewed-by: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Replace isGammaCorrect with isLinearlyBlendedGravatar Brian Osman2018-07-03
| | | | | | | | | | | | | | | | | | | | We were using isGammaCorrect (presence of a color space) to trigger rendering effects that should only apply when doing linear blending. Rename and redefine that function to fix many of those issues. In a few places, we really do care about the color space. The big win here is text rendering, which is now the same on legacy gl and glsrgb configs. Also left some comments about our desire to do something smarter for text in the future. Bug: skia: Change-Id: I94106e95f5f81aaa0a28dbaccd65f5d94cf0de67 Reviewed-on: https://skia-review.googlesource.com/139109 Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
* Roll skia/third_party/skcms 9d19e2abf000..678e47d97bc5 (1 commits)Gravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | https://skia.googlesource.com/skcms.git/+log/9d19e2abf000..678e47d97bc5 2018-07-03 mtklein@chromium.org rm CMakeLists.txt The AutoRoll server is located here: https://skcms-skia-roll.skia.org 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=master.tryserver.blink:linux_trusty_blink_rel TBR=ethannicholas@google.com Change-Id: Iac6ee549dd200db4037b38e7fae9b3df9d29ae07 Reviewed-on: https://skia-review.googlesource.com/139144 Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Add cloudbuild.yaml file for continous builds of fiddler and skia-release.Gravatar Joe Gregorio2018-07-03
| | | | | | | | Bug: skia: Change-Id: I713fea23ce88af4dd2a1f28082274535119defee Reviewed-on: https://skia-review.googlesource.com/139107 Reviewed-by: Joe Gregorio <jcgregorio@google.com> Commit-Queue: Joe Gregorio <jcgregorio@google.com>
* Fix empty stroked oval handling in GrRenderTargetContext::drawOvalGravatar Robert Phillips2018-07-03
| | | | | | | | | | The fix in https://skia-review.googlesource.com/c/skia/+/138932 (Don't reject stroked empty rrects in GPU backend) revealed a similar bug in oval drawing. Bug: skia:8115 Change-Id: I2f864daf2ccabdcdbb49b242cc5ce3682fe7b12a Reviewed-on: https://skia-review.googlesource.com/139120 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors.Gravatar Greg Daniel2018-07-03
| | | | | | | | Bug: skia: Change-Id: I1466668e3502cd1e6e1f6aed4105e0f626d293dd Reviewed-on: https://skia-review.googlesource.com/138987 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
* updated SkCanvas documentation for animation overloads of drawVerticesGravatar Ruiqi Mao2018-07-03
| | | | | | | | | | | | | changed bookmaker ParserCommon::writeBlockTrim limit to 20000 disabled broken SkPaint::containsText example Docs-Preview: https://skia.org/?cl=138862 Bug: skia:8123 Change-Id: Ib4003bf7b9603bf652f86cd56e0975cd09bcbf71 Reviewed-on: https://skia-review.googlesource.com/138862 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Update markdown filesGravatar skia-bookmaker2018-07-03
| | | | | | | | | | | | Automatic commit by the Housekeeper-Nightly-Bookmaker bot. TBR=rmistry@google.com NO_MERGE_BUILDS Change-Id: If0d651529540b37b792a5fe2e77da1c65d9528ac Reviewed-on: https://skia-review.googlesource.com/139067 Commit-Queue: <skia-bookmaker@skia-swarming-bots.iam.gserviceaccount.com> Reviewed-by: <skia-bookmaker@skia-swarming-bots.iam.gserviceaccount.com>
* Roll third_party/externals/angle2 a72f400c5ff3..92da844eb754 (1 commits)Gravatar angle-skia-autoroll2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/a72f400c5ff3..92da844eb754 git log a72f400c5ff3..92da844eb754 --date=short --no-merges --format='%ad %ae %s' 2018-07-03 jgilbert@mozilla.com More includes missing from sources. Created with: gclient setdep -r third_party/externals/angle2@92da844eb754 The AutoRoll server is located here: https://angle-skia-roll.skia.org 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:Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE TBR=ethannicholas@google.com Change-Id: I8df8d7b30e70f2a932a99900fa0a695429e2d67c Reviewed-on: https://skia-review.googlesource.com/139063 Reviewed-by: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-03
| | | | | | | | | | | | | | | | | | | | | 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/5484b866dc936fd1e148385fa1575b0369eec820 bot_update: use buildbucket's gitiles_commit as repo/revision input. (tandrii@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I59f3a57915178ee6ea8077cdece83181aed57862 Reviewed-on: https://skia-review.googlesource.com/139084 Reviewed-by: Recipe Roller <recipe-roller@chromium.org> Commit-Queue: Recipe Roller <recipe-roller@chromium.org>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-03
| | | | | | | | | | | | | | | | | | | | | 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/43033409f481400a72f7a49a4eaa2caeab00769d bot_update: remove legacy Gerrit patch property support. (tandrii@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I87aaa0b828afcab41af1cb085ca4fcb8f118f5f4 Reviewed-on: https://skia-review.googlesource.com/139082 Reviewed-by: Recipe Roller <recipe-roller@chromium.org> Commit-Queue: Recipe Roller <recipe-roller@chromium.org>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-03
| | | | | | | | | | | | | | | | | | | | | 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/a92b961190ff4a2fefda10a89bd95c07d5d42c7a gclient setdep: Add support for CIPD versions (ehmaldonado@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I296435713aa10ab0ca7b3cced5019a353d78ecf5 Reviewed-on: https://skia-review.googlesource.com/139080 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-03
| | | | | | | | | | | | | | | | | | | | | 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/782ed0377a0a23f393a3a873194954825972b961 buildbucket recipe_module: accept typical git_repo URLs, too. (tandrii@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I233f037935e46c2c4d7b6b717a1e491e59d38e0d Reviewed-on: https://skia-review.googlesource.com/139042 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-03
| | | | | | | | | | | | | | | | | | | | | 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/af0fe7159155bbbf93ae62322b78291ea2131a60 Fix nits in buildbucket recipe module. (tandrii@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I164130554fbb7ec35cb357d712497cb9a3e37145 Reviewed-on: https://skia-review.googlesource.com/139040 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* implement onreadpixels for metal gpu backendGravatar Timothy Liang2018-07-02
| | | | | | | | | Bug: skia: Change-Id: I1645f7e4e65766558f2b6744ce28d5f98ce852c6 Reviewed-on: https://skia-review.googlesource.com/138982 Commit-Queue: Timothy Liang <timliang@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
* GrTessellator: handle three consecutive collinear edges.Gravatar Stephen White2018-07-02
| | | | | | | | | | | | | | | In some cases, splitting may produce three consecutive edges which are collinear. The first one was being merged out, causing the third one to be missed. The fix is to switch the arguments to merge_edges_*, ensuring that the second parameter (the destination edge) is never merged out. Bug: 851409 Change-Id: I65be2e8222846c99f7bc8d17ea61ddead617cc31 Reviewed-on: https://skia-review.googlesource.com/138700 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
* implemented wrapped backend texture/rendertarget/textureRT for Metal gpu backendGravatar Timothy Liang2018-07-02
| | | | | | | | | Bug: skia: Change-Id: I5d84f9f4340023301bf119731d0b544649be7ab0 Reviewed-on: https://skia-review.googlesource.com/137892 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Timothy Liang <timliang@google.com>
* Simplify GrGLInterface::abandonGravatar Hal Canary2018-07-02
| | | | | | | | | Change-Id: I07e0d0670dfc47602394daf68c30d561e543d826 Reviewed-on: https://skia-review.googlesource.com/138995 Commit-Queue: Hal Canary <halcanary@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com> Auto-Submit: Hal Canary <halcanary@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
* Roll skia/third_party/skcms 0977edc92270..9d19e2abf000 (4 commits)Gravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com2018-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://skia.googlesource.com/skcms.git/+log/0977edc92270..9d19e2abf000 2018-07-02 mtklein@chromium.org stop using designated initializers 2018-07-02 mtklein@chromium.org explicitly cast 16-bit constants to uint16_t 2018-07-02 mtklein@chromium.org fix typo in c++ header check 2018-07-02 mtklein@chromium.org make skcms buildable as c++ The AutoRoll server is located here: https://skcms-skia-roll.skia.org 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=master.tryserver.blink:linux_trusty_blink_rel TBR=ethannicholas@google.com Change-Id: I5c9b29c5d8fcc3d8e3bf64ecd1ab24cac86b5d01 Reviewed-on: https://skia-review.googlesource.com/138954 Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Remove sRGB config checks based on color spaceGravatar Brian Osman2018-07-02
| | | | | | | | | | | | | | | | All of the restrictions/assumptions that led to this code are gone, so we can always use appropriate color space. For the YUV provider, if/when we re-introduce 8888 sRGB, the color space will have a linear transfer function, so the color space xform will automatically do what was happening here. That removes the last usage of framebuffer sRGB control, so we can remove all kinds of GrPaint and GrPipeline plumbing for that feature. Change-Id: I24af1d498dbc75210f92f8c61b10aa31eec022f6 Reviewed-on: https://skia-review.googlesource.com/138986 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com>
* Roll skia/third_party/skcms 99b01c076f47..0977edc92270 (1 commits)Gravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com2018-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | https://skia.googlesource.com/skcms.git/+log/99b01c076f47..0977edc92270 2018-07-02 mtklein@chromium.org tidy up skcms_internal.h The AutoRoll server is located here: https://skcms-skia-roll.skia.org 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=master.tryserver.blink:linux_trusty_blink_rel TBR=ethannicholas@google.com Change-Id: I18cd1addc22aab4d1e6db2498153992b382e0635 Reviewed-on: https://skia-review.googlesource.com/138953 Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Roll skia/third_party/skcms 14ea609fa6ca..99b01c076f47 (1 commits)Gravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com2018-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | https://skia.googlesource.com/skcms.git/+log/14ea609fa6ca..99b01c076f47 2018-07-02 mtklein@chromium.org move skcms impl into skcms.c The AutoRoll server is located here: https://skcms-skia-roll.skia.org 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=master.tryserver.blink:linux_trusty_blink_rel TBR=ethannicholas@google.com Change-Id: I950f7b604eef056641fec3e6691d8c8a928d2d37 Reviewed-on: https://skia-review.googlesource.com/138950 Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* [skottie] Add support for comp time remappingGravatar Florin Malita2018-07-02
| | | | | | | | | | | | - plumb the framerate in AttachContext (needed for remapping) - expand CompTimeMapper to handle time remapping (in addition to time start, time stretch) TBR= Change-Id: If33bae7b4fe224f45d5a094a47899b9025827991 Reviewed-on: https://skia-review.googlesource.com/138990 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
* Roll skia/third_party/skcms 4268c0b12bf2..14ea609fa6ca (1 commits)Gravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com2018-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | https://skia.googlesource.com/skcms.git/+log/4268c0b12bf2..14ea609fa6ca 2018-07-02 mtklein@chromium.org centralize internal headers into skcms_internal.h The AutoRoll server is located here: https://skcms-skia-roll.skia.org 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=master.tryserver.blink:linux_trusty_blink_rel TBR=ethannicholas@google.com Change-Id: I8324a33256f7c1c4b766027f9823b6401ba09a78 Reviewed-on: https://skia-review.googlesource.com/138947 Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-02
| | | | | | | | | | | | | | | | | | | | | | | 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/d38a2da9f1502d409c5a014e205c1fea07f2e167 Use cwd from context instead of kwargs (sergiyb@chromium.org) https://crrev.com/605dd3126a6c94eef6868fdaac977765905afb7a Format typescript with git cl format --js (dproy@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic940da3bcf8f17a2708eabfa5a3eeb371ffad65e Reviewed-on: https://skia-review.googlesource.com/138985 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
* Fix race condition in GrGLCapsGravatar Robert Phillips2018-07-02
| | | | | | | | Bug: 854778 Change-Id: I3421360a8549e231f508f28d3945d81f811e66de Reviewed-on: https://skia-review.googlesource.com/138923 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-02
| | | | | | | | | | | | | | | | | | | | | 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/57600791c9ce0381bffff5b8d5ffef235c661a09 Remove bogus test file. (iannucci@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ia7721953ca126bbe4d1112bae195c1eafd29c914 Reviewed-on: https://skia-review.googlesource.com/138936 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* Remove unused generateTextureProxyForParamsGravatar Brian Osman2018-07-02
| | | | | | | Change-Id: Ia599d8db0072b1f3629e05c5bd6bb6e7492cad28 Reviewed-on: https://skia-review.googlesource.com/138937 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Osman <brianosman@google.com>