AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
21,277 Commits 1 Branch 0 Tags 544 MiB
7e6fcf890a
Commit Graph

1669 Commits

Author SHA1 Message Date
joshualitt
4dcbe43124 Move some methods to SkiaServe's Request, this is still very leaky 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1733813004

Review URL: https://codereview.chromium.org/1733813004
 2016-02-25 10:50:28 -08:00
joshualitt
24dd687ac5 Move Request to its own file in preparation for numerous cleanups 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1738483003

Review URL: https://codereview.chromium.org/1738483003
 2016-02-25 08:37:54 -08:00
bsalomon
5ec26ae9bf Move Budgeted enum out of SkSurface, use in GrTextureProvider 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1728093005
DOCS_PREVIEW= https://skia.org/?cl=1728093005

Committed: https://skia.googlesource.com/skia/+/57599fe6c0336feaeeeb9b1996e77b70219b483c
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Review URL: https://codereview.chromium.org/1728093005
 2016-02-25 08:33:02 -08:00
jcgregorio
50fe38e72a use the favicon on debugger.skia.org 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1734913002

Review URL: https://codereview.chromium.org/1734913002
 2016-02-25 07:02:13 -08:00
bsalomon
bd500f09ce Revert of Move Budgeted enum out of SkSurface, use in GrTextureProvider (patchset #6 id:100001 of https://codereview.chromium.org/1728093005/ ) 
Reason for revert:
Need workaround for chrome to build

Original issue's description:
> Move Budgeted enum out of SkSurface, use in GrTextureProvider
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1728093005
> DOCS_PREVIEW= https://skia.org/?cl=1728093005
>
> Committed: https://skia.googlesource.com/skia/+/57599fe6c0336feaeeeb9b1996e77b70219b483c

TBR=reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1734043002
 2016-02-25 06:52:12 -08:00
bsalomon
57599fe6c0 Move Budgeted enum out of SkSurface, use in GrTextureProvider 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1728093005
DOCS_PREVIEW= https://skia.org/?cl=1728093005

Review URL: https://codereview.chromium.org/1728093005
 2016-02-25 06:33:27 -08:00
kkinnunen
45c2c8166b Implement support for using GL ES 3.0 with command buffer 
Adds a new 'api': --config gpu(api=commandbuffer3) for dm/nanobench.

BUG=skia:4943
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1684413003

Review URL: https://codereview.chromium.org/1684413003
 2016-02-25 02:03:43 -08:00
mtklein
d9381acb0e Turn off DM --pre_log on the bots. Too spammy. 
BUG=skia:4978
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1734703002

Review URL: https://codereview.chromium.org/1734703002
 2016-02-24 08:58:27 -08:00
ethannicholas
807dcabe99 added 'visible' attribute to skiaserve JSON 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1726663002

Review URL: https://codereview.chromium.org/1726663002
 2016-02-23 06:53:37 -08:00
mtklein
afe9facc9f Run no CPU benches in Debug trybots. 
They seem to just be wasting time on the CQ.

Hacking this into nanobench_flags.py makes it easy to back out.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1720223002

Review URL: https://codereview.chromium.org/1720223002
 2016-02-22 14:59:59 -08:00
ethannicholas
3ff5d8c63d added mode=cpu|gpu to skiaserve JSON 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1719973002

Review URL: https://codereview.chromium.org/1719973002
 2016-02-22 08:59:57 -08:00
Greg Daniel
164a9f061c Add vulkan files into skia repo. This is an incomplete backend with only partial functionality at this time. 
R=robertphillips@google.com
TBR=bsalomon@google.com

BUG=skia:4955
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1718693002

Committed: https://skia.googlesource.com/skia/+/48cf268defad66f58f1aa03b4835e5583be96b2f

Review URL: https://codereview.chromium.org/1718693002
 2016-02-22 09:56:40 -05:00
egdaniel
ad3a13c4c3 Revert of Add vulkan files into skia repo. (patchset #2 id:20001 of https://codereview.chromium.org/1718693002/ ) 
Reason for revert:
breaking builds

Original issue's description:
> Add vulkan files into skia repo. This is an incomplete backend with only partial functionality at this time.
>
> R=robertphillips@google.com
> TBR=bsalomon@google.com
>
> BUG=skia:4955
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1718693002
>
> Committed: https://skia.googlesource.com/skia/+/48cf268defad66f58f1aa03b4835e5583be96b2f

TBR=robertphillips@google.com,bsalomon@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4955

Review URL: https://codereview.chromium.org/1723503002
 2016-02-22 06:17:53 -08:00
Greg Daniel
48cf268def Add vulkan files into skia repo. This is an incomplete backend with only partial functionality at this time. 
R=robertphillips@google.com
TBR=bsalomon@google.com

BUG=skia:4955
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1718693002

Review URL: https://codereview.chromium.org/1718693002
 2016-02-22 09:11:32 -05:00
mtklein
cbf897802b DM: remove unnecessary use of std::function 
This draw_to_canvas() function doesn't need the power of std::function.

This skips a copy or two, which is nice, and seems to clear
up most of my MSAN problems.  Why?  I do not know.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1718633002

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

Review URL: https://codereview.chromium.org/1718633002
 2016-02-19 14:27:14 -08:00
mtklein
09d06850fa add back some basic configs to MSAN bot 
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1706373004

Review URL: https://codereview.chromium.org/1706373004
 2016-02-19 09:08:50 -08:00
ethannicholas
85fca851e6 added /enableGPU command to skiaserve 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1715503004

Review URL: https://codereview.chromium.org/1715503004
 2016-02-19 08:40:59 -08:00
ethannicholas
c85d9fbc0a GrAuditTrail can now be enabled/disabled at runtime 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1712753002

TBR=bsalomon@google.com
Doesn't actually change the public API

Review URL: https://codereview.chromium.org/1712753002
 2016-02-18 13:45:40 -08:00
mtklein
517558ad19 MSAN: cut down to green 
I have no idea what's going on with the current bot failures.
This disables lots of things to get it green.
Probably more than necessary.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1707873002

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

Review URL: https://codereview.chromium.org/1707873002
 2016-02-18 11:42:00 -08:00
ethannicholas
3afae70a48 fixed SkDrawCommand JSON generation 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1715443002

Review URL: https://codereview.chromium.org/1715443002
 2016-02-18 10:50:50 -08:00
ethannicholas
3ca1e1ae4f added server-side breakpoint support to skiaserve 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1707863003

Review URL: https://codereview.chromium.org/1707863003
 2016-02-18 10:22:34 -08:00
bsalomon
1526e0a5f5 Make build_command_buffer.py work on Windows 
BUG=skia:4957
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1710983002

Review URL: https://codereview.chromium.org/1710983002
 2016-02-18 10:01:11 -08:00
bungeman
a7e9f05119 Move SkTDArray to private. 
TBR=reed
Moving to private is good.

Review URL: https://codereview.chromium.org/1707213002
 2016-02-18 08:53:33 -08:00
bsalomon
c969bfced3 Make build_command_buffer.py work on Mac and Windows. 
Also specify GYP_GENERATORS and add flags to gclient sync to make it more likely to succeed.

BUG=skia:4957
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1704193002

Review URL: https://codereview.chromium.org/1704193002
 2016-02-18 06:40:55 -08:00
bungeman
bf521ff941 Move SkTArray to include/private. 
TBR=reed
Agreed moving to private is good.

Review URL: https://codereview.chromium.org/1702073002
 2016-02-17 13:13:44 -08:00
ethannicholas
cecbbe2fa9 converted skiaserve PNGs from RGBA to RGB 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1703893003

Review URL: https://codereview.chromium.org/1703893003
 2016-02-17 11:49:43 -08:00
joshualitt
6b3cf73af5 Add batch information to json 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1705093002

Review URL: https://codereview.chromium.org/1705093002
 2016-02-17 11:20:26 -08:00
bsalomon
c43f2af60e Add a script to build and copy the command buffer shared library. This script will be used by the bots to test skia on the command buffer. 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1699273002

NOTREECHECKS=true
NOTRY=true
BUG=skia:4957

Review URL: https://codereview.chromium.org/1699273002
 2016-02-17 10:42:46 -08:00
ethannicholas
272af6ecd7 Revert of further skiaserve image performance improvements (patchset #1 id:1 of https://codereview.chromium.org/1707453003/ ) 
Reason for revert:
Broke skiaserve GPU rendering

Original issue's description:
> further skiaserve image performance improvements
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1707453003
>
> Committed: https://skia.googlesource.com/skia/+/68c063bf11c91b2b3b15cb93168cf2af9b2c642d

TBR=joshualitt@google.com,jcgregorio@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1708683002
 2016-02-17 10:30:27 -08:00
msarett
8715d47e24 Make SkPicture/SkImageGenerator default to SkCodec 
Remove reference to SkImageDecoder from SkPicture. Make the default
InstallPixelRefProc passed to CreateFromStream use
SkImageGenerator::NewFromEncoded instead.

Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator.
Remove the old version that used SkImageDecoder.

Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default
now behaves lazily.

Update all clients to use the default.

Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly.

This is a rebased version of:
https://codereview.chromium.org/1671193002/

TBR=reed@google.com

BUG=skia:4691
BUG=skia:4290
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1699183004

Review URL: https://codereview.chromium.org/1699183004
 2016-02-17 10:02:29 -08:00
ethannicholas
68c063bf11 further skiaserve image performance improvements 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1707453003

Review URL: https://codereview.chromium.org/1707453003
 2016-02-17 09:17:35 -08:00
mtklein
0da8537555 MSAN: build libc++ with MSAN, link to it. 
The errors that we see should now change to the unexplainable,
rather than the explainable errors at head.

We suspect that the original reason to blacklist was this,
not building libc++ with MSAN.  So unblacklist everything to start fresh.

BUG=skia:4903,skia:4900

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1694353004

Review URL: https://codereview.chromium.org/1694353004
 2016-02-16 14:03:15 -08:00
ethannicholas
546d66544b tuned skiaserve's png output for better performance 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1704573002

Review URL: https://codereview.chromium.org/1704573002
 2016-02-16 11:03:04 -08:00
jcgregorio
3341d428d3 skiaserve: Change alpha setting from GET to POST. 
GET shouldn't be used for things that change the state of the server.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1706443002

Review URL: https://codereview.chromium.org/1706443002
 2016-02-16 10:31:07 -08:00
mtklein
6f65957335 Setup for -Fast GCE bot. 
I'd like a bot that has got optimization turned up to 11,
to let us test things that our Chrome-like bots normally can't.

(Not quite ready to commit this bot to -ffast-math yet.)

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1704473002

Review URL: https://codereview.chromium.org/1704473002
 2016-02-16 06:42:51 -08:00
msarett
3478f753ff Adding a tool to get images from skps 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1696763002

Review URL: https://codereview.chromium.org/1696763002
 2016-02-12 14:47:09 -08:00
msarett
70e418b468 Make SkJpegCodec compatible with libjpeg 
BUG=skia:4470
BUG=skia:4520
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1687863003

Review URL: https://codereview.chromium.org/1687863003
 2016-02-12 12:35:49 -08:00
mtklein
013475a272 Put all XSAN bots on the same DEPS-sourced build of Clang. 
This adds LLVM, Clang, and compiler-rt (*san tools) to DEPS,
then uses them from xsan_build, building them if needed.

This is similar to how the CMake bots bootstrap CMake if needed.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693733003

Review URL: https://codereview.chromium.org/1693733003
 2016-02-12 12:15:23 -08:00
ethannicholas
0a0520afcc added clip visualization to skiaserve 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1690023004

Review URL: https://codereview.chromium.org/1690023004
 2016-02-12 12:06:53 -08:00
ethannicholas
de8e54ccfd skiaserve now retains the graphics context rather than creating a new one each request 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693893002

Review URL: https://codereview.chromium.org/1693893002
 2016-02-12 10:09:34 -08:00
ethannicholas
891ad66d14 fixed SkDebugCanvas' handling of drawPicture 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1685133008

Review URL: https://codereview.chromium.org/1685133008
 2016-02-12 07:15:45 -08:00
ethannicholas
f8289d9bd1 fixed off-by-one error in skiaserve /cmd 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1692683002

Review URL: https://codereview.chromium.org/1692683002
 2016-02-11 13:10:37 -08:00
joshualitt
e1745a1efc enable ThermalManager on Android 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1684653002

Review URL: https://codereview.chromium.org/1684653002
 2016-02-11 11:42:19 -08:00
ethannicholas
f62a8b786c integrated SkDebugCanvas JSON support with UrlDataManager 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1686143004

Review URL: https://codereview.chromium.org/1686143004
 2016-02-11 10:35:21 -08:00
joshualitt
db6a254bdc wire up new json code in skiaserve 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1691773002

Review URL: https://codereview.chromium.org/1691773002
 2016-02-11 07:09:51 -08:00
joshualitt
860fc696d7 fix for gpu valgrind bot 
TBR=egdaniel@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1689823004

Review URL: https://codereview.chromium.org/1689823004
 2016-02-11 06:53:36 -08:00
jcgregorio
12d47ce49e skiaserve: Fix /cmd/N and /cmd/N[0|1], the response was never queued. 
BUG=skia:
R=joshualitt@google.com, ethannicholas@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1686553006

Review URL: https://codereview.chromium.org/1686553006
 2016-02-10 14:10:37 -08:00
ethannicholas
1446a9a67a added JSON support for various lesser-used features 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1690613002

Review URL: https://codereview.chromium.org/1690613002
 2016-02-10 14:05:02 -08:00
ethannicholas
402cd91f60 added SkDebugCanvas::toJSON 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1684233002

Review URL: https://codereview.chromium.org/1684233002
 2016-02-10 12:57:30 -08:00
ethannicholas
bd3dae8a97 added some missing static modifiers 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1690683002

Review URL: https://codereview.chromium.org/1690683002
 2016-02-10 12:10:01 -08:00
kjlubick
1de415f2c3 Revert of Make SkPicture/SkImageGenerator default to SkCodec (patchset #7 id:120001 of https://codereview.chromium.org/1671193002/ ) 
Reason for revert:
Breaks Ubuntu and Mac CMAKE

Original issue's description:
> Make SkPicture/SkImageGenerator default to SkCodec
>
> Remove reference to SkImageDecoder from SkPicture. Make the default
> InstallPixelRefProc passed to CreateFromStream use
> SkImageGenerator::NewFromEncoded instead.
>
> Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator.
> Remove the old version that used SkImageDecoder.
>
> Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default
> now behaves lazily.
>
> Update all clients to use the default.
>
> Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly.
>
> BUG=skia:4691
> BUG=skia:4290
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002
>
> Committed: https://skia.googlesource.com/skia/+/026388a01864c74208ad57d1ba4f711602d101c6

TBR=msarett@google.com,reed@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4691

Review URL: https://codereview.chromium.org/1685963004
 2016-02-10 11:25:07 -08:00
scroggo
026388a018 Make SkPicture/SkImageGenerator default to SkCodec 
Remove reference to SkImageDecoder from SkPicture. Make the default
InstallPixelRefProc passed to CreateFromStream use
SkImageGenerator::NewFromEncoded instead.

Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator.
Remove the old version that used SkImageDecoder.

Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default
now behaves lazily.

Update all clients to use the default.

Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly.

BUG=skia:4691
BUG=skia:4290
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002

Review URL: https://codereview.chromium.org/1671193002
 2016-02-10 11:15:21 -08:00
joshualitt
94edeb2d3b Fix for mips build 
TBR=scroggo@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1688823002

Review URL: https://codereview.chromium.org/1688823002
 2016-02-10 09:47:28 -08:00
ethannicholas
50a8dd0a00 Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas. 
SkJSONCanvas and SkJSONRenderer will be deleted once the debug server
has been updated.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1681643002

Committed: https://skia.googlesource.com/skia/+/32fff1ba0c759d97ab78320b7ae46dd7696a4e6e

Committed: https://skia.googlesource.com/skia/+/46cb6d6b82b0ab71033aef91419e8beae25bb8a4

Review URL: https://codereview.chromium.org/1681643002
 2016-02-10 05:40:46 -08:00
caryclark
d116561ddc Revert of Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas. (patchset #3 id:40001 of https://codereview.chromium.org/1681643002/ ) 
Reason for revert:
breaks various android builds, e.g.

acb02999d4/logs/build_error.log

external/skia/bench/../tools/debugger/SkDrawCommand.cpp:602:9: error: use of undeclared identifier 'free'
        free(data);

Original issue's description:
> Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas.
> SkJSONCanvas and SkJSONRenderer will be deleted once the debug server
> has been updated.
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1681643002
>
> Committed: https://skia.googlesource.com/skia/+/32fff1ba0c759d97ab78320b7ae46dd7696a4e6e
>
> Committed: https://skia.googlesource.com/skia/+/46cb6d6b82b0ab71033aef91419e8beae25bb8a4

TBR=jcgregorio@google.com,joshualitt@chromium.org,ethannicholas@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1683093002
 2016-02-10 04:34:08 -08:00
ethannicholas
46cb6d6b82 Moved Canvas->JSON and JSON->Canvas functionality into SkDebugCanvas. 
SkJSONCanvas and SkJSONRenderer will be deleted once the debug server
has been updated.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1681643002

Committed: https://skia.googlesource.com/skia/+/32fff1ba0c759d97ab78320b7ae46dd7696a4e6e

Review URL: https://codereview.chromium.org/1681643002
 2016-02-09 14:37:55 -08:00
ethannicholas
3cb954245c moved debugger support files from src/utils/debugger to tools/debugger 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1678893003

Review URL: https://codereview.chromium.org/1678893003
 2016-02-09 12:44:06 -08:00
caryclark
f1d415188f Add unit test to feed valid SVG sequences to make sure that 
path strings can be parsed without returning an error.

Draw the output through Skia and SVG to make sure they are
parsed correctly.

R=fmalita@chromium.org
BUG=skia:4549
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1675053002

Review URL: https://codereview.chromium.org/1675053002
 2016-02-09 10:30:22 -08:00
joshualitt
3ebd050be5 Create a thermal manager class and wire it in to nanobench behind a flag 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671573002

Review URL: https://codereview.chromium.org/1671573002
 2016-02-09 07:18:08 -08:00
scroggo
3ac66e98f8 Optionally run RAW images serially 
RAW images use a lot of memory. Add a new FLAG to run one at a time so
we have less risk of running out of memory.

Isolate RAW images to their own thread on particular devices where our
images cause OOM errors.

Locally, this drops the max memory use from 3945 MB to 1664 MB (running only --image --images <RAW images we test>)

BUG=skia:4912
BUG=skia:4878
BUG=b/27035849
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1681553003

Review URL: https://codereview.chromium.org/1681553003
 2016-02-08 15:09:48 -08:00
joshualitt
873d624b80 Skia serve now supports favicon correctly 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1676403002

Review URL: https://codereview.chromium.org/1676403002
 2016-02-08 13:57:44 -08:00
msarett
772cc404e6 Blacklist RAW images on GPU tests 
BUG=skia:4888
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1677133002

Review URL: https://codereview.chromium.org/1677133002
 2016-02-08 11:43:50 -08:00
msarett
13a036b7eb Test CodecImageGenerator on GPU bots 
In crrev.com/1549473003, CodecImageGenerator implemented getYUV8Planes,
so that we can test on a GPU bot. Update the arguments to DM so that
we run CodecImageGenerator on GPU bots.

This is adapted from:
https://codereview.chromium.org/1663453002/

This will cause many untriaged images on Gold.
The GPU converts YUV->RGBA differently than we
do in software.

BUG=skia:4888
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1676663002

Review URL: https://codereview.chromium.org/1676663002
 2016-02-08 09:10:47 -08:00
joshualitt
cdad12f3b1 Create image cache for use by json canvas 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1670153005

Review URL: https://codereview.chromium.org/1670153005
 2016-02-08 07:08:21 -08:00
mtklein
4e79f33452 msan: build expat from source 
This should let us test it on the MSAN bot.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674053002

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

Review URL: https://codereview.chromium.org/1674053002
 2016-02-07 13:31:23 -08:00
mtklein
2afbe23753 msan: initialize buffer BlurLargeImage blurs 
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

BUG=skia:

Review URL: https://codereview.chromium.org/1676103002
 2016-02-07 12:23:10 -08:00
mtklein
1334b41f0f msan: these might be okay with libjpeg guarded. 
BUG=skia:4550
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1677913002

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

Review URL: https://codereview.chromium.org/1677913002
 2016-02-07 11:17:23 -08:00
mtklein
e721a8e883 flags and hacks to get MSAN bot going 
This disables a few tests in DM:
   - one BlurLargeImage GM maybe is really broken
   - FontMgrAndroidParser uses libexpat, which I've not (yet?) built from source,
     so MSAN can't see into it.

This extends some of the MSAN stifling we added around SkImageDecoder_libjpeg to SkCodec, and skips .wbmps, .pngs, and .bmps.  We're only seeing issues in colortables for .png and .bmp.

I think I can probably back out disabling Codec and the RAW image decodes...
they should all be covered by the libjpeg stifles.

BUG=skia:4550,skia:4900
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1673663002

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

TBR=msarett@google.com

Review URL: https://codereview.chromium.org/1673663002
 2016-02-06 19:12:23 -08:00
ethannicholas
f6a84bdb47 Added JSON support for TextBlob et al. 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674643002

Review URL: https://codereview.chromium.org/1674643002
 2016-02-05 09:04:45 -08:00
mtklein
001cc1f41b dont upload to Gold from MSAN bot 
NOTRY=true
NOTREECHECKS=true
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1673643002

Review URL: https://codereview.chromium.org/1673643002
 2016-02-05 06:16:59 -08:00
ethannicholas
299200c24b Fixed references to MakeMatrix function 
TBR=joshualitt@chromium.org
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1666213002

Review URL: https://codereview.chromium.org/1666213002
 2016-02-04 11:19:40 -08:00
ethannicholas
7471c780d4 JSON API cleanups 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1664263002

Review URL: https://codereview.chromium.org/1664263002
 2016-02-04 10:37:50 -08:00
ethannicholas
0bd103497a Improved support for images/bitmaps in SkJSONCanvas 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1662063003

Review URL: https://codereview.chromium.org/1662063003
 2016-02-04 06:45:25 -08:00
joshualitt
29e5a8932d Modify skia serve to return clip rect and view matrix 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1662003002

Review URL: https://codereview.chromium.org/1662003002
 2016-02-04 06:08:33 -08:00
scroggo
8673714d75 Treat bad values passed to --images as a fatal error 
If an option is passed to --images that is either a non-existent path or
a folder with no images matching the supported types, assume this is
an error and exit, so they can supply a valid path instead.

Share code between DM and nanobench in SkCommonFlags.

nanobench now behaves more like DM - it will check a directory for
images that match the supported extensions.

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1611323004

Review URL: https://codereview.chromium.org/1611323004
 2016-02-03 12:19:11 -08:00
mtklein
8ca88e41aa Hack together MSAN build. 
- Build our own: freetype.
  - Avoid using: fontconfig, expat, GPU drivers.
  - Lie about safety: libjpeg (only from src/images... need to in src/codec?)

To run:
  $ tools/xsan_build memory dm
  $ out/Debug/dm -v --match ~Codec ~BlurLargeImage ~FontMgrAndroidParser

Notes:
  - Codec triggers issues in piex.
  - BlurLargeImage probably has bugs in the GM only.
  - FontMgrAndroidParser uses expat.

BUG=skia:4550
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1665823002

NOTREECHECKS=true

Review URL: https://codereview.chromium.org/1665823002
 2016-02-03 09:21:44 -08:00
jcgregorio
bd9dabdb3c Revert of Test CodecImageGenerator on GPU bots (patchset #1 id:1 of https://codereview.chromium.org/1663453002/ ) 
Reason for revert:
Failures:
D/skia    ( 3581): 	gpu image gen frame_larger_than_image.gif: Could not create a surface.
D/skia    ( 3581): 	gpu image gen offsets_too_large.gif: Could not create a surface.
D/skia    ( 3581): 	gpu image gen PANO_20121023_214540.jpg: Could not create a surface.
D/skia    ( 3581): 	gpu image gen interlaced1.png: Could not create a surface.
D/skia    ( 3581): 	gpu image gen interlaced2.png: Could not create a surface.
D/skia    ( 3581): 	gpu image gen interlaced3.png: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Canon_5D2.dng: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Fuji_X20.dng: Could not create a surface.
D/skia    ( 3581): 	gpu image gen HTC.dng: Could not create a surface.
D/skia    ( 3581): 	gpu image gen lg_g4_iso_800.dng: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Canon_G7X.CR2: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Pentax_K5.DNG: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Nikon_1AW1.NEF: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Nikon_1J4.NEF: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Nikon_P330.NRW: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Olympus_E-PL3.ORF: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Olympus_PL7.ORF: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Pentax_K5.PEF: Could not create a surface.
D/skia    ( 3581): 	gpu image gen Samsung_NX3000.SRW: Could not create a surface.

Original issue's description:
> Test CodecImageGenerator on GPU bots
>
> In crrev.com/1549473003, CodecImageGenerator implemented getYUV8Planes,
> so that we can test on a GPU bot. Update the arguments to DM so that
> we run CodecImageGenerator on GPU bots.
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1663453002
>
> Committed: https://skia.googlesource.com/skia/+/c9715406c4c9c995e5661a4ea2188fb8643845c0

TBR=msarett@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1663143002
 2016-02-03 08:31:07 -08:00
rmistry
37ed996f2d Do not upload to trusted partner's bucket if it is a dry run 
BUG=skia:3751
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1665803002

# Trybots do not exercise this code.
NOTRY=true

Review URL: https://codereview.chromium.org/1665803002
 2016-02-03 07:08:02 -08:00
scroggo
c9715406c4 Test CodecImageGenerator on GPU bots 
In crrev.com/1549473003, CodecImageGenerator implemented getYUV8Planes,
so that we can test on a GPU bot. Update the arguments to DM so that
we run CodecImageGenerator on GPU bots.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1663453002

Review URL: https://codereview.chromium.org/1663453002
 2016-02-03 06:23:06 -08:00
rmistry
f5e83951ad Fix delete_path in webpages_playback.py 
BUG=skia:3751
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1662673003

# Trybots do not exercise this code.
NOTRY=true

Review URL: https://codereview.chromium.org/1662673003
 2016-02-03 05:58:31 -08:00
rmistry
c33c79c97d Delete skp dir in partner bucket before uploading 
BUG=skia:3751
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1660363002

# Trybots do not exercise this code.
NOTRY=true
TBR=borenet

Review URL: https://codereview.chromium.org/1660363002
 2016-02-03 04:27:54 -08:00
rmistry
8870e94fe3 Recreate SKPs in a single directory for trusted partners. 
Context: https://bugs.chromium.org/p/skia/issues/detail?id=3751#c15

BUG=skia:3751
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1662693002

# Trybots do not run this code
NOTRY=true
TBR=borenet

Review URL: https://codereview.chromium.org/1662693002
 2016-02-02 13:55:38 -08:00
joshualitt
792345f540 Modify skiaserve to support downloads 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1657403002

Review URL: https://codereview.chromium.org/1657403002
 2016-02-02 13:02:33 -08:00
scroggo
1497f9f264 Update SK_IMAGE_VERSION to test RAW 
Bump SK_IMAGE_VERSION to test the images in v2 in GoogleStorage, which
includes the images from v1 plus test images for SkRawCodec.

Only define skia_decodes_raw on platforms that support it, rather than
defining it always and checking additional conditions to determine
whether to support raw. Further, define it and SK_CODEC_DECODES_RAW
for all targets, so we can use the compile flag in other targets.

In DM, exclude the raw extensions if SK_CODEC_DECODES_RAW is not defined.

Blacklist raw extensions on NexusPlayer, which was running out of memory
when running them.

BUG=skia:4829

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1612113002

Review URL: https://codereview.chromium.org/1612113002
 2016-02-02 11:56:33 -08:00
joshualitt
136f517627 Modify skiaserve to support drawTo 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1651403003

Review URL: https://codereview.chromium.org/1651403003
 2016-02-02 11:07:39 -08:00
ethannicholas
30c5dde90d support for more features when rendering to/from JSON 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1662503003

Review URL: https://codereview.chromium.org/1662503003
 2016-02-02 08:36:58 -08:00
joshualitt
a341b90c7f fix skiaserve crash 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1659703004

Review URL: https://codereview.chromium.org/1659703004
 2016-02-02 07:37:21 -08:00
joshualitt
483b90140a cleanup of skia serve url handling 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1653203002

Review URL: https://codereview.chromium.org/1653203002
 2016-02-02 07:16:24 -08:00
rmistry
0575c495bc Upload SKPs to chrome-partner-telemetry 
Context:
https://bugs.chromium.org/p/skia/issues/detail?id=3751#c4
and
https://bugs.chromium.org/p/skia/issues/detail?id=3751#c6

BUG=skia:3751

# Trybots do not run this code.
NOTRY=true
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1658653002

Review URL: https://codereview.chromium.org/1658653002
 2016-02-01 10:27:05 -08:00
scroggo
ad38ed6003 Revert of Treat bad values passed to --images as a fatal error (patchset #17 id:320001 of https://codereview.chromium.org/1611323004/ ) 
Reason for revert:
Speculative to fix windows bots

Original issue's description:
> Treat bad values passed to --images as a fatal error
>
> If an option is passed to --images that is either a non-existent path or
> a folder with no images matching the supported types, assume this is
> an error and exit, so they can supply a valid path instead.
>
> Share code between DM and nanobench in SkCommonFlags.
>
> nanobench now behaves more like DM - it will check a directory for
> images that match the supported extensions.
>
> Only consider image paths ending in RAW suffixes as images if
> SK_CODE_DECODES_RAW is defined. This prevents us from seeing failure
> to decode errors on platforms that cannot decode it.
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1611323004
>
> Committed: https://skia.googlesource.com/skia/+/7579786f3bd5a8fda84a1abc45b16213c3371f93

TBR=mtklein@google.com,borenet@google.com,msarett@google.com

NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
# Not skipping CQ checks because original CL landed more than 1 days ago.

Review URL: https://codereview.chromium.org/1653543002
 2016-01-29 14:41:55 -08:00
djsollen
f2b340fc88 Consolidate SK_CRASH and sk_throw into SK_ABORT 
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1648343003

Review URL: https://codereview.chromium.org/1648343003
 2016-01-29 08:51:04 -08:00
ethannicholas
c05f7c3d57 fix for skiaserve build error 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1651443002

TBR=jcgregorio@google.com

Review URL: https://codereview.chromium.org/1651443002
 2016-01-29 08:02:34 -08:00
ethannicholas
78fc22af41 added support for more features in JSON (blurs, dashing, different path fill types, etc.) 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1644903003

Review URL: https://codereview.chromium.org/1644903003
 2016-01-29 07:15:08 -08:00
halcanary
83024f99d6 tools/git-sync-deps: fix error in git syntax for changing origin 
Error introduced in https://crrev.com/1475513004

NOTRY=true

Review URL: https://codereview.chromium.org/1646863002
 2016-01-28 09:12:52 -08:00
scroggo
7579786f3b Treat bad values passed to --images as a fatal error 
If an option is passed to --images that is either a non-existent path or
a folder with no images matching the supported types, assume this is
an error and exit, so they can supply a valid path instead.

Share code between DM and nanobench in SkCommonFlags.

nanobench now behaves more like DM - it will check a directory for
images that match the supported extensions.

Only consider image paths ending in RAW suffixes as images if
SK_CODE_DECODES_RAW is defined. This prevents us from seeing failure
to decode errors on platforms that cannot decode it.

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1611323004

Review URL: https://codereview.chromium.org/1611323004
 2016-01-28 08:41:10 -08:00
joshualitt
b35c82dc94 Add a background timing thread to kilobench 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1612513002

Review URL: https://codereview.chromium.org/1612513002
 2016-01-28 06:26:35 -08:00
jcgregorio
21ab1209f5 skiaserve: Clean up flags. 
Remove unused flags.
Add --port and --source.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1643963002

Review URL: https://codereview.chromium.org/1643963002
 2016-01-28 06:24:19 -08:00
jcgregorio
6a2046ea34 skiaserve: Add CORS header, and debugger code is served over HTTPS. 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1646683002

Review URL: https://codereview.chromium.org/1646683002
 2016-01-28 05:31:31 -08:00
jcgregorio
9ce4110a29 skiaserve: Enable /cmd endpoint. 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1639403002

Review URL: https://codereview.chromium.org/1639403002
 2016-01-27 12:15:38 -08:00
msarett
a7dd73ba53 Suppress jpeg valgrind errors 
Do a better job suppressing these errors until I can prioritize fixing
them.

BUG=skia:4550
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1641763002

Review URL: https://codereview.chromium.org/1641763002
 2016-01-27 12:05:27 -08:00