bsalomon [Fri, 1 Apr 2016 13:06:20 +0000 (06:06 -0700)]
Simplify GrDrawBatch uploads and token uage.
GrVertexBatch subclasses no longer need "initDraw".
Simplifies GrTestBatch
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835283002
Review URL: https://codereview.chromium.org/
1835283002
benjaminwagner [Fri, 1 Apr 2016 12:00:51 +0000 (05:00 -0700)]
In public.bzl, change file locations after https://codereview.chromium.org/
1815823002
Depends on https://codereview.chromium.org/
1847923002
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842363002
Review URL: https://codereview.chromium.org/
1842363002
mtklein [Fri, 1 Apr 2016 11:55:51 +0000 (04:55 -0700)]
sk_sp for SkCanvas::drawAnnotation()
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1849703003
Review URL: https://codereview.chromium.org/
1849703003
mtklein [Fri, 1 Apr 2016 11:55:47 +0000 (04:55 -0700)]
fix typo: add missing const
TBR=reed@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1848533004
Review URL: https://codereview.chromium.org/
1848533004
bsalomon [Fri, 1 Apr 2016 11:50:45 +0000 (04:50 -0700)]
Add CreatePlatformGLTestContext_none.cpp for Google3 build
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1847923002
Review URL: https://codereview.chromium.org/
1847923002
kkinnunen [Fri, 1 Apr 2016 11:50:37 +0000 (04:50 -0700)]
Remove ownership parameter from GrResourceProvider::wrapBackendTextureAsRenderTarget
Remove ownership parameter from
GrResourceProvider::wrapBackendTextureAsRenderTarget.
The function leaks the texture id if kAdopt_LifeCycle is passed.
There is no public API to access the parameter.
BUG=594928
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842313003
Review URL: https://codereview.chromium.org/
1842313003
Brian Salomon [Thu, 31 Mar 2016 18:30:08 +0000 (14:30 -0400)]
Fix compilation of GLTestContext_angle.cpp"
TBR=robertphillips@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1850783003
BUG=skia:
Review URL: https://codereview.chromium.org/
1850783003 .
bsalomon [Thu, 31 Mar 2016 17:59:06 +0000 (10:59 -0700)]
rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext
rename subclasses
Fix up the EGL native GLTestContext
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1849463002
TBR=jvanverth@google.com
Committed: https://skia.googlesource.com/skia/+/
4c7f0a16312c374eba4e8d5d46435ce9eb0b9971
Review URL: https://codereview.chromium.org/
1849463002
halcanary [Thu, 31 Mar 2016 17:35:13 +0000 (10:35 -0700)]
Fiddle: update to new GrGLAssembleInterface API
NOTRY=true
TBR=
Review URL: https://codereview.chromium.org/
1849753003
robertphillips [Thu, 31 Mar 2016 17:27:26 +0000 (10:27 -0700)]
Revert of Add unit repeat tiler (patchset #4 id:60001 of https://codereview.chromium.org/
1837893004/ )
Reason for revert:
ASAN bot failures
Original issue's description:
> Add unit repeat tiler.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1837893004
>
> Committed: https://skia.googlesource.com/skia/+/
865a289bfec169cb19970c734e9aa855c267f060
TBR=mtklein@google.com,fmalita@chromium.org,herb@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/
1844713005
bsalomon [Thu, 31 Mar 2016 17:22:40 +0000 (10:22 -0700)]
Revert of rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext (patchset #5 id:80001 of https://codereview.chromium.org/
1849463002/ )
Reason for revert:
breaking bots
Original issue's description:
> rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext
>
> rename subclasses
>
> Fix up the EGL native GLTestContext
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1849463002
>
> TBR=jvanverth@google.com
>
> Committed: https://skia.googlesource.com/skia/+/
4c7f0a16312c374eba4e8d5d46435ce9eb0b9971
TBR=jvanverth@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/
1850543003
bsalomon [Thu, 31 Mar 2016 17:22:20 +0000 (10:22 -0700)]
Expose GrGLAssembleInterface
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842363003
Review URL: https://codereview.chromium.org/
1842363003
bsalomon [Thu, 31 Mar 2016 17:07:23 +0000 (10:07 -0700)]
rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext
rename subclasses
Fix up the EGL native GLTestContext
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1849463002
TBR=jvanverth@google.com
Review URL: https://codereview.chromium.org/
1849463002
robertphillips [Thu, 31 Mar 2016 16:05:49 +0000 (09:05 -0700)]
Update SkOffsetImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842193002
Review URL: https://codereview.chromium.org/
1842193002
herb [Thu, 31 Mar 2016 15:48:21 +0000 (08:48 -0700)]
Add unit repeat tiler.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1837893004
Review URL: https://codereview.chromium.org/
1837893004
bungeman [Thu, 31 Mar 2016 15:30:38 +0000 (08:30 -0700)]
Add 'P' to SampleApp to cycle through pixel geometries.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1834243002
Review URL: https://codereview.chromium.org/
1834243002
msarett [Thu, 31 Mar 2016 15:25:19 +0000 (08:25 -0700)]
Remode dead code from SkReadBuffer
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1845283002
Review URL: https://codereview.chromium.org/
1845283002
senorblanco [Thu, 31 Mar 2016 15:24:29 +0000 (08:24 -0700)]
Image filters: fix crop rect application in SkXfermodeImageFilter.
The crop rect was being incorrectly applied in SkXfermodeImageFilter:
the background and foreground bounds were having the crop rect applied
individually to them, and then unioned. The correct approach is to take
the union of their bounds, and apply the crop rect to that. (A similar
bug in SkMergeImageFilter was fixed a while back.)
This is important when applying a compositing mode
which affects pixels outside the foreground bounds
(e.g., SrcIn, SrcOut).
NOTE: this will change the results of the xfermodeimagefilter GM (new
test case).
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842033005
Review URL: https://codereview.chromium.org/
1842033005
kkinnunen [Thu, 31 Mar 2016 15:08:20 +0000 (08:08 -0700)]
Fix Vulkan tests after GrContextFactory move to sk_gpu_test
Fix Vulkan tests after GrContextFactory move to sk_gpu_test
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1844983003
Review URL: https://codereview.chromium.org/
1844983003
halcanary [Thu, 31 Mar 2016 14:33:57 +0000 (07:33 -0700)]
SkPDF: Use Pathops clipping
Turn this on all the time. Remove the SK_PDF_USE_PATHOPS_CLIPPING
define that used to hide this functionality.
All rendering tests are the same or improved by this.
Also, remove non-functional SK_ALLOW_LARGE_PDF_SCALARS.
TBR=reed@google.com
removing dead #defines from SkUserConfig.h
BUG=591805
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1845623002
Review URL: https://codereview.chromium.org/
1845623002
halcanary [Thu, 31 Mar 2016 13:59:00 +0000 (06:59 -0700)]
SkPDF: Make magic make sense
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1849453004
Review URL: https://codereview.chromium.org/
1849453004
egdaniel [Thu, 31 Mar 2016 13:16:31 +0000 (06:16 -0700)]
Update shaderc to ToT.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1847643002
Review URL: https://codereview.chromium.org/
1847643002
benjaminwagner [Thu, 31 Mar 2016 13:13:22 +0000 (06:13 -0700)]
Make SkRandom::next[US]Fixed1 private; update documentation for SkRandom::nextSScalar1.
SkRandom is unused in Chromium, Android, Mozilla, and Google3.
SkRandom::nextSScalar1 and LCGRandom::nextSScalar1 appear to me by inspection to potentially return -1, so I updated the documentation to match.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1846773002
Review URL: https://codereview.chromium.org/
1846773002
brucedawson [Thu, 31 Mar 2016 12:53:44 +0000 (05:53 -0700)]
Fix C4334 warning about 32-bit shift assigned to 64-bits
VS 2015 has a new or louder warning about 32-bit shifts that are then
assigned to a 64-bit target. This type of code triggers it:
int64_t size = 1 << shift_amount;
Because the '1' being shifted is a 32-bit int the result of the shift
will be a 32-bit result, so assigning it to a 64-bit variable is just
misleading.
In this case the code that triggers it is this:
size_t alloc = 1<<fLgSize++;
The destination is a size_t so the warning only shows up on 64-bit
builds and doesn't indicate a real bug. But, casting the '1' constant
to size_t makes the behavior/intent more obvious and consistent and
allows enabling C4334 in Chromium.
BUG=593448
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1845123002
Review URL: https://codereview.chromium.org/
1845123002
Brian Salomon [Thu, 31 Mar 2016 03:20:09 +0000 (23:20 -0400)]
Make skgputest target depend on gl/glx/glu or egl/gles2 libs on linux
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1846623003
Review URL: https://codereview.chromium.org/
1846623003 .
bsalomon [Thu, 31 Mar 2016 01:56:19 +0000 (18:56 -0700)]
Move SkGLContext and some GrGLInterface implementations to skgputest module
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1815823002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Committed: https://skia.googlesource.com/skia/+/
fe3456cb006110d045b26ff3f8681b893a757b58
Review URL: https://codereview.chromium.org/
1815823002
robertphillips [Wed, 30 Mar 2016 20:34:16 +0000 (13:34 -0700)]
Update SkMergeImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1847583002
Review URL: https://codereview.chromium.org/
1847583002
halcanary [Wed, 30 Mar 2016 19:59:14 +0000 (12:59 -0700)]
SkPDF: SkTypeface::openStream could return nullptr
Speculative fix for hard-to-reproduce bug.
BUG=163892
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842163002
Review URL: https://codereview.chromium.org/
1842163002
robertphillips [Wed, 30 Mar 2016 19:32:58 +0000 (12:32 -0700)]
Update SkComposeImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1841233002
Review URL: https://codereview.chromium.org/
1841233002
egdaniel [Wed, 30 Mar 2016 19:06:48 +0000 (12:06 -0700)]
Enable dual source blending for Vulkan
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1837213003
Review URL: https://codereview.chromium.org/
1837213003
msarett [Wed, 30 Mar 2016 19:01:47 +0000 (12:01 -0700)]
Correct png inverse gAMA when parsing color space
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1829433002
Review URL: https://codereview.chromium.org/
1829433002
brianosman [Wed, 30 Mar 2016 18:19:36 +0000 (11:19 -0700)]
Enable gpusrgb config on bots.
Don't run the config if we can't get a context with srgb support.
Includes a unit test for that logic.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1846603002
Review URL: https://codereview.chromium.org/
1846603002
robertphillips [Wed, 30 Mar 2016 16:26:24 +0000 (09:26 -0700)]
Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module (patchset #13 id:240001 of https://codereview.chromium.org/
1815823002/ )
Reason for revert:
red bots
Original issue's description:
> Move SkGLContext and some GrGLInterface implementations to skgputest module
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1815823002
> CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/
fe3456cb006110d045b26ff3f8681b893a757b58
TBR=jvanverth@google.com,bsalomon@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/
1845473004
bsalomon [Wed, 30 Mar 2016 15:35:09 +0000 (08:35 -0700)]
Move SkGLContext and some GrGLInterface implementations to skgputest module
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1815823002
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/
1815823002
halcanary [Wed, 30 Mar 2016 15:31:27 +0000 (08:31 -0700)]
DM: allow vias to work with PDF backend
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1837263007
Review URL: https://codereview.chromium.org/
1837263007
djsollen [Wed, 30 Mar 2016 15:28:02 +0000 (08:28 -0700)]
Force include test to run on every compile.
Also fix the tool to stop looking in the src dir for includes.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1839123004
Review URL: https://codereview.chromium.org/
1839123004
robertphillips [Wed, 30 Mar 2016 15:09:56 +0000 (08:09 -0700)]
Update Morphology image filter to store its type
TBR=bsalomon@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1834953002
Review URL: https://codereview.chromium.org/
1834953002
borenet [Wed, 30 Mar 2016 14:41:32 +0000 (07:41 -0700)]
Fixes for Swarming recipes
BUG=skia:4763
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1827413002
NOTRY=true
Review URL: https://codereview.chromium.org/
1827413002
robertphillips [Wed, 30 Mar 2016 14:32:28 +0000 (07:32 -0700)]
Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842793002
Committed: https://skia.googlesource.com/skia/+/
a33cf07a2273315363c0b6fb5d3ce811742f5a85
Review URL: https://codereview.chromium.org/
1842793002
brianosman [Wed, 30 Mar 2016 13:30:46 +0000 (06:30 -0700)]
Blacklist shapes benchmarks on Mali400 bot.
BUG=skia:4966
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1839193002
Review URL: https://codereview.chromium.org/
1839193002
cdalton [Wed, 30 Mar 2016 03:05:07 +0000 (20:05 -0700)]
Add test configs for nvpr with atlas text
Adds nvpr4 and nvpr16, which use nvpr for paths and atlas for text.
Renames nvprmsaa4 and nvprmsaa16 to nvprdit4, nvprdit16. These use nvpr
for both paths and text.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1834693002
Review URL: https://codereview.chromium.org/
1834693002
djsollen [Wed, 30 Mar 2016 02:07:07 +0000 (19:07 -0700)]
Revert of Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp (patchset #6 id:100001 of https://codereview.chromium.org/
1842793002/ )
Reason for revert:
This CL is causing the autoroll into Chromium & google3 to fail.
Original issue's description:
> Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp
>
> TBR=reed@google.com
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842793002
>
> Committed: https://skia.googlesource.com/skia/+/
a33cf07a2273315363c0b6fb5d3ce811742f5a85
TBR=fmalita@chromium.org,reed@google.com,robertphillips@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/
1837293003
herb [Tue, 29 Mar 2016 21:48:44 +0000 (14:48 -0700)]
Add repeatSpan and change interface name.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1841793002
Review URL: https://codereview.chromium.org/
1841793002
robertphillips [Tue, 29 Mar 2016 20:54:26 +0000 (13:54 -0700)]
Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842793002
Review URL: https://codereview.chromium.org/
1842793002
jcgregorio [Tue, 29 Mar 2016 19:29:19 +0000 (12:29 -0700)]
fiddle: Only output errors to stderr.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1843733002
Review URL: https://codereview.chromium.org/
1843733002
reed [Tue, 29 Mar 2016 18:32:50 +0000 (11:32 -0700)]
switch xfermodes over to sk_sp
waiting on https://codereview.chromium.org/
1835163002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1832223002
Review URL: https://codereview.chromium.org/
1832223002
brianosman [Tue, 29 Mar 2016 18:27:20 +0000 (11:27 -0700)]
Dirty mipmaps whenever we upload new contents for a texture.
Found a bug where we rendered with two identically sized textures. On
the first frame, everything worked. On subsequent frames, we would get
the other texture from the cache, causing us to inherit the mips from
the wrong texture.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1836143003
Review URL: https://codereview.chromium.org/
1836143003
halcanary [Tue, 29 Mar 2016 17:10:24 +0000 (10:10 -0700)]
SkPDF: skia_pdf_less_compression - for debugging only
Motivation: as we implement more features in PDF, it would be nice to more easily see what is happening in the output. This change serializes page content as plain text rather than compressed text, but it has to be explicitly enabled with a GYP_DEFINE change:
export GYP_DEFINES='skia_pdf_less_compression=1'
bin/sync-and-gyp
ninja -C out/Debug dm
out/Debug/dm --config pdf --src gm -w /tmp
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1840103002
Review URL: https://codereview.chromium.org/
1840103002
halcanary [Tue, 29 Mar 2016 16:09:29 +0000 (09:09 -0700)]
SkPDF: milestone in metadata, also SkMilestone.h
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1823753002
Review URL: https://codereview.chromium.org/
1823753002
halcanary [Tue, 29 Mar 2016 16:03:52 +0000 (09:03 -0700)]
Style bikeshed - remove extraneous whitespace
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842753002
Review URL: https://codereview.chromium.org/
1842753002
kjlubick [Tue, 29 Mar 2016 12:50:41 +0000 (05:50 -0700)]
Prevent waiting for charge twice
BUG=skia:5111
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1840003002
Review URL: https://codereview.chromium.org/
1840003002
bsalomon [Mon, 28 Mar 2016 22:04:45 +0000 (15:04 -0700)]
Fix GrConvexPolyEffect to deal with line paths.
BUG=skia:4727
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1839743002
Review URL: https://codereview.chromium.org/
1839743002
msarett [Mon, 28 Mar 2016 20:57:10 +0000 (13:57 -0700)]
Delete SkImageDecoder_empty
We no longer need this now that the Chrome build files have been
updated to use SkImageEncoder_none (which is an identical file).
TBR=djsollen@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1832363002
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/
1832363002
benjaminwagner [Mon, 28 Mar 2016 20:27:28 +0000 (13:27 -0700)]
Remove GLFW from public.bzl.
Added in https://codereview.chromium.org/
1842463002
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835363002
Review URL: https://codereview.chromium.org/
1835363002
robertphillips [Mon, 28 Mar 2016 20:13:42 +0000 (13:13 -0700)]
Swap SkPictureImageFilter's factories over to smart pointers
A trial balloon before converting the rest
This requires https://codereview.chromium.org/
1836443003/ (add SK_SUPPORT_LEGACY_IMAGEFILTER_PTR flag for future skia CL) to land in Chromium first
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1831323003
Review URL: https://codereview.chromium.org/
1831323003
mtklein [Mon, 28 Mar 2016 19:43:39 +0000 (12:43 -0700)]
We meant these to be YES... sigh.
This will dramatically improve link times with XCode 7.3.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835303003
Review URL: https://codereview.chromium.org/
1835303003
egdaniel [Mon, 28 Mar 2016 19:39:29 +0000 (12:39 -0700)]
Change VkPipelineStateCahce to use Hash and LRU LList.
This simplifies the caching code and forms the base for a caching template
that will be easier to use for other objects within Vulkan.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1836863002
Review URL: https://codereview.chromium.org/
1836863002
bsalomon [Mon, 28 Mar 2016 19:25:09 +0000 (12:25 -0700)]
Remove the GrGLInterface callback mechanism.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1836013002
Review URL: https://codereview.chromium.org/
1836013002
benjaminwagner [Mon, 28 Mar 2016 19:25:04 +0000 (12:25 -0700)]
Remove advance[XY]Fixed getters.
Reverts https://codereview.chromium.org/
1772863002 after updating Android.
BUG=skia:4632
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1842453002
Review URL: https://codereview.chromium.org/
1842453002
egdaniel [Mon, 28 Mar 2016 19:14:42 +0000 (12:14 -0700)]
Use NV glsl shader compiler for Vulkan
The nvidia direct glsl shader compiler seems to perform much better than using
shaderc to compile to spir-v first.
This change also includes a change to prefer host cached memory for buffers.
Having cached buffers signifcantly improves performance whenever we need to do
buffer reads and writes.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835813003
Review URL: https://codereview.chromium.org/
1835813003
halcanary [Mon, 28 Mar 2016 18:58:08 +0000 (11:58 -0700)]
SkPDF: PDFDevice::ContentEntry now implemented with SinglyLinkedList
add SkSinglyLinkedList<T> class
no change in SkPDF output.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1839633003
Review URL: https://codereview.chromium.org/
1839633003
abarth [Mon, 28 Mar 2016 18:34:27 +0000 (11:34 -0700)]
Add GLFW support for GrGLCreateNativeInterface
This file lets us use Skia's GPU backend with GLFW.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1827153003
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/
1827153003
bungeman [Mon, 28 Mar 2016 18:24:04 +0000 (11:24 -0700)]
Remove SK_IGNORE_MAC_FONT_WEIGHT_FIX.
This is now a dead define, and the changes have been rebased in both
Skia gold and Blink layout tests.
BUG=5095
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1837783002
Review URL: https://codereview.chromium.org/
1837783002
robertphillips [Mon, 28 Mar 2016 18:07:43 +0000 (11:07 -0700)]
Temporary fix for --preAbandonGpuContext bug
In this instance what is going wrong is:
the context gets abandoned
SkCanvas tries to create a new SkGpuDevice (which fails)
if then creates a bitmap device
it then attempts to draw the abandoned GrTexture (behind the old SkGpuDevice into the new bitmap device with an image filter
b.c. some image filters still switch their behavior based on the presence of a texture bad stuff happens
This used to be resolved by the new bitmap device getting forced down the bitmap path and then failing when it attempted to readback the GrTexture.
BUG=skia:5138
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1840663002
Review URL: https://codereview.chromium.org/
1840663002
benjaminwagner [Mon, 28 Mar 2016 17:32:05 +0000 (10:32 -0700)]
Make SkFixed private.
Removed from Chromium in https://codereview.chromium.org/
1698083004 and https://codereview.chromium.org/
1752953003.
Removed from Android in 895781.
Removed from Google3 in internal cl/
118359061.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1839653002
Review URL: https://codereview.chromium.org/
1839653002
rmistry [Mon, 28 Mar 2016 16:35:41 +0000 (09:35 -0700)]
Skip toolchain downloads for a few android tools.
This is an attempt to avoid downloading the android toolchain when not required.
I went through all binaries listed in https://code.google.com/p/chromium/codesearch#chromium/build/scripts/slave/recipe_modules/skia/android_flavor.py except for android_ninja.
BUG=skia:5119
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1832883002
Review URL: https://codereview.chromium.org/
1832883002
halcanary [Mon, 28 Mar 2016 16:00:22 +0000 (09:00 -0700)]
rm src/ports/SkTime_*.cpp
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1833283002
Review URL: https://codereview.chromium.org/
1833283002
halcanary [Mon, 28 Mar 2016 14:58:30 +0000 (07:58 -0700)]
SkPDF s/SkAutoTDelete/std::unique_ptr/
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1837553002
Review URL: https://codereview.chromium.org/
1837553002
jvanverth [Mon, 28 Mar 2016 14:03:06 +0000 (07:03 -0700)]
Add WSI functions to GrVkInterface
BUG=skia:5043
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1834903003
Review URL: https://codereview.chromium.org/
1834903003
update-skps [Sun, 27 Mar 2016 07:30:19 +0000 (00:30 -0700)]
Update SKP version
Automatic commit by the RecreateSKPs bot.
TBR=
NO_MERGE_BUILDS
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835193002
Review URL: https://codereview.chromium.org/
1835193002
Brian Salomon [Sat, 26 Mar 2016 01:38:09 +0000 (21:38 -0400)]
Don't crash when resource path is omitted
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1840573004
Review URL: https://codereview.chromium.org/
1840573004 .
halcanary [Fri, 25 Mar 2016 22:22:47 +0000 (15:22 -0700)]
rm src/animator/SkTime.cpp
It was empty anyway.
Review URL: https://codereview.chromium.org/
1835073002
halcanary [Fri, 25 Mar 2016 21:44:33 +0000 (14:44 -0700)]
SkPDF: remove margin foolishness
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1837453003
Review URL: https://codereview.chromium.org/
1837453003
Brian Salomon [Fri, 25 Mar 2016 21:02:20 +0000 (17:02 -0400)]
Don't crash when resource path isn't specified
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1838583002
BUG=skia:
Review URL: https://codereview.chromium.org/
1838583002 .
benjaminwagner [Fri, 25 Mar 2016 20:41:38 +0000 (13:41 -0700)]
Remove Sk48Dot16. No longer used.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1831303003
Review URL: https://codereview.chromium.org/
1831303003
brianosman [Fri, 25 Mar 2016 20:03:03 +0000 (13:03 -0700)]
Re-enable CPU mipmap generation for Ganesh. Aniso mips were landed a while ago. However, the CPU builder fails when it sees Index8 (among other things), so change the code to fallback to GPU in that case. Additionally, if we're going to be mipping an sRGB image, don't use the CPU code (which is not yet gamma correct). Unfortunately, this means that we will often be using the GPU path, still - with recent codec changes, most images are coming in tagged as sRGB.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835003002
Committed: https://skia.googlesource.com/skia/+/
b0ac1af7fab467aacbc27d20d14a09bcb960472f
Review URL: https://codereview.chromium.org/
1835003002
benjaminwagner [Fri, 25 Mar 2016 19:59:53 +0000 (12:59 -0700)]
Change SkTime::GetMSecs to double; ensure values stored in SkMSec do not overflow.
The following are currently unused in Android, Google3, Chromium, and Mozilla:
- SkEvent
- SkTime::GetMSecs
- SK_TIME_FACTOR (also unused in Skia)
- SkAutoTime
I left uses of SkMSec more-or-less intact for SkEvent, SkAnimator, and SkInterpolator. SkInterpolator is used in Chromium, so I did not want to change the API. The views/ and animator/ code is crufty, so it didn't seem worthwhile to refactor it. Instead, I added SkEvent::GetMSecsSinceStartup, which is likely to be adequate for use in SampleApp.
I also left SkMSec where it is used to measure a duration rather than a timestamp. With the exception of SkMovie, which is used in Android, all of the uses appear to measure the execution time of a piece of code, which I would hope does not exceed 2^31 milliseconds.
Added skiatest::Timer to support a common idiom in tests where we want to measure the wallclock time in integer milliseconds. (Not used in tests/PathOpsSkpClipTest.cpp because it redefines things in Test.h.)
Removed tabs in tests/StrokerTest.cpp.
BUG=skia:4632
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1811613004
Review URL: https://codereview.chromium.org/
1811613004
brianosman [Fri, 25 Mar 2016 19:55:52 +0000 (12:55 -0700)]
SkMipMap::Build supports 1xN and Nx1 inputs, so remove the special case from the test harness. Update a no-longer-correct comment.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1831983003
Review URL: https://codereview.chromium.org/
1831983003
cdalton [Fri, 25 Mar 2016 19:15:03 +0000 (12:15 -0700)]
Consolidate GPU buffer implementations
Consolidates all the different buffer implementations into a single
GrBuffer class. This will allow us to add new buffer types, use DSA in
OpenGL, track buffer bindings by unique ID, cache buffers without
respect to the type of data they have been used for previously, etc.
This change is strictly a refactor; it introduces no change in
functionality.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1825393002
Committed: https://skia.googlesource.com/skia/+/
8b1bff29675afd25843439eade634a57f68fe16f
Review URL: https://codereview.chromium.org/
1825393002
msarett [Fri, 25 Mar 2016 19:13:17 +0000 (12:13 -0700)]
Compile default SkMovie on cmake
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835033002
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/
1835033002
scroggo [Fri, 25 Mar 2016 19:00:14 +0000 (12:00 -0700)]
Move SkRWBuffer.h to include/ and add SK_API
Needed for use in Blink in crrev.com/
1812273003
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1838463003
Review URL: https://codereview.chromium.org/
1838463003
halcanary [Fri, 25 Mar 2016 18:57:49 +0000 (11:57 -0700)]
SkPDF: draw{Image,Bitmap} always serializes early
Before this change, the PDFCanon held a map from BitmapKeys
to SkImages for de-duping bitmaps. Even if the PDFDocument
serialized images early, the Canon still held a ref to that
image inside the map. With this change, the Canon holds a
single map from BitmapKeys to PDFObjects. Now, Images are
only held by the PDFObject, which the document serializes
and drops early.
This change also:
- Moves SkBitmapKey into its own header (for possible
reuse); it now can operate with images as well as
bitmaps.
- Creates SkImageBitmap, which wraps a pointer to a bitmap
or an image and abstracts out some common tasks so that
drawBitmap and drawImage behave the same.
- Modifies SkPDFCreateBitmapObject to take and return a
sk_sp<T>, not a T*.
- Refactors SkPDFDevice::internalDrawImage to use bitmaps
or images (via a SkImageBitmap).
- Turns on pre-serialization of all images.
BUG=skia:5087
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1829693002
Review URL: https://codereview.chromium.org/
1829693002
brianosman [Fri, 25 Mar 2016 18:54:32 +0000 (11:54 -0700)]
Revert of Re-enable CPU mipmap generation for Ganesh. Aniso mips were landed a while ago. However, the CPU bu… (patchset #1 id:1 of https://codereview.chromium.org/
1835003002/ )
Reason for revert:
Speculative - seems likely to be the results of nanobench crashes on several bots.
Original issue's description:
> Re-enable CPU mipmap generation for Ganesh. Aniso mips were landed a while ago. However, the CPU builder fails when it sees Index8 (among other things), so change the code to fallback to GPU in that case. Additionally, if we're going to be mipping an sRGB image, don't use the CPU code (which is not yet gamma correct). Unfortunately, this means that we will often be using the GPU path, still - with recent codec changes, most images are coming in tagged as sRGB.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835003002
>
> Committed: https://skia.googlesource.com/skia/+/
b0ac1af7fab467aacbc27d20d14a09bcb960472f
TBR=reed@google.com,bsalomon@google.com,cblume@chromium.org
# 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/
1836563002
halcanary [Fri, 25 Mar 2016 18:29:34 +0000 (11:29 -0700)]
experimental/fiddle: update to work again
NOTRY=true
Review URL: https://codereview.chromium.org/
1834993003
brianosman [Fri, 25 Mar 2016 18:26:26 +0000 (11:26 -0700)]
Re-enable CPU mipmap generation for Ganesh. Aniso mips were landed a while ago. However, the CPU builder fails when it sees Index8 (among other things), so change the code to fallback to GPU in that case. Additionally, if we're going to be mipping an sRGB image, don't use the CPU code (which is not yet gamma correct). Unfortunately, this means that we will often be using the GPU path, still - with recent codec changes, most images are coming in tagged as sRGB.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835003002
Review URL: https://codereview.chromium.org/
1835003002
benjaminwagner [Fri, 25 Mar 2016 18:24:30 +0000 (11:24 -0700)]
Don't convert to Sk48Dot16 in DrawOneGlyph.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1831983002
Review URL: https://codereview.chromium.org/
1831983002
msarett [Fri, 25 Mar 2016 18:08:14 +0000 (11:08 -0700)]
Remove extra definitions of SkMovie
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1830343004
Review URL: https://codereview.chromium.org/
1830343004
ethannicholas [Fri, 25 Mar 2016 18:04:06 +0000 (11:04 -0700)]
got Vulkan compiling on Linux again
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1834953003
Review URL: https://codereview.chromium.org/
1834953003
msarett [Fri, 25 Mar 2016 17:31:22 +0000 (10:31 -0700)]
Delete SkPageFlipper
BUG=skia:5132
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1832083002
Review URL: https://codereview.chromium.org/
1832083002
robertphillips [Fri, 25 Mar 2016 16:48:45 +0000 (09:48 -0700)]
Turn off Discardable scaled image cache
This change accidentally slipped into the checked in version of https://codereview.chromium.org/
1785643003/ (Switch SkBlurImageFilter over to new onFilterImage interface). It is the reason why we're seeing performance improvements on Android and Ubuntu for the ugamsolutions skp (and others).
I guess the real question is, since it isn't crashing, do we want to leave it enabled?
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835563002
Review URL: https://codereview.chromium.org/
1835563002
kjlubick [Fri, 25 Mar 2016 16:47:55 +0000 (09:47 -0700)]
Forward serial (fixes charging)
NOTRY=true
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1832103002
Review URL: https://codereview.chromium.org/
1832103002
ethannicholas [Fri, 25 Mar 2016 16:26:03 +0000 (09:26 -0700)]
added support for glMinSampleShading
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1812223002
Review URL: https://codereview.chromium.org/
1812223002
mtklein [Fri, 25 Mar 2016 16:11:35 +0000 (09:11 -0700)]
Fix typo in SkTLazy copy ctor. src is a reference, not a pointer.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1832053003
Review URL: https://codereview.chromium.org/
1832053003
reed [Fri, 25 Mar 2016 16:08:00 +0000 (09:08 -0700)]
move setshader to sk_sp, re-using SK_SUPPORT_LEGACY_CREATESHADER_PTR
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1829303002
Review URL: https://codereview.chromium.org/
1829303002
marco.diiga [Fri, 25 Mar 2016 16:01:26 +0000 (09:01 -0700)]
[CMake fixes] Linux X11 pixel format and Windows compilation fix
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1835573002
Review URL: https://codereview.chromium.org/
1835573002
msarett [Fri, 25 Mar 2016 15:58:55 +0000 (08:58 -0700)]
Rename encoders to Sk*ImageEncoder
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1836493002
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/
1836493002
robertphillips [Fri, 25 Mar 2016 14:04:35 +0000 (07:04 -0700)]
Fix old debugger for sk_sp changes
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1827403002
Review URL: https://codereview.chromium.org/
1827403002
jvanverth [Fri, 25 Mar 2016 13:29:52 +0000 (06:29 -0700)]
Revise layer, extension and feature setup for Vulkan
Moves all the extension setup logic into GrVkBackendContext, and
pass extension and feature information to Skia via flags. Also adds
version information to GrVkBackendContext.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1832613003
TBR=bsalomon@google.com
Review URL: https://codereview.chromium.org/
1832613003
brianosman [Fri, 25 Mar 2016 13:01:59 +0000 (06:01 -0700)]
Require sRGB write control for sRGB support. Add flag to GrPaint to suppress linear -> sRGB conversion on write. Use that to fix YUV conversion, which directly produces sRGB data. (Technically, it produces data in whatever the color space of the JPEG might be).
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1830303002
Review URL: https://codereview.chromium.org/
1830303002
kjlubick [Fri, 25 Mar 2016 12:53:57 +0000 (05:53 -0700)]
patch battery charging until recipe is updated
BUG=skia:5111
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=
1834793003
Review URL: https://codereview.chromium.org/
1834793003