aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
Commit message (Collapse)AuthorAge
* Fix bookmaker compile warningGravatar Brian Osman2017-11-01
| | | | | | | | Bug: skia: Change-Id: Iee8cf7f1d51f965e19bfc69190f975184bd7ff7a Reviewed-on: https://skia-review.googlesource.com/66148 Commit-Queue: Cary Clark <caryclark@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
* catalogerGravatar Cary Clark2017-10-31
| | | | | | | | | Docs-Preview: https://skia.org/?cl=64900 Bug: skia:6898 Change-Id: Ifbaf909854680a88060f16b1559863cc124aaa7a Reviewed-on: https://skia-review.googlesource.com/64900 Commit-Queue: Cary Clark <caryclark@skia.org> Reviewed-by: Cary Clark <caryclark@skia.org>
* Simplify SkColorSpace::MakeICCGravatar Leon Scroggins III2017-10-31
| | | | | | | | | | | | | | | | | | | Rather than restricting the supported ICC types in MakeICC, create any ICC type that we support, and make the client reject them as necessary by querying the SkColorSpace::Type. Remove ICCTypeFlag and replace uses of it with SkColorSpace::Type. This depends on a change in Chromium (https://chromium-review.googlesource.com/c/chromium/src/+/741843). Without that, this change will start allowing non-CMYK images to use CMYK profiles. Bug: 727128 Change-Id: I085b4665e49bc80083264496d864cc4cd62ae914 Reviewed-on: https://skia-review.googlesource.com/64841 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
* update valgrind suppressions for revised keepalive threadGravatar Mike Klein2017-10-31
| | | | | | Change-Id: I28cc5923866be789d33f4a5f6c0a3be67bf096c3 Reviewed-on: https://skia-review.googlesource.com/65500 Reviewed-by: Mike Klein <mtklein@chromium.org>
* Reuse more upload_to_android and allow removing flag on AndroidGravatar Yuqian Li2017-10-31
| | | | | | | | Bug: skia: Change-Id: I8c84b63d01ead32bf4aa71550f6fa84ddfcf480f Reviewed-on: https://skia-review.googlesource.com/63743 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
* Output calmbench json in nanobench formatGravatar Yuqian Li2017-10-30
| | | | | | | | | | | Meanwhile, we also make the bot name more similar to the perf bot. Bug: skia: Change-Id: I8b0e6aa2d927aa4a0ce57606345589adb6e920b3 Reviewed-on: https://skia-review.googlesource.com/64082 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Joe Gregorio <jcgregorio@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
* Add docs for SkMatrix, SkRect, SkIRect, SkBitmapGravatar Cary Clark2017-10-26
| | | | | | | | | | | | | | | Also minor changes to earlier docs. Many small changes to improve indentation in generated includes. Added support for matrix math illustrations. Docs-Preview: https://skia.org/?cl=58500 Bug: skia:6898 Change-Id: I7da58ad55f82d7fd41d19288beb2cd71730fb01f Reviewed-on: https://skia-review.googlesource.com/58500 Commit-Queue: Cary Clark <caryclark@skia.org> Reviewed-by: Cary Clark <caryclark@google.com> Reviewed-by: Cary Clark <caryclark@skia.org>
* tools/skp_parser: add some explanitory commentsGravatar Hal Canary2017-10-25
| | | | | | | Change-Id: I38e9a392214394ac3552b05dcc6b27a1ae937e57 Reviewed-on: https://skia-review.googlesource.com/63820 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
* Automatically generate CLs for legacy guard flagsGravatar Yuqian Li2017-10-24
| | | | | | | | | | | | | | | | | | | For example, a single command $ python add_legacy_flag.py SK_SUPPORT_LEGACY_AA_CHOICE -a /data/android -c ~/chromium/src -g legacyflag generates the following CLs * http://cl/172474970 * https://chromium-review.googlesource.com/c/chromium/src/+/725820 * https://googleplex-android-review.git.corp.google.com/#/c/platform/external/skia/+/3088783/ Bug: skia: Change-Id: Ie9a875f19ac86e0de83a8962ab384b10f8085c17 Reviewed-on: https://skia-review.googlesource.com/61400 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
* skpbench: always reboot instead of unlocking clocksGravatar Chris Dalton2017-10-24
| | | | | | | | Bug: skia: Change-Id: I2589c672823f1da8ea136e90fa083431b4f2e3b2 Reviewed-on: https://skia-review.googlesource.com/62945 Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* Add a gdb viewer for skbitmap.Gravatar Ben Wagner2017-10-23
| | | | | | | Change-Id: I0d021e5006c3424d1fcb5498385c192d569f2c42 Reviewed-on: https://skia-review.googlesource.com/61860 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Herb Derby <herb@google.com>
* skpbench: support pixel phoneGravatar Chris Dalton2017-10-20
| | | | | | | | | | Adds a script for pixel hardware with conservatively low clocks. Bug: skia: Change-Id: I1ade703ab9f0b4aefc9cf630e3d2efb996afd69f Reviewed-on: https://skia-review.googlesource.com/62343 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* skpbench: add arguments for path renderer and path cacheGravatar Chris Dalton2017-10-20
| | | | | | | | Bug: skia: Change-Id: If31d040b0560c23bfad31e06ef247428bf5bdb6d Reviewed-on: https://skia-review.googlesource.com/62106 Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* Move clear-as-draw workaround to GrGLGpu and expose via GrContextOptions.Gravatar Brian Salomon2017-10-18
| | | | | | | | Bug: skia:7154 Change-Id: I23ffc11dab4a377fbd6b7e4e33722b3fa0793d58 Reviewed-on: https://skia-review.googlesource.com/60681 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
* Add concise option to Calmbench botGravatar Yuqian Li2017-10-17
| | | | | | | | | | | As \r doesn't work on bot output, the new output will be much more concise. TBR: borenet@google.com Bug: skia: Change-Id: I190daeae230ea6e0c4bfebc53c6c5c1fd46c503a Reviewed-on: https://skia-review.googlesource.com/60840 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
* GPU-CTS ProgramGravatar Hal Canary2017-10-17
| | | | | | | | | | | | | | | | | | | | Add new application, called GPU-CTS (GPU Compatibility Test Suite), which executes skia gms against OpenGL and Vulkan backends. Makes use of googletest library for consistancy with Android CTS programs. Add googletest to DEPS gm_knowledge.h header as a stub for future work on validating gm output. gm_runner can be re-used in other programs. Talks to Skia and GM with a simple API. gpuctx executable wraps gm_runner and googletest together. Change-Id: Ie7350b22164fa73e44121c39b0f36da4038a700b Reviewed-on: https://skia-review.googlesource.com/56601 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
* Handle no stash caseGravatar Yuqian Li2017-10-17
| | | | | | | | Bug: skia: Change-Id: Ie717f92306d32303cb2efcfe5809bb4d81ae80e0 Reviewed-on: https://skia-review.googlesource.com/60223 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
* Try calmbench on botsGravatar Yuqian Li2017-10-16
| | | | | | | | Bug: skia: Change-Id: I869776e3d9d47b4a1a11089f729a0b17581eb9f7 Reviewed-on: https://skia-review.googlesource.com/57400 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
* Add a tooling flag for path mask cachingGravatar Chris Dalton2017-10-13
| | | | | | | | | | | Adds the flag and a disables caching on the CCPR bots. Bug: skia: Change-Id: Icb85e77f89634dda1d419dacac5b8a93340723f0 Reviewed-on: https://skia-review.googlesource.com/59740 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* Modify skpbench to use newer adb versionGravatar Kevin Lubick2017-10-13
| | | | | | | | | Bug: skia: NOTRY=true Change-Id: Ib630d352b6922280ef5772e6843f8f031baeffaf Reviewed-on: https://skia-review.googlesource.com/59161 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
* Add flag on GrBackendTexture to say whether texture is mipped or notGravatar Greg Daniel2017-10-12
| | | | | | | | Bug: skia: Change-Id: Ia684e3daf779ec2feaaec64c04dabf5cb03cd07a Reviewed-on: https://skia-review.googlesource.com/57821 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Add benchmark for comparing multitexturing to non-multitexturing image draws.Gravatar Brian Salomon2017-10-11
| | | | | | | | | | | Allows benchmarks to override GrContextOptions. Removes the ability to use the same GrContext for all benchmarks in a config. Change-Id: I5ab9f6e81055451ac912a66537843d1a49f3b479 Reviewed-on: https://skia-review.googlesource.com/34080 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* General clean up on bookmaker.Gravatar Cary Clark2017-10-11
| | | | | | | | | | | | | | Command line runs without error for SkBitmap, SkPath, SkRect, SkIRect, SkPixmap, SkCanvas. Docs-Preview: https://skia.org/?cl=57112 TBR: caryclark@google.com Bug: skia:6898 Change-Id: I73b69ae8ffdf0a1e6bc187dc8a9dfb28f7766faa Reviewed-on: https://skia-review.googlesource.com/57112 Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org>
* Add NV_fence support to get better timing from ANGLE ES2Gravatar Brian Osman2017-10-10
| | | | | | | | | | | | | | Previously, we were reporting numbers that were far too low, because we were getting way ahead of the GPU, and then spending all of our time in finish (which isn't timed). That led to us picking very high loop counts, so our wall clock time to run nanobench was very high, and our reported times were very low. This fixes all of that, and removes all the spam about not having fence support. Change-Id: Ib9dfc043da82bf8ee6645b8627cfade66eb9864e Reviewed-on: https://skia-review.googlesource.com/58001 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Fix bugs with fence sync API on iOS devicesGravatar Brian Osman2017-10-10
| | | | | | | | | | | | | | | | - Actually request extension version of fence sync functions - Fix incorrect usage of dlopen/dlsym - Also fixed same bugs in Mac code, although we never hit that code path. Should fix iOS devices, giving more accurate (and less spammy) results from nanobench. Bug: skia: Change-Id: I3456b301ef9b0b6559160d1d21c77bd93139d39a Reviewed-on: https://skia-review.googlesource.com/57740 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Remove trailing whitespace.Gravatar Ben Wagner2017-10-09
| | | | | | | | | | | Also adds a presubmit to prevent adding trailing whitespace to source code in the future. Change-Id: I41a4df81487f6f00aa19b188f0cac6a3377efde6 Reviewed-on: https://skia-review.googlesource.com/57380 Reviewed-by: Ravi Mistry <rmistry@google.com> Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Remove carriage returns.Gravatar Ben Wagner2017-10-09
| | | | | | | | | Also add a presubmit so they don't get added to source code. Change-Id: I6a85c6a934b1068a63646a0dcc0d3a08baa96ced Reviewed-on: https://skia-review.googlesource.com/57110 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* first cut at SkRect, SkIRect documentationGravatar Cary Clark2017-10-09
| | | | | | | | | | | | | | All functions should have descriptions, examples, cross-references. References and spelling have been checked. More work to do creating and organizing topics. Docs-Preview: https://skia.org/?cl=56140 Tbr: caryclark@google.com Bug: skia:6898 Change-Id: I9d1e55d04ab64874c33cac8b91534aa192c2f545 Reviewed-on: https://skia-review.googlesource.com/56140 Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org>
* Add Win Clang Vulkan builds.Gravatar Ben Wagner2017-10-07
| | | | | | | | | Fix Clang compiler warning. Change-Id: Ic6f5b161058d1ed2df45e12b72dbff3b486ec986 Reviewed-on: https://skia-review.googlesource.com/56740 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
* starting next gaggle of docsGravatar Cary Clark2017-10-04
| | | | | | | | | | | starting next gaggle of docs Docs-Preview: https://skia.org/?cl=50264 Bug: skia:6898 Change-Id: I639795b55c0c96b2efccac13cb67592f055a75a2 Reviewed-on: https://skia-review.googlesource.com/50264 Commit-Queue: Cary Clark <caryclark@skia.org> Reviewed-by: Cary Clark <caryclark@skia.org>
* ok, add a8 dst supportGravatar Mike Klein2017-09-29
| | | | | | | Change-Id: Ib7f855c833c8e73f448de7c8a75f59b1a0880874 Reviewed-on: https://skia-review.googlesource.com/53600 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
* Add a new calmbench tool for noiseless nanobenchGravatar Yuqian Li2017-09-29
| | | | | | | | | | | | | | | | | | This tool can quickly check all nanobench tests including svgs and skps (<5 minutes for CPU, ~30 minutes for GPU) and find significant performance regressions without much noise. This tool is not only faster (lower latency to get regression alerts), but also more sensitive compared to our k-means and step-fitting bots (especially for changes that only affect very few benches). It may still miss some regressions, but the regressions reported should be valid with very high probability. Bug: skia: Change-Id: I02115e6c5ab630e4c56b2087ffeb5cae1d4a618e Reviewed-on: https://skia-review.googlesource.com/50060 Commit-Queue: Yuqian Li <liyuqian@google.com> Reviewed-by: Eric Boren <borenet@google.com>
* Remove unused functions get_preferred_sizeGravatar Yuqian Li2017-09-26
| | | | | | | | | | Bug: skia: Change-Id: I6a5b5d96ad48b84b07d2e56fbabb870a90c62a97 Reviewed-on: https://skia-review.googlesource.com/51460 Reviewed-by: Yuqian Li <liyuqian@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
* Revert "Revert "migrate to sk_sp for SkFontMgr API""Gravatar Mike Reed2017-09-26
| | | | | | | | | | This reverts commit f40ae1a4b5365620463bd63b5140bd3fc78894a1. Bug: skia: Change-Id: I752606de92ea405d6e50219c98030409b00a2841 Reviewed-on: https://skia-review.googlesource.com/51160 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
* Revert "migrate to sk_sp for SkFontMgr API"Gravatar Mike Reed2017-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4bf296be2821d2bdd0afabae9fdfe18e7e9b59cb. Reason for revert: need guard for flutter Original change's description: > migrate to sk_sp for SkFontMgr API > > Bug: skia: > Change-Id: I1bf2a13537f67938cdc9956080065d10ea0bd1d8 > Reviewed-on: https://skia-review.googlesource.com/48740 > Commit-Queue: Ben Wagner <bungeman@google.com> > Reviewed-by: Ben Wagner <bungeman@google.com> TBR=bungeman@google.com,reed@google.com Change-Id: Ib0b2d00fcbcdb6131444f94d1046df6dae24f551 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/50940 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
* migrate to sk_sp for SkFontMgr APIGravatar Mike Reed2017-09-25
| | | | | | | | Bug: skia: Change-Id: I1bf2a13537f67938cdc9956080065d10ea0bd1d8 Reviewed-on: https://skia-review.googlesource.com/48740 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
* Add some font fallback to SkShaper.Gravatar Ben Wagner2017-09-22
| | | | | | | Change-Id: I92d58071dc3a540e21bbe55267963504ff9da75b Reviewed-on: https://skia-review.googlesource.com/42600 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Turn on GPU threading by default to get better test/perf coverageGravatar Brian Osman2017-09-22
| | | | | | | | | | | Explicitly disable it on PixelC. This is arbitrary, so we continue to get coverage of the single-threaded code. Bug: skia: Change-Id: I0ac91f7ca58652933db452720f353068cf2d0f2d Reviewed-on: https://skia-review.googlesource.com/50000 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* ok, add via_skpGravatar Mike Klein2017-09-21
| | | | | | | | | | | This is the same sort of thing as DM's serialize via. It draws into a picture, serializes that, deserializes that, and then draws that picture into the destination. Change-Id: Ib58748786bc01fd8a0cb9355a2fd334311c361bf Reviewed-on: https://skia-review.googlesource.com/49902 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
* feedbackGravatar Cary Clark2017-09-21
| | | | | | | | | | | feedback from include review Docs-Preview: https://skia.org/?cl=49260 Bug: skia: 6898 Change-Id: Ic60980dfe53d14fd8c6973ef2f4dabb6b650cdd8 Reviewed-on: https://skia-review.googlesource.com/49260 Commit-Queue: Cary Clark <caryclark@skia.org> Reviewed-by: Cary Clark <caryclark@skia.org>
* Fix MSAN compile errorGravatar Jim Van Verth2017-09-20
| | | | | | | Change-Id: I2ac07f2da5e08a3dbefc59fb860d69817906df41 Reviewed-on: https://skia-review.googlesource.com/49441 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
* Fix TSAN issue with atlas expansion.Gravatar Jim Van Verth2017-09-20
| | | | | | | | | | | Removes SkString-related malloc from DM crash handler, and adds null check in ProxyRefTest. Bug: skia:3550 Change-Id: I143c532b5d231a426b1a96b854e1effd6379b673 Reviewed-on: https://skia-review.googlesource.com/48440 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
* work on generation of rect, bitmap, matrix markupGravatar Cary Clark2017-09-19
| | | | | | | | | TBR=caryclark@google.com Bug: skia:6898 Change-Id: I501d87341afa2f8d548b4d02415375032a46e96e Reviewed-on: https://skia-review.googlesource.com/47420 Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org>
* Make GrFakeRefObj::fNext atomic.Gravatar Mike Klein2017-09-19
| | | | | | | | | This lets you make them on different threads simultaneously. Change-Id: Ife4228ae4721b35c718ece1a30cc5686f3690c13 Reviewed-on: https://skia-review.googlesource.com/48800 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
* missing description for FontMetricFlagsGravatar Cary Clark2017-09-15
| | | | | | | | | | | | | | | | | rearrange class descriptions to make them appear consistently inside the #Class declaration in the .bmh files. Look for the descriptions there and regenerate the .md files. Docs-Preview: https://skia.org/?cl=46523 TBR=caryclark@google.com Bug: skia: 6898 Change-Id: I00a176428725ef27667d3f23d76d6b7ff0cfced1 Reviewed-on: https://skia-review.googlesource.com/46523 Commit-Queue: Cary Clark <caryclark@google.com> Reviewed-by: Cary Clark <caryclark@skia.org>
* Simple script to measure SurfaceFlinger fpsGravatar Chris Dalton2017-09-14
| | | | | | | | | Bug: skia: Change-Id: I063c832f6d292e5e9f615c881e3325eb4ab9cdfa Reviewed-on: https://skia-review.googlesource.com/44681 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
* remove need for command flags castGravatar Cary Clark2017-09-14
| | | | | | | | | | TBR=mtklein@google.com Bug: skia: 6898 Change-Id: I1c83fe67cbfb978f15ebcbb9081ac4d4a8f00e4a Reviewed-on: https://skia-review.googlesource.com/46680 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org>
* wip pixmap docsGravatar Cary Clark2017-09-14
| | | | | | | | | | | wip pixmap docs Docs-Preview: https://skia.org/?cl=42522 Bug: skia: 6898 Change-Id: I85947bc36ea057ed008b87d7bef2efa82d7c89ad Reviewed-on: https://skia-review.googlesource.com/42522 Reviewed-by: Cary Clark <caryclark@skia.org> Commit-Queue: Cary Clark <caryclark@skia.org>
* Add support for additional textures in GrDrawOpAtlasGravatar Jim Van Verth2017-09-12
| | | | | | | | | | Step two in supporting growable/shrinkable atlases. Bug: skia:3550 Change-Id: I0cdec2a9f59cc8ced071bfeec2f8ed5a228c4b7a Reviewed-on: https://skia-review.googlesource.com/43260 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
* Break up the prefix to make some presubmits stop complainingGravatar Ravi Mistry2017-09-12
| | | | | | | | | NoTry: true Bug: skia:7016 Change-Id: If2f405d8309fc63d8592a97b668f826cd606097b Reviewed-on: https://skia-review.googlesource.com/45801 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>