aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* Fix explicit resource allocator bugGravatar Robert Phillips2018-07-27
| | | | | | | | | This was folded into https://skia-review.googlesource.com/c/skia/+/142102 (Reduce arbitrary opList splitting when sorting (take 2)) but need not wait for that CL to land. Change-Id: I883497129404fbf879e3c21f465f6debc5b5c2ed Reviewed-on: https://skia-review.googlesource.com/143706 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Add kAAHairline to GpuPathRenderersGravatar Chris Dalton2018-07-27
| | | | | | | | | | | | With the upcoming ccpr stroking, this will no longer be the only path renderer that can handle hairlines. Bug: skia: Change-Id: I45b30ccd578bee1388a3a07a234af76a19768de6 Reviewed-on: https://skia-review.googlesource.com/142272 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* Roll third_party/externals/angle2 dbd1612782f5..18f7e5033040 (1 commits)Gravatar angle-skia-autoroll2018-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/dbd1612782f5..18f7e5033040 git log dbd1612782f5..18f7e5033040 --date=short --no-merges --format='%ad %ae %s' 2018-07-27 fjhenigman@chromium.org Vulkan: make DynamicBuffer reusable, always valid. Created with: gclient setdep -r third_party/externals/angle2@18f7e5033040 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=benjaminwagner@google.com Change-Id: Ie49c384f6ff75eafc3d2306bd7844f51df8e1691 Reviewed-on: https://skia-review.googlesource.com/143803 Reviewed-by: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* const all the thingsGravatar Herb Derby2018-07-27
| | | | | | | | | | | Having the glyph run list be const as it passes through the stack means that future change can't be introduced in the device code that changes behavior. Try to force all text changes into the SkGylphRun system. Change-Id: I9412bc094c7adb8554887c725a6264af306e1d42 Reviewed-on: https://skia-review.googlesource.com/143702 Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-26
| | | | | | | | | | | | | | | | | | | | | | | 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/19cca6a3bdcdee5825912f8102c2818885f777dc [cipd] Bump client (+vpython) v2.1.0 (521b9b6477) => v2.2.2 (03693197fe). (vadimsh@chromium.org) recipe_engine: https://crrev.com/36cdb3033498ecf5b5834dbc58eca2542164cbed led: Add task link when launching a task (martiniss@google.com) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I21bd4000982a74972be2a53fc365ada052e6ea7c Reviewed-on: https://skia-review.googlesource.com/143703 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* SkAR Java: refactored project structureGravatar ziadb2018-07-26
| | | | | | | | | | 1) Changed file paths 2) Added helpers that were missing previously Bug: skia: Change-Id: Idb4194fcef815a23277a17670acf46255a47451d Reviewed-on: https://skia-review.googlesource.com/143680 Reviewed-by: Mike Reed <reed@google.com>
* SkAR Java: changes to DrawManager/FingerPaintingGravatar ziadb2018-07-26
| | | | | | | Bug: skia: Change-Id: I609fa91f89ec0cc011046d2f20716efd9b44d4da Reviewed-on: https://skia-review.googlesource.com/143643 Reviewed-by: Mike Reed <reed@google.com>
* site: Documentation & Fiddle links on front pageGravatar Hal Canary2018-07-26
| | | | | | | | | No-Try: true Change-Id: Ib687748189052bd5bf18a997dd324b047403ca47 Reviewed-on: https://skia-review.googlesource.com/143642 Commit-Queue: Hal Canary <halcanary@google.com> Reviewed-by: Cary Clark <caryclark@google.com> Reviewed-by: Heather Miller <hcm@google.com>
* SkAR Java: refactored SkARUtil (now PaintUtil)Gravatar ziadb2018-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SkAR Java: refactored SkARMatrix.java Merge branch 'master' of https://skia.googlesource.com/skia into skar-java SkAR Java: better UI for finger painting Merge branch 'master' of https://skia.googlesource.com/skia into skar-java SkAR Java: smooth finger painting, planes draw with outlines SkAR Java: better finger painting. Cleaner UI FREEZE.unindexed SkAR Java: drawing planes as paths Bug: skia: Change-Id: I56a26b358f1c5903fafe20cacf221c6eb6585c4b Reviewed-on: https://skia-review.googlesource.com/143541 Reviewed-by: Ziad Ben Hadj-Alouane <ziadb@google.com>
* SkAR Java: refactored SkARMatrix.java (now CanvasMatrixUtil.java)Gravatar ziadb2018-07-26
| | | | | | | Bug: skia: Change-Id: I57ff2f723b2445270246c96ee35e9669e2b21954 Reviewed-on: https://skia-review.googlesource.com/143503 Reviewed-by: Mike Reed <reed@google.com>
* Roll third_party/externals/angle2 203b26f27d00..dbd1612782f5 (1 commits)Gravatar angle-skia-autoroll2018-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/203b26f27d00..dbd1612782f5 git log 203b26f27d00..dbd1612782f5 --date=short --no-merges --format='%ad %ae %s' 2018-07-26 geofflang@chromium.org EGL: Implement EGL Image extensions. Created with: gclient setdep -r third_party/externals/angle2@dbd1612782f5 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=benjaminwagner@google.com Change-Id: I9d74eb22f3795f1406c97e9cc50159c54491ba77 Reviewed-on: https://skia-review.googlesource.com/143560 Reviewed-by: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* SkAR Java: better UI for finger paintingGravatar ziadb2018-07-26
| | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://skia.googlesource.com/skia into skar-java SkAR Java: smooth finger painting, planes draw with outlines SkAR Java: better finger painting. Cleaner UI FREEZE.unindexed SkAR Java: drawing planes as paths Bug: skia: Change-Id: If138d1d840c013848b1482830713affa5b5d815b Reviewed-on: https://skia-review.googlesource.com/143502 Reviewed-by: Mike Reed <reed@google.com>
* Centralize bitmap glyph positioningGravatar Herb Derby2018-07-26
| | | | | | | | | | | | | | | Centralize all text drawing for bitmap devices into SkGlyphRunListDrawer. All drawing decisions are encapsulated in this class, and its behavior only depends on contant properties of the device. The method drawForBitmap will probably have to be converted to a template based in preliminary performance numbers. Change-Id: Id21567c1511eee9d2e9e20c7ae93544530cfdb81 Reviewed-on: https://skia-review.googlesource.com/143106 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Herb Derby <herb@google.com>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-26
| | | | | | | | | | | | | | | | | | | | | | 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/c87d45b102ac4cdf4b325d53061cf81c66d9b1d7 metrics_utils: Print notice to stderr. (ehmaldonado@chromium.org) https://crrev.com/7e50ee376bd57b299fb70c812b6cf76f4c34414b [cipd] Try to bootstrap CIPD from scratch if selfupdate fails. (vadimsh@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I900298486f9ee3e2b89714b4695050078829236d Reviewed-on: https://skia-review.googlesource.com/143548 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* Correctly distinguish hairline paths in the SW path renderer's cacheGravatar Brian Osman2018-07-26
| | | | | | | | | | | | | | | We typically don't get hairline paths in the SW path renderer, but an upcoming change (https://skia-review.googlesource.com/c/skia/+/142272) makes it possible. Therefore, we need to distinguish between hairline and filled paths. Additionally, the CPU renderer draws hairline paths differently with round/square caps (extended by 1/2 pixel) than with butt caps, so include that in the key, too. Bug: skia:8188 Change-Id: I223c11f62ef1c13f0488f2ca8c19a19875fc3d9f Reviewed-on: https://skia-review.googlesource.com/143540 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Update android_build_app Gradle output locationGravatar Florin Malita2018-07-26
| | | | | | | | | | | | | | | | | Looks like new Gradle (4.1) changed the output location from build/outputs/apk/{app}-{target_cpu}-{android_buildtype}.apk to build/outputs/apk/{target_cpu}/{android_buildtype}/{app}-{target_cpu}-{android_buildtype}.apk TBR= Change-Id: I45ed38e1f1655f82ef4a205ef7e8baf3f2da50af Reviewed-on: https://skia-review.googlesource.com/142806 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-26
| | | | | | | | | | | | | | | | | | | | | 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/bad59ca738cc8692ca8b2be801d8e991d41f1e6f Use `call` in recipe bundles to allow appending to the recipes.bat file. (iannucci@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ibaa8b8caf5af9e13d1963dd1b263e907b3565015 Reviewed-on: https://skia-review.googlesource.com/143543 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* SkAR Java: smooth finger painting, planes draw with outlinesGravatar ziadb2018-07-26
| | | | | | | Bug: skia: Change-Id: I0e6f3c00f030f7a03c3829cd4ff22ac7459dc132 Reviewed-on: https://skia-review.googlesource.com/142685 Reviewed-by: Mike Reed <reed@google.com>
* GrTessellator: fix for collinear edge merging.Gravatar Stephen White2018-07-26
| | | | | | | | | | | | | | | | In some cases, two edges can be collinear when tested on one side (e.g., left top vs right edge), but non-collinear when tested on the other (e.g., right top vs left edge). We were actually merging based on one criterion, but assserting based on the other. The safest fix is to merge if either condition is true, and then assert that both conditions are false. Bug: 866319 Change-Id: Ia1be330caf62f6d7961746752f73993ca098d0a3 Reviewed-on: https://skia-review.googlesource.com/143501 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
* [infra] Add Metal to no_upload.Gravatar Ben Wagner2018-07-26
| | | | | | | | | | | | | | | In https://skia-review.googlesource.com/c/skia/+/143107, the Metal tasks were added with a whitelist of one unit test, so there are no Gold results to upload. Gold treats the empty results files as invalid, which generates Trooper alerts. No-Try: true Change-Id: Ifcdfccefb173c5cb970d60da5b7c3a89d6bc15db Reviewed-on: https://skia-review.googlesource.com/143500 Commit-Queue: Stephan Altmueller <stephana@google.com> Reviewed-by: Stephan Altmueller <stephana@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Auto-Submit: Ben Wagner <benjaminwagner@google.com>
* Maybe fix numStencilBits TSAN crashGravatar Robert Phillips2018-07-26
| | | | | | | | Bug: skia:7390 Change-Id: Ied9c92147324ddb1245df796cd201df35657bbe0 Reviewed-on: https://skia-review.googlesource.com/143304 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* avoid uninitialized under fuzzerGravatar Cary Clark2018-07-26
| | | | | | | | | | | | | | | | | | https://skia-review.googlesource.com/143112 introduced new logic to handle failures; fuzzer found a way to exploit this. FWIW, skia's fuzzer did not call pathops when fed the test case. TBR=kjlubick@google.com Bug:867314 Change-Id: Id894962d3f32e206362faff332a1330db75da175 Reviewed-on: https://skia-review.googlesource.com/143318 Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org> Auto-Submit: Cary Clark <caryclark@skia.org>
* Roll third_party/externals/angle2 eb4b86975848..203b26f27d00 (1 commits)Gravatar angle-skia-autoroll2018-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/eb4b86975848..203b26f27d00 git log eb4b86975848..203b26f27d00 --date=short --no-merges --format='%ad %ae %s' 2018-07-26 jiawei.shao@intel.com ES31: Translate compute shader HLSL system variables in compile time Created with: gclient setdep -r third_party/externals/angle2@203b26f27d00 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=benjaminwagner@google.com Change-Id: I8bfa6e7acf50edafdeb583db9da2e35bc5c5a637 Reviewed-on: https://skia-review.googlesource.com/143480 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-26
| | | | | | | | | | | | | | | | | | | | | 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/254538b955bd353e28da028e09c1f808367a4bf4 MIPS64: Add support for depot_tools on mips64. (wangqing-hf@loongson.cn) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: If8e2d77f8e93ad2fe7fb65ef4774516b742f6643 Reviewed-on: https://skia-review.googlesource.com/143315 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* Roll third_party/externals/angle2 2160821e16db..eb4b86975848 (6 commits)Gravatar angle-skia-autoroll2018-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/2160821e16db..eb4b86975848 git log 2160821e16db..eb4b86975848 --date=short --no-merges --format='%ad %ae %s' 2018-07-25 theoking@google.com Introduced eglMakeCurrent Perf Test 2018-07-25 jmadill@chromium.org Pass Context to Query Impl methods. 2018-07-25 jmadill@chromium.org Pass Context to Fence Impl methods. 2018-07-25 jmadill@chromium.org Vulkan: Fix compound nested sampler struct params. 2018-07-25 jmadill@chromium.org D3D11: Reduce allocations in GenerateInitialTextureData. 2018-07-25 jmadill@chromium.org D3D11: Pass Context to more Image methods. Created with: gclient setdep -r third_party/externals/angle2@eb4b86975848 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=benjaminwagner@google.com Change-Id: I988f1a0b884c41fea3e769a3079f212d07e178aa Reviewed-on: https://skia-review.googlesource.com/143341 Reviewed-by: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* add explicit accessor for sRGB singleton colorspacesGravatar Mike Klein2018-07-25
| | | | | | | | | | | | | | SkColorSpace::MakeSRGB().get() is scary, and causes more ref/unref pairs than strictly necessary for these singletons. This time the implementation is still in SkColorSpace.cpp, so these should really work as singletons. Change-Id: I40f2942c8dcde3040663a04c4f5330aca90868ae Reviewed-on: https://skia-review.googlesource.com/143305 Auto-Submit: Mike Klein <mtklein@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
* Roll recipe dependencies (trivial).Gravatar recipe-roller2018-07-25
| | | | | | | | | | | | | | | | | | | | | 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/ad463c9517e348df1ea5cb5f0f9a615365f52bf6 git-cl: Report known project urls. (ehmaldonado@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I7a10766b5dc5087fea459cf46ee6da077da0db54 Reviewed-on: https://skia-review.googlesource.com/143313 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* Don't double check in SkArenaAlloc.Gravatar Ben Wagner2018-07-25
| | | | | | | | | Currently many range checks are being forced when they aren't needed. Change-Id: I5ad6933a15fa063e76045757c7523f17900e4c1a Reviewed-on: https://skia-review.googlesource.com/142816 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Revert "Go back to cleaning up MIP levels on texture export rather than ↵Gravatar Mike Klein2018-07-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assuming dirty" This reverts commit 01d6fc9d8415e400a7eac95518356ecf341aa5cb. Reason for revert: layout tests. Original change's description: > Go back to cleaning up MIP levels on texture export rather than assuming dirty > on texture import. > > Bug: skia:8155 > Change-Id: I23399f442d52c73906829132f798eda260b6d4ae > Reviewed-on: https://skia-review.googlesource.com/143291 > Auto-Submit: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> TBR=bsalomon@google.com,brianosman@google.com Change-Id: Ice4cb4e253e52d67eb8bd6e2a12ccc844b7bfa8d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:8155 Reviewed-on: https://skia-review.googlesource.com/143380 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
* remove SkThreadedBMPDevice and friendsGravatar Mike Klein2018-07-25
| | | | | | | | | | | It is unused, is becoming a maintainence burden and source of bugs, and takes up a lot of time on the *SAN bots. Change-Id: If383eb6e4838ca23140f9e16d518b1bfc655fa12 Reviewed-on: https://skia-review.googlesource.com/143307 Auto-Submit: Mike Klein <mtklein@google.com> Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Herb Derby <herb@google.com>
* fonts: Don't recompute device descs on glyph cache hit.Gravatar Khushal2018-07-25
| | | | | | | | | | | | | | | Testing using serialization PaintOpPerfTest, this had the following improvement in serialization speed: Before: ~515,000 ops/s After: ~600,000 ops/s R=herb@google.com Change-Id: Iefd80467ea4ff7cc88e8ca1f431883502d249857 Reviewed-on: https://skia-review.googlesource.com/142972 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Khusal Sagar <khushalsagar@chromium.org>
* Pin max curvature solutions to 0..1Gravatar Chris Dalton2018-07-25
| | | | | | | | | | | | | | Pins out-of-range solutions for cubic/quad max curvature instead of throwing them out. Code that wants to know the endpoint(s) closest to max curvature now has the information. Code not interested in these values can just ignore 0 and 1. Bug: skia: Change-Id: I8e7e2ef236b4ab963865dc049ac3e09d5396757d Reviewed-on: https://skia-review.googlesource.com/143041 Reviewed-by: Cary Clark <caryclark@google.com> Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* SkUtils: remove some versions of UTF routines.Gravatar Hal Canary2018-07-25
| | | | | | | Change-Id: Ib1f776ae472117c23d2145253adf25fceb412b32 Reviewed-on: https://skia-review.googlesource.com/143111 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
* Fix GPU explicit resource allocation bugGravatar Robert Phillips2018-07-25
| | | | | | | | | | | The explicit resource allocator assumes that it has complete control over the resources it hands out thus, they can have no pre-existing pending IO. Change-Id: I59d8d079d8b8514688c458a54424329b86922cb6 Reviewed-on: https://skia-review.googlesource.com/143300 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* refine NEON checks in raster pipelineGravatar Mike Klein2018-07-25
| | | | | | | | | | | | | | | | | This replaces most defined(__ARM_NEON) with defined(JUMPER_IS_NEON), which is defined(__ARM_NEON) && defined(__clang__). When compiled by Clang like our bots and primary users, this is a noop, but will avoid some of the NEON paths for compilers defining __ARM_NEON that are not Clang. Bug: skia:8178 Change-Id: Ifaea940c95b61d2fefadbd4e752cc477c571eafa Reviewed-on: https://skia-review.googlesource.com/143301 Commit-Queue: Herb Derby <herb@google.com> Auto-Submit: Mike Klein <mtklein@chromium.org> Reviewed-by: Herb Derby <herb@google.com>
* Go back to cleaning up MIP levels on texture export rather than assuming dirtyGravatar Brian Salomon2018-07-25
| | | | | | | | | | | on texture import. Bug: skia:8155 Change-Id: I23399f442d52c73906829132f798eda260b6d4ae Reviewed-on: https://skia-review.googlesource.com/143291 Auto-Submit: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
* Reland "update SkToSRGBColorFilter color management"Gravatar Mike Klein2018-07-25
| | | | | | | | | | | | | | | | | This is a reland of 8b5092671b1d0802e88b5202f67ceb94c9e5d236 Original change's description: > update SkToSRGBColorFilter color management > > Change-Id: Ia4a8bbc9d983bb5cfa02ba62c922efa1fa879d9b > Reviewed-on: https://skia-review.googlesource.com/141054 > Commit-Queue: Mike Klein <mtklein@chromium.org> > Reviewed-by: Brian Osman <brianosman@google.com> Change-Id: Ide55dd34a701a518be11856ecffbacf30954dc64 Reviewed-on: https://skia-review.googlesource.com/143321 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
* Roll third_party/externals/angle2 096c5296c3b0..2160821e16db (1 commits)Gravatar angle-skia-autoroll2018-07-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/096c5296c3b0..2160821e16db git log 096c5296c3b0..2160821e16db --date=short --no-merges --format='%ad %ae %s' 2018-07-25 jmadill@chromium.org Add gl::TexLevelArray. Created with: gclient setdep -r third_party/externals/angle2@2160821e16db 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=benjaminwagner@google.com Change-Id: Ie106e9f4bb344ab0ee9bf5e3fec5ae9b1ba153e9 Reviewed-on: https://skia-review.googlesource.com/143340 Reviewed-by: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: <angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
* temporarily disable t8888 config on *SAN botsGravatar Mike Klein2018-07-25
| | | | | | | | | | | | | | | | This is mainly to debug TSAN issues. I'm not exactly sure why we run this config on ASAN and MSAN bots. This CL will disable them along with TSAN, and depending on how much time that saves on the bots, I might only turn TSAN back on in the end. Change-Id: Id4d92f27a917b4e14b96c25e97e8be70ca2004f5 Reviewed-on: https://skia-review.googlesource.com/143302 Commit-Queue: Mike Klein <mtklein@chromium.org> Commit-Queue: Ben Wagner <benjaminwagner@google.com> Auto-Submit: Mike Klein <mtklein@chromium.org> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
* Revert "Blacklist hanging test."Gravatar Ben Wagner2018-07-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e3e68cf14f6b202540717020e79fb53be4151c38. Reason for revert: The test was hanging due to https://skia-review.googlesource.com/c/skia/+/142102, which has been reverted. Original change's description: > Blacklist hanging test. > > Blacklist gr_mipmap_build_511x512 for nanobench on the Acer Chromebook > R13 Convertible to avoid timeouts for Release build. > > Bug: skia:8187 > No-Try: true > Change-Id: Ic63fb705a6a6cc6576978c96a8dd5206dc59ba0d > Reviewed-on: https://skia-review.googlesource.com/143162 > Commit-Queue: Brian Osman <brianosman@google.com> > Auto-Submit: Ben Wagner <benjaminwagner@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> TBR=benjaminwagner@google.com,brianosman@google.com Change-Id: Id5144f1ada6d2059e473a2891816775ea7fe2663 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:8187 Reviewed-on: https://skia-review.googlesource.com/143320 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
* Roll skia/third_party/skcms dad22fe0e646..4642d9fe69e1 (1 commits)Gravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com2018-07-25
| | | | | | | | | | | | | | | | | | | | | | | | | https://skia.googlesource.com/skcms.git/+log/dad22fe0e646..4642d9fe69e1 2018-07-25 benjaminwagner@google.com [infra] Adjust job priorities. (skcms) 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=benjaminwagner@google.com Change-Id: I80d5a79fdf660f07afa8966cc4c0f231dffe0b6b Reviewed-on: https://skia-review.googlesource.com/143280 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>
* [infra] Adjust job priorities. (skia)Gravatar Ben Wagner2018-07-25
| | | | | | | | | | | | | | After https://skia-review.googlesource.com/c/buildbot/+/141564, scheduling will work better if most jobs use the default priority. Since task priority is now ignored, remove it everywhere. Bug: skia:8145 Change-Id: Ie49cfbbbda80c6d6419a8f691af6a3c775ae5cda Reviewed-on: https://skia-review.googlesource.com/143163 Auto-Submit: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Eric Boren <borenet@google.com>
* Roll third_party/externals/angle2 ddd6e8746851..096c5296c3b0 (10 commits)Gravatar angle-skia-autoroll2018-07-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/ddd6e8746851..096c5296c3b0 git log ddd6e8746851..096c5296c3b0 --date=short --no-merges --format='%ad %ae %s' 2018-07-25 jmadill@chromium.org Blit11: Refactor for error returning. 2018-07-25 jmadill@chromium.org TextureStorage11: Pass more Context around. 2018-07-25 jmadill@chromium.org TextureStorage11: Don't use gl::ErrorOrResult. 2018-07-25 jmadill@chromium.org D3D11: Don't use ErrorOrResult in TransformFeedback11. 2018-07-25 jmadill@chromium.org D3D: Make computeOffset not use ErrorOrResult. 2018-07-25 jmadill@chromium.org D3D11: Make createStagingTexture return Error. 2018-07-25 jmadill@chromium.org Buffer11: Don't use ErrorOrResult. 2018-07-24 theoking@google.com Vulkan: Check mInFlightCommands doesn't grow too fast 2018-07-24 geofflang@chromium.org EGL: Validate that EGL_GL_TEXTURE_ZOFFSET is used only for 3D sources. 2018-07-24 ynovikov@chromium.org Fix stencil mask check in Framebuffer::partialClearNeedsInit Created with: gclient setdep -r third_party/externals/angle2@096c5296c3b0 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=benjaminwagner@google.com Change-Id: I0cd0c5bffff5585ed74e2d585a0f6c0684c4d225 Reviewed-on: https://skia-review.googlesource.com/143200 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-24
| | | | | | | | | | | | | | | | | | | | | 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/c201ea2c059e30b35d3b6514cb5febef659c4806 Add basic led module (martiniss@google.com) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I08c97872eca7943232a7da371ca428565f274945 Reviewed-on: https://skia-review.googlesource.com/143166 Commit-Queue: Recipe Roller <recipe-roller@chromium.org> Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
* Blacklist hanging test.Gravatar Ben Wagner2018-07-24
| | | | | | | | | | | | | Blacklist gr_mipmap_build_511x512 for nanobench on the Acer Chromebook R13 Convertible to avoid timeouts for Release build. Bug: skia:8187 No-Try: true Change-Id: Ic63fb705a6a6cc6576978c96a8dd5206dc59ba0d Reviewed-on: https://skia-review.googlesource.com/143162 Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
* Roll third_party/externals/angle2 06235df9ff91..ddd6e8746851 (1 commits)Gravatar angle-skia-autoroll2018-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://chromium.googlesource.com/angle/angle.git/+log/06235df9ff91..ddd6e8746851 git log 06235df9ff91..ddd6e8746851 --date=short --no-merges --format='%ad %ae %s' 2018-07-24 jmadill@chromium.org Vulkan: Suppress 3 failing blit tests on Pixel 2. Created with: gclient setdep -r third_party/externals/angle2@ddd6e8746851 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=benjaminwagner@google.com Change-Id: I41f559c0df5ebeb83a82a8aa733a1777ec37d83a Reviewed-on: https://skia-review.googlesource.com/143081 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-24
| | | | | | | | | | | | | | | | | | | | | | 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/6ec6d27f2d1bd3d46eddaf469ee21cacc3e04999 [led] Update to f8fd394bd671f4cf4da8064a1ee074018c275d15. (iannucci@chromium.org) https://crrev.com/ca7d881540e391fc1b5aa44d08c08a67e0b1a797 Reland "Reland "gclient_scm: Use cherry-picking instead of rebasing."" (ehmaldonado@chromium.org) TBR=borenet@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Ic64eeb4ded47104f0432147cec0e59a317d47f59 Reviewed-on: https://skia-review.googlesource.com/143115 Reviewed-by: Recipe Roller <recipe-roller@chromium.org> Commit-Queue: Recipe Roller <recipe-roller@chromium.org>
* fixed geometry shaders when canUseFragCoord is falseGravatar Ethan Nicholas2018-07-24
| | | | | | | | Bug: chromium:859705 Change-Id: Ia5c5b15bd5d12bf2d1c3265664bec2c3eaef24d2 Reviewed-on: https://skia-review.googlesource.com/143114 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* handle failing pathop testsGravatar Cary Clark2018-07-24
| | | | | | | | | | | | | | | Some tests isolated from GrShapes_arcs do not fail gracefully, so make sure errors are properly handled. TBR=reed@google.com Bug: skia: Change-Id: Ia8c9903e64ef755ec11c398df3e5d258ca1f5f8b Reviewed-on: https://skia-review.googlesource.com/143112 Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org> Auto-Submit: Cary Clark <caryclark@skia.org>
* Revert "Reduce arbitrary opList splitting when sorting (take 2)"Gravatar Robert Phillips2018-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 20d4e546d8cb34f8944ef00d249416a047c95524. Reason for revert: Android dying on Nexus7 & Nexus Player Original change's description: > Reduce arbitrary opList splitting when sorting (take 2) > > The original CL (https://skia-review.googlesource.com/c/skia/+/141243 (Reduce arbitrary opList splitting when sorting)) was reverted due to Gold image diffs and perf regressions on Android. > > The image diffs should be fixed by: > https://skia-review.googlesource.com/c/skia/+/142163 (Fix explicit allocation bug) > > Change-Id: I4bcc59820daf440de81f48e8970b47a6c8ec2bbb > Reviewed-on: https://skia-review.googlesource.com/142102 > Commit-Queue: Robert Phillips <robertphillips@google.com> > Reviewed-by: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,robertphillips@google.com Change-Id: Ice7ed703a17a1e1fef949446538c8da7524dc42e No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/143121 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>