halcanary
fa25106f02
SkPDF: PDFStream has-a not is-a PDFDict
...
Motivation:
SkPDFStream and SkPDFSharedStream now work the same.
Also:
- move SkPDFStream into SkPDFTypes (it's a fundamental PDF type).
- minor refactor of SkPDFSharedStream
- SkPDFSharedStream takes unique_ptr to represent ownership
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2190883003
Review-Url: https://codereview.chromium.org/2190883003
2016-07-29 10:13:18 -07:00
dvonbeck
4ef6dfa708
GrFP can express distance vector field req., program builder declares variable for it
...
This update allows fragment processors to require a field of vectors to the nearest edge. This requirement propagates:
- from child FPs to their parent
- from parent FPs to the GrPaint
- from GrPaint through the PipelineBuilder into GrPipeline
- acessed from GrPipeline by GrGLSLProgramBuilder
GrGLSL generates a variable for the distance vector and passes it down to the GeometryProcessor->emitCode() method.
This CL's base is the CL for adding the BevelNormalSource API: https://codereview.chromium.org/2080993002
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2114993002
Review-Url: https://codereview.chromium.org/2114993002
2016-07-29 09:53:56 -07:00
egdaniel
0d9990f052
Merge ProgramDesc's for GL and Vulkan
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184413002
Review-Url: https://codereview.chromium.org/2184413002
2016-07-29 07:36:52 -07:00
mtklein
dc90b53350
Silence -Wclobbered in each file that needs it.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184823009
Committed: https://skia.googlesource.com/skia/+/03f704a343d7a82974f977eda8789a8c721c93e5
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Win-MSVC-GCE-CPU-AVX2-x86-Release-Trybot
Review-Url: https://codereview.chromium.org/2184823009
2016-07-28 14:45:28 -07:00
mtklein
2f428966c6
Revert of Silence -Wclobbered in each file that needs it. (patchset #2 id:20001 of https://codereview.chromium.org/2184823009/ )
...
Reason for revert:
Jpeg strategy seems to be leading to crashes. Gonna go back to warning squelch.
Original issue's description:
> Silence -Wclobbered in each file that needs it.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184823009
>
> Committed: https://skia.googlesource.com/skia/+/03f704a343d7a82974f977eda8789a8c721c93e5
TBR=msarett@google.com ,mtklein@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/2188313003
2016-07-28 13:59:59 -07:00
mtklein
03f704a343
Silence -Wclobbered in each file that needs it.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184823009
Review-Url: https://codereview.chromium.org/2184823009
2016-07-28 11:57:31 -07:00
robertphillips
a408c8fb6d
Add SkGammaColorFilter
...
WDYT about this as a means of replacing GrContext::applyGamma with a normal SkCanvas::drawImage?
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2190573002
Review-Url: https://codereview.chromium.org/2190573002
2016-07-28 09:20:33 -07:00
dvonbeck
bba4cfebca
Added API for Bevel NormalSource.
...
This CL adds an API for Bevel normal source and a dummy implementation that returns a normal (0, 0, 1) every time.
This CL's base is the CL for accepting nullptrs: https://codereview.chromium.org/2132113002
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2080993002
Review-Url: https://codereview.chromium.org/2080993002
2016-07-28 08:58:19 -07:00
mtklein
25c81d4e65
GN: dm
...
This builds, links, and runs on Linux. Have not tried Mac.
I've tested is_debug={true,false} and is_component_build.
It's neat that the component build DM works, but it's also an indication I've missed an essential flag or two... it shouldn't work. :)
The GPU backend isn't working yet, but all the software configurations I've tried look good.
This fleshes out all the other parts of SkCodec too... I noticed we weren't able to decode gifs or webp.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2188643002
Review-Url: https://codereview.chromium.org/2188643002
2016-07-27 13:55:27 -07:00
bsalomon
81ce4a9c55
Make the yasm copy target be type 'none' rather than type 'executable'
...
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2182873005
Review-Url: https://codereview.chromium.org/2182873005
2016-07-27 12:07:43 -07:00
benjaminwagner
cb571e1148
Rename textual includes as *.inc.
...
This makes it easier to distinguish source files that can stand on their own vs files meant to be #included into other source files.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184143002
Review-Url: https://codereview.chromium.org/2184143002
2016-07-27 11:12:12 -07:00
egdaniel
735109c248
Add gyp define to enable vulkan debug layers
...
On Debug vulkan bots, running with the debug layers on seems to be adding
more than an hour to the total running time. Since we suppress any output
on the bots anyways the debug layers are serving no purpose. Thus I am
adding a gyp define to disable the layers on the bot.
With this change, by default when running vulkan in Debug, the debug_layers
will be enabled. The bots should disable the layers. Android framework
should also have them disabled by default.
TBR=djsollen@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2185953003
Review-Url: https://codereview.chromium.org/2185953003
2016-07-27 08:03:57 -07:00
mtklein
b464764dae
Extend __mulodi4() hack to 32-bit x86.
...
This gets the Android-Clang-x86 perf bot from failing on __mulodi4() to failing on the next problem...
See https://luci-milo.appspot.com/swarming/task/3042e5f68636f810/steps/nanobench/0/stdout
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2190493002
Review-Url: https://codereview.chromium.org/2190493002
2016-07-27 05:35:28 -07:00
fmalita
6ceef3dd67
Initial SVG model
...
A minimal subset needed to render tiger.svg: <svg>, <g>, <path>, 'd', 'fill'/'stroke' (color-only), 'transform'.
R=reed@google.com ,robertphillips@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2164193002
Review-Url: https://codereview.chromium.org/2164193002
2016-07-26 18:46:34 -07:00
msarett
75a5ff63f7
Rename yasm binary and make it executable
...
TBR=mtklein@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2187663002
Review-Url: https://codereview.chromium.org/2187663002
2016-07-26 13:33:46 -07:00
msarett
dc2257bfab
Fix yasm for Android build
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2180333002
Review-Url: https://codereview.chromium.org/2180333002
2016-07-26 11:24:28 -07:00
mtklein
9a5c47f4ef
Add SkRasterPipeline blitter.
...
This is now pixel-exact with the existing sRGB SW impl as far as I've tested.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2146413002
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN-Trybot
Committed: https://skia.googlesource.com/skia/+/3011e337693a9786f62d8de9ac4b239ad6dbdaca
Review-Url: https://codereview.chromium.org/2146413002
2016-07-22 11:05:04 -07:00
mtklein
aa29b27329
Revert of Add SkRasterPipeline blitter. (patchset #18 id:340001 of https://codereview.chromium.org/2146413002/ )
...
Reason for revert:
Leaking the blitter
https://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN/builds/7908/steps/test_skia%20on%20Ubuntu/logs/stdio
Original issue's description:
> Add SkRasterPipeline blitter.
>
> This is now pixel-exact with the existing sRGB SW impl as far as I've tested.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2146413002
> CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/3011e337693a9786f62d8de9ac4b239ad6dbdaca
TBR=reed@google.com ,mtklein@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/2178523002
2016-07-22 10:20:52 -07:00
mtklein
3011e33769
Add SkRasterPipeline blitter.
...
This is now pixel-exact with the existing sRGB SW impl as far as I've tested.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2146413002
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Review-Url: https://codereview.chromium.org/2146413002
2016-07-22 08:53:26 -07:00
egdaniel
a95220d3b8
Setup system in Vulkan to reuse VkDescriptorSet allocations.
...
This CL uses the new system for uniform buffers. In a follow up CL I will
add support for samplers.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2163673002
Review-Url: https://codereview.chromium.org/2163673002
2016-07-21 11:50:37 -07:00
vjiaoblack
95302da19d
Creating framework for drawShadowedPicture
...
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2146073003
Committed: https://skia.googlesource.com/skia/+/0ae097d116f4332be02a135ffc99c162473dee6a
Review-Url: https://codereview.chromium.org/2146073003
2016-07-21 10:25:54 -07:00
caryclark
b5dc4051f7
add pathops debugging to fuzz
...
Add optional debugging routines for use in gdb.
R=kjlubick
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2171773002
Review-Url: https://codereview.chromium.org/2171773002
2016-07-21 09:41:14 -07:00
robertphillips
f292a0c862
Remove SkGrPixelRef
...
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2167173002
Review-Url: https://codereview.chromium.org/2167173002
2016-07-21 09:35:07 -07:00
vjiaoblack
33d325890e
Revert of Creating framework for drawShadowedPicture (patchset #14 id:260001 of https://codereview.chromium.org/2146073003/ )
...
Reason for revert:
Decided to re-wait for a final LGTM.
Already found a bug in variable naming to fix.
Original issue's description:
> Creating framework for drawShadowedPicture
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2146073003
>
> Committed: https://skia.googlesource.com/skia/+/0ae097d116f4332be02a135ffc99c162473dee6a
TBR=reed@google.com ,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
Review-Url: https://codereview.chromium.org/2167223002
2016-07-21 09:24:16 -07:00
vjiaoblack
0ae097d116
Creating framework for drawShadowedPicture
...
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2146073003
Review-Url: https://codereview.chromium.org/2146073003
2016-07-21 09:10:23 -07:00
jvanverth
a3f3caccdf
Stub in Mac viewer code.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2164683002
patch from issue 2164683002 at patchset 1 (http://crrev.com/2164683002#ps1 )
Review-Url: https://codereview.chromium.org/2167503002
2016-07-19 14:17:20 -07:00
msarett
ff1740394e
Disable qcms on build for Android framework
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2160863003
Review-Url: https://codereview.chromium.org/2160863003
2016-07-19 11:17:55 -07:00
fmalita
01c97230f8
Delete the legacy SVG parser
...
Unused.
R=reed@google.com ,robertphillips@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2154193003
CQ_INCLUDE_TRYBOTS=master.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/2154193003
2016-07-19 06:12:54 -07:00
fmalita
fd75dd4086
Delete SkXMLPullParser
...
Unused & not being built.
R=reed@google.com ,robertphillips@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2163463002
Review-Url: https://codereview.chromium.org/2163463002
2016-07-19 05:14:41 -07:00
brianosman
54f30c13fc
Introduce GrColorSpaceXform, for gamut conversion on textures
...
GrTextureAccess optionally includes an instance, computed from the src
and dst color spaces. In all common cases (no color space for either src
or dst, or same color space for both), no object is allocated.
This change is orthogonal to my attempts to get color space attached to
render targets - regardless of how we choose to do that, this will give
us the source color space at all points where we are connecting src to
dst.
There are many dangling injection points where I've been inserting
nullptr, but I have a record of all of them. Additionally, there are now
three places (the most common simple paths for bitmap/image rendering)
where things are plumbed enough that I expect to have access to the dst
color space (all marked with XFORMTODO).
In addition to getting the dst color space, I need to inject shader code
and uniform uploading for appendTextureLookup and friends.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2154753003
Review-Url: https://codereview.chromium.org/2154753003
2016-07-18 10:53:52 -07:00
jcgregorio
eb9a84aa57
Revert of remove unused TableMaskFilter (patchset #1 id:1 of https://codereview.chromium.org/2156463002/ )
...
Reason for revert:
Needed for Android:
frameworks/base/core/jni/android/graphics/MaskFilter.cpp:5:10: fatal error: 'SkTableMaskFilter.h' file not found
Original issue's description:
> remove unused TableMaskFilter
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2156463002
>
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/59779ae8ce316bf8b8082ec2df1683ccd38161f1
TBR=reed@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:
Review-Url: https://codereview.chromium.org/2156183002
2016-07-18 08:18:51 -07:00
msarett
80d46ccb28
Speculatively fix Android automerger
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2155713004
Review-Url: https://codereview.chromium.org/2155713004
2016-07-15 14:18:49 -07:00
djsollen
ec58b86437
Fix broken Android framework build.
...
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2153953002
Review-Url: https://codereview.chromium.org/2153953002
2016-07-15 12:52:34 -07:00
fmalita
718df0ae3c
Make XML compilation conditional.
...
Only enabled for gyp-based builds at this time.
R=dogben@google.com ,mtklein@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150353002
Review-Url: https://codereview.chromium.org/2150353002
2016-07-15 10:33:29 -07:00
fmalita
7445e86bac
Dust-off SkXMLParser
...
Hook up SkXMLParser to Expat, such that it can actually parse, err,
XML.
Add a trivial unit test.
R=robertphillips@google.com ,reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2142893006
Review-Url: https://codereview.chromium.org/2142893006
2016-07-14 19:14:06 -07:00
reed
59779ae8ce
remove unused TableMaskFilter
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2156463002
TBR=
Review-Url: https://codereview.chromium.org/2156463002
2016-07-14 19:13:20 -07:00
fmalita
771a190a00
Build Expat on all platforms
...
* bump version to @android-6.0.1_r55 (2.1.1)
* add as a dependency to the 'xml' target (for upcoming http://crrev.com/2142893006 )
* tweak build for Mac, Win:
- define HAVE_EXPAT_CONFIG_H (same as in Android.mk)
- use -Wno-missing-field-initializers (same as in Android.mk)
- suppress MSVS warning 4244 (same as ..cmake/Utilities/cmexpat/expatConfig.h.in)
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150603004
R=mtklein@google.com
Review-Url: https://codereview.chromium.org/2150603004
2016-07-14 14:02:24 -07:00
bsalomon
1433c676d2
Remove SkGrTexturePixelRef and SkGrRenderTargetPixelRef aliases for SkGrPixelRef
...
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2151873002
Review-Url: https://codereview.chromium.org/2151873002
2016-07-14 07:53:30 -07:00
reed
9f01276464
move GrPixelRef headers to private (as we work to eliminate them)
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150693002
Review-Url: https://codereview.chromium.org/2150693002
2016-07-13 13:43:49 -07:00
robertphillips
dda54455a2
Remove GrLayerHoister
...
This relies on https://codereview.chromium.org/1944013002/ (Add legacy flag to allow Skia to remove Ganesh layer hoister) landing first so as to not break the DEPS roll.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1950523002
Review-Url: https://codereview.chromium.org/1950523002
2016-07-13 13:27:16 -07:00
csmartdalton
485a12003a
Add resource provider flag to avoid client-side buffers
...
On some platforms, a newly-created buffer was liable to be CPU backed.
This would break code that expected a VBO (aka instanced rendering).
This change adds an optional flag to GrResourceProvider that requires
a buffer to be created in GPU memory.
It also moves the CPU backing logic into Gr land in order to properly
cache real VBOs on platforms that prefer client-side buffers.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2143333002
Review-Url: https://codereview.chromium.org/2143333002
2016-07-13 10:16:32 -07:00
robertphillips
9199a9fef9
Move GrDrawTarget::clear logic into GrDrawContext
...
I found it a bit worrisome that GrDrawTarget was calling back into GrDrawContext. This also moves GrDrawTarget closer to being a simple-ish container of batches.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2145643003
Review-Url: https://codereview.chromium.org/2145643003
2016-07-13 07:48:43 -07:00
brianosman
6373c95554
Monitor profile tool, now with Windows support, too!
...
Original Mac support by Matt.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2095093002
Review-Url: https://codereview.chromium.org/2141573004
2016-07-12 15:06:25 -07:00
mtklein
281b33fdd9
SkRasterPipeline preliminaries
...
Re-uploading to see if I can get a CL number < 2^31.
patch from issue 2147533002 at patchset 240001 (http://crrev.com/2147533002#ps240001 )
Already reviewed at the other crrev link.
TBR=
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2147533002
CQ_INCLUDE_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Review-Url: https://codereview.chromium.org/2144573004
2016-07-12 15:01:26 -07:00
msarett
afb8539f62
Revert of try to speed-up maprect + round2i + contains (patchset #8 id:140001 of https://codereview.chromium.org/2133413002/ )
...
Reason for revert:
Breaking the roll...
https://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/253294/steps/compile%20%28with%20patch%29/logs/stdio
Original issue's description:
> try to speed-up maprect + round2i + contains
>
> We call roundOut in a few places. If we can get SkNx::Ceil we could efficiently implement that as well.
>
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2133413002
> CQ_INCLUDE_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/b42b785d1cbc98bd34aceae338060831b974f9c5
TBR=mtklein@google.com ,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/2136343002
2016-07-11 14:57:26 -07:00
halcanary
8a74f13239
tools/SkShaper: factor shaping out of using_skia_and_harfbuzz
...
Make a clearer demarcation between shaping and layout.
also: refactor using_skia_and_harfbuzz; stop leaking
like a sieve.
Review-Url: https://codereview.chromium.org/2138133002
2016-07-11 14:30:39 -07:00
reed
b42b785d1c
try to speed-up maprect + round2i + contains
...
We call roundOut in a few places. If we can get SkNx::Ceil we could efficiently implement that as well.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2133413002
CQ_INCLUDE_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Review-Url: https://codereview.chromium.org/2133413002
2016-07-11 13:17:35 -07:00
mtklein
7e602c2c6c
hacking on a single-benchmark tool
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2012413004
Review-Url: https://codereview.chromium.org/2012413004
2016-07-11 11:27:30 -07:00
reed
babc3de2ce
deferred canvas
...
tries to eliminate unneeded clipRects and concats (and their associated save/restores).
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2120333002
Review-Url: https://codereview.chromium.org/2120333002
2016-07-08 08:43:28 -07:00
mtklein
ac41bac40f
Move sRGB <-> linear conversion components to their own files.
...
This makes them a little easier to use outside SkColorXform code.
I've added some notes about how best to use them and their eccentricities, and added a test.
Ultimately any software sRGB <-> linear conversion should funnel somehow through here.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2128893002
CQ_EXTRA_TRYBOTS=client.skia.android:Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Release-Trybot;client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Committed: https://skia.googlesource.com/skia/+/45e58c8807179638980aae8503573b950b844e4c
Review-Url: https://codereview.chromium.org/2128893002
2016-07-08 06:33:16 -07:00