AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,308 Commits 1 Branch 0 Tags 544 MiB
309e869124
Commit Graph

12308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
krajcevski
309e869124 Fix bracket outside of ifdef 
R=jvanverth@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/305333003
 2014-06-02 08:02:45 -07:00
mtklein
0d03db7446 Clean up SkLazyPtrs only in SK_DEVELOPER mode. 
Checking only SK_DEBUG may make SkLazyPtr too anal about leaks for
clients.  Still working through strange leak problems inside Skia
tests, so it's probably premature to turn it on in Chrome tests.

BUG=379570
R=reed@google.com, mtklein@google.com, bungeman@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/308003014
 2014-06-02 07:53:01 -07:00
krajcevski
9c0e629c64 Initial work to get ETC1 data up to the GPU 
Committed: http://code.google.com/p/skia/source/detail?r=15001

R=bsalomon@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/302783002
 2014-06-02 07:38:15 -07:00
scroggo
b30aa62294 Update comments about debugging on master. 
Update the makefile to reference the correct location of
config.mk.

R=djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/308703009
 2014-06-02 07:19:13 -07:00
robertphillips
901e96df69 Add Sample slide for Rectanizers 
R=jvanverth@google.com, bsalomon@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/303263005
 2014-06-02 07:15:18 -07:00
reed
a6a8f00a39 hide SkDevice::config() 
TBR=robertphilips

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/302253002
 2014-06-02 05:45:32 -07:00
rmistry
14751dbcf3 Whitespace change to test the Git Skia CQ 
NOTREECHECKS=true
BUG=skia:2613
TBR=

Author: rmistry@google.com

Review URL: https://codereview.chromium.org/311603002
 2014-06-02 05:29:08 -07:00
rmistry
5787c6f5f6 Use googlesource VIEW_VC in codereview.settings 
BUG=skia:2613
NOTREECHECKS=true
NOTRY=true
R=borenet@google.com

Author: rmistry@google.com

Review URL: https://codereview.chromium.org/309643005
 2014-06-02 05:20:32 -07:00
rmistry
eb7cd469e3 Whitespace change to test the Git Skia CQ 
NOTREECHECKS=true
TBR=
BUG=skia:
NOTRY=true

Author: rmistry@google.com

Review URL: https://codereview.chromium.org/308703008
 2014-06-02 05:12:27 -07:00
Eric Boren
ae6497602c Whitespace 
BUG=skia:

Review URL: https://codereview.chromium.org/304233004
 2014-06-02 08:03:43 -04:00
commit-bot@chromium.org
ed4dc2afaa remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE 
R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/308953002

git-svn-id: http://skia.googlecode.com/svn/trunk@15016 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-31 21:47:03 +00:00
commit-bot@chromium.org
f71e8fd0c5 Revert of Port most uses of SkOnce to SkLazyPtr. (https://codereview.chromium.org/304383005/) 
Reason for revert:
linux x86-64 release segfault in src/ports/SkFontHost_fontconfig.cpp:107

http://108.170.220.120:10117/builders/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/builds/905/steps/RunTests/logs/stdio

Original issue's description:
> Port most uses of SkOnce to SkLazyPtr.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=15006
>
> Committed: http://code.google.com/p/skia/source/detail?r=15014

R=reed@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/306063004

git-svn-id: http://skia.googlecode.com/svn/trunk@15015 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-31 00:15:22 +00:00
commit-bot@chromium.org
56f7cca144 Port most uses of SkOnce to SkLazyPtr. 
BUG=skia:

Committed: http://code.google.com/p/skia/source/detail?r=15006

R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/304383005

git-svn-id: http://skia.googlecode.com/svn/trunk@15014 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 23:59:12 +00:00
commit-bot@chromium.org
22a1d96ca3 New file for simpler updating of Android defines. 
When building Skia for the Android framework, we will now read a
file which only includes defines. This will make it easier for
people deprecating APIs to add the guard to Android.

R=reed@google.com, djsollen@google.com, bungeman@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/305193002

git-svn-id: http://skia.googlecode.com/svn/trunk@15013 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 21:53:01 +00:00
commit-bot@chromium.org
a1ff26a64a Add a way for the gpu veto to report back the reason why it said no 
BUG=2334
R=bsalomon@google.com

Author: humper@google.com

Review URL: https://codereview.chromium.org/301423002

git-svn-id: http://skia.googlecode.com/svn/trunk@15012 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 21:52:52 +00:00
commit-bot@chromium.org
92a8916540 fix casting issue with or operator 
R=reed@google.com, epoger@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/305253002

git-svn-id: http://skia.googlecode.com/svn/trunk@15011 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 21:07:05 +00:00
commit-bot@chromium.org
b4587957f7 Revert of remove SK_SUPPORT_LEGACY_ASIMAGEINFO and SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS (https://codereview.chromium.org/308083010/) 
Reason for revert:
broke skia/ext/bitmap_platform_device_cairo.cc:44:56: error: no matching function for call to ‘SkBitmap::installPixels

Original issue's description:
> remove SK_SUPPORT_LEGACY_ASIMAGEINFO and SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS
> 
> TBR=
> NOTRY=
> 
> Committed: http://code.google.com/p/skia/source/detail?r=15007

TBR=
NOTREECHECKS=true
NOTRY=true

Author: reed@google.com

Review URL: https://codereview.chromium.org/301353006

git-svn-id: http://skia.googlecode.com/svn/trunk@15010 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 21:03:38 +00:00
commit-bot@chromium.org
f6351a0718 Revert of Port most uses of SkOnce to SkLazyPtr. (https://codereview.chromium.org/304383005/) 
Reason for revert:
Leaking refs on SkTypeface on Macs.

Original issue's description:
> Port most uses of SkOnce to SkLazyPtr.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=15006

R=reed@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/304283007

git-svn-id: http://skia.googlecode.com/svn/trunk@15009 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 21:00:52 +00:00
senorblanco@chromium.org
97f5fc6519 Allow SkPictureImageFilter to be serialized when not run cross-process. 
Picture serialization is not yet hardened, but it turns out we do need
serialization of SkPictureImageFilter for deferred SVG-on-SVG filters,
since the SkPaints (and thus the SkImageFilters) are serialized by
SkPictureRecord. However, deferred filters are always drawn in the
same process, so we can safely serialize them in this case. We do this
by turning the compile-time check for
SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION to a runtime check for
isCrossProcess().

The image filter fuzzer sample was also modified to enable fuzzing
of basic picture image filters (the code had rotted a bit, being behind
an #ifdef that no one sets).

BUG=375162
R=sugoi@google.com

Review URL: https://codereview.chromium.org/311443003

git-svn-id: http://skia.googlecode.com/svn/trunk@15008 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 20:50:56 +00:00
commit-bot@chromium.org
1fd263edb3 remove SK_SUPPORT_LEGACY_ASIMAGEINFO and SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS 
TBR=
NOTRY=

Author: reed@google.com

Review URL: https://codereview.chromium.org/308083010

git-svn-id: http://skia.googlecode.com/svn/trunk@15007 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 20:47:13 +00:00
commit-bot@chromium.org
5a70945ddd Port most uses of SkOnce to SkLazyPtr. 
BUG=skia:
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/304383005

git-svn-id: http://skia.googlecode.com/svn/trunk@15006 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 20:42:00 +00:00
commit-bot@chromium.org
2a5cd60bff Add an OR operator overload for SaveFlags to avoid extra static casts. 
R=reed@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/303373003

git-svn-id: http://skia.googlecode.com/svn/trunk@15005 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 20:41:20 +00:00
commit-bot@chromium.org
999cfd1076 Revert of Initial work to get ETC1 data up to the GPU (https://codereview.chromium.org/302783002/) 
Reason for revert:
ETC1 linking problems with chrome.

Original issue's description:
> Initial work to get ETC1 data up to the GPU
>
> Committed: http://code.google.com/p/skia/source/detail?r=15001

R=bsalomon@google.com, robertphillips@google.com
TBR=bsalomon@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/303273008

git-svn-id: http://skia.googlecode.com/svn/trunk@15004 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 20:36:21 +00:00
senorblanco@chromium.org
910702b564 Implement SkPictureImageFilter bounds computation. 
SkPictureImageFilter::onFilterBounds() was unimplemented, causing
incorrect results for SVG filters and impl-side painting (see Chrome
bug https://code.google.com/p/chromium/issues/detail?id=375162).

BUG=skia:
R=reed@google.com

Review URL: https://codereview.chromium.org/306733003

git-svn-id: http://skia.googlecode.com/svn/trunk@15003 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 20:36:15 +00:00
commit-bot@chromium.org
a05fa0669b Use GrGLShaderBuilder::GenProgramOutput in GrGLProgram. 
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/305203002

git-svn-id: http://skia.googlecode.com/svn/trunk@15002 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 18:55:03 +00:00
commit-bot@chromium.org
af091a176d Initial work to get ETC1 data up to the GPU 
R=bsalomon@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/302783002

git-svn-id: http://skia.googlecode.com/svn/trunk@15001 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 18:41:39 +00:00
commit-bot@chromium.org
b3281585bb Fixing clusterfuzz issue 
When reading an SkSSE2ProcCoeffXfermode object, fProcSIMD should never be NULL. The reason for this is that it's not possible to create such an object through SkPlatformXfermodeFactory_impl_SSE2(), which is the only function used to create these objects, so if we're reading one, it's clearly invalid.

BUG=379181
R=reed@google.com, mtklein@google.com

Author: sugoi@chromium.org

Review URL: https://codereview.chromium.org/306183002

git-svn-id: http://skia.googlecode.com/svn/trunk@15000 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 17:32:50 +00:00
commit-bot@chromium.org
a65e2fdc9a add --dryRun flag to dm 
BUG=2294
R=mtklein@google.com

Author: humper@google.com

Review URL: https://codereview.chromium.org/305963007

git-svn-id: http://skia.googlecode.com/svn/trunk@14999 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 17:23:31 +00:00
reed@google.com
4927092186 check for null typeface from paint 
git-svn-id: http://skia.googlecode.com/svn/trunk@14998 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 17:15:23 +00:00
commit-bot@chromium.org
7ae034d651 Test font created from paint 
This is meant to allow clients to migrate over to a SkFont api on canvas (e.g. drawText(text, font, paint)) while still permitting the current setters in paint (e.g. setTextSize, setFlags).

R=bungeman@google.com, eae@chromium.org, fmalita@google.com, fmalita@chromium.org

Author: reed@google.com

Review URL: https://codereview.chromium.org/245953003

git-svn-id: http://skia.googlecode.com/svn/trunk@14997 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 16:46:10 +00:00
commit-bot@chromium.org
f7f9aa0e47 move all code generation under genProgram() in GrGLShaderBuilder. 
R=robertphillips@google.com, jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/306063002

git-svn-id: http://skia.googlecode.com/svn/trunk@14996 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 15:14:56 +00:00
commit-bot@chromium.org
6175d50a25 more rebaselines for filterbitmap and downsamplebitmap. 
BUG=
R=epoger@google.com
TBR=epoger
NOTRY=True
NOTREECHECKS=True

Author: humper@google.com

Review URL: https://codereview.chromium.org/304353007

git-svn-id: http://skia.googlecode.com/svn/trunk@14995 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 15:11:28 +00:00
commit-bot@chromium.org
3dd6368232 Revert of TSAN caught us racing in ScalarBench.cpp (https://codereview.chromium.org/305033002/) 
Reason for revert:
windows doesn't like it

Original issue's description:
> TSAN caught us racing in ScalarBench.cpp
>
> http://108.170.220.102:10117/builders/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-TSAN/builds/914/steps/RunDM/logs/stdio
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14992

R=reed@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/308883003

git-svn-id: http://skia.googlecode.com/svn/trunk@14994 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 15:09:44 +00:00
commit-bot@chromium.org
9a558d495d using real tiles when simulating tiling 
BUG=skia:
R=mtklein@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/303403003

git-svn-id: http://skia.googlecode.com/svn/trunk@14993 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 15:06:24 +00:00
commit-bot@chromium.org
ee982ed52b TSAN caught us racing in ScalarBench.cpp 
http://108.170.220.102:10117/builders/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-TSAN/builds/914/steps/RunDM/logs/stdio

BUG=skia:
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/305033002

git-svn-id: http://skia.googlecode.com/svn/trunk@14992 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 14:56:58 +00:00
commit-bot@chromium.org
6e7ddaae0a Move the LATC and ETC1 enum values to GrPixelConfig. I also tried to put in checks in a few places to make sure that we weren't using these pixel configurations in places that we shouldn't be. 
LATC is a DXT-esque alpha compression format that goes by a few other names (RGTC, 3DC). It might be useful to investigate using it to compress the alpha masks that we get from software rasterization. This patch set adds enums for that and recognition whether or not the device can support it.

R=bsalomon@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/304743004

git-svn-id: http://skia.googlecode.com/svn/trunk@14991 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 13:55:58 +00:00
reed@google.com
687a26defa fix int->scalar warnings 
git-svn-id: http://skia.googlecode.com/svn/trunk@14990 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 13:45:36 +00:00
commit-bot@chromium.org
a3264e53ee Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)" 
This reverts commit eecaea4148805834f223681f70b6488ceba12d09.

R=robertphillips@google.com, scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/301283003

git-svn-id: http://skia.googlecode.com/svn/trunk@14989 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 13:26:10 +00:00
commit-bot@chromium.org
16fdbd3141 Whitespace change to test CQ throttling 
(SkipBuildbotRuns)
TBR=
NOTREECHECKS=True
NOTRY=True

BUG=skia:2472

Committed: http://code.google.com/p/skia/source/detail?r=14986

Author: rmistry@google.com

Review URL: https://codereview.chromium.org/307993004

git-svn-id: http://skia.googlecode.com/svn/trunk@14988 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 12:12:41 +00:00
commit-bot@chromium.org
fdee40fe0c Revert of Whitespace change to test CQ throttling (https://codereview.chromium.org/307993004/) 
Reason for revert:
Testing CQ throttling

Original issue's description:
> Whitespace change to test CQ throttling
> 
> (SkipBuildbotRuns)
> TBR=
> NOTREECHECKS=True
> NOTRY=True
> 
> BUG=skia:2472
> 
> Committed: http://code.google.com/p/skia/source/detail?r=14986

(SkipBuildbotRuns)
TBR=
NOTREECHECKS=true
NOTRY=true
BUG=skia:2472

Author: rmistry@google.com

Review URL: https://codereview.chromium.org/304323007

git-svn-id: http://skia.googlecode.com/svn/trunk@14987 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 12:08:27 +00:00
commit-bot@chromium.org
6402089e8b Whitespace change to test CQ throttling 
(SkipBuildbotRuns)
TBR=
NOTREECHECKS=True
NOTRY=True

BUG=skia:2472

Author: rmistry@google.com

Review URL: https://codereview.chromium.org/307993004

git-svn-id: http://skia.googlecode.com/svn/trunk@14986 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 12:07:20 +00:00
commit-bot@chromium.org
559a8833f0 Fix the rendering error of SkDraw::drawVertices in gpu path for solid color. 
If both textures and vertex-colors are NULL, drawVertices should stroke hairlines with the paint's color.
This behavior is a useful debugging mode to visualize the mesh.

BUG=skia:2266
R=bsalomon@google.com, reed@google.com

Author: yunchao.he@intel.com

Review URL: https://codereview.chromium.org/189963004

git-svn-id: http://skia.googlecode.com/svn/trunk@14985 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 10:08:22 +00:00
skia.committer@gmail.com
9681eebb0e Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@14984 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 03:06:10 +00:00
commit-bot@chromium.org
05858435ee Fixing a clusterfuzz found issue 
BUG=378175
R=reed@google.com, sugoi@google.com

Author: sugoi@chromium.org

Review URL: https://codereview.chromium.org/306033003

git-svn-id: http://skia.googlecode.com/svn/trunk@14983 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 01:06:44 +00:00
commit-bot@chromium.org
facad13fa8 Make GrGLShaderBuilder store a GenProgramOutput 
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/304383002

git-svn-id: http://skia.googlecode.com/svn/trunk@14982 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 22:20:03 +00:00
commit-bot@chromium.org
1803f4eb34 new animated sample to show subpixel translate bug with high quality scaling 
BUG=1445
R=reed@google.com, robertphillips@google.com

Author: humper@google.com

Review URL: https://codereview.chromium.org/303123003

git-svn-id: http://skia.googlecode.com/svn/trunk@14981 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 22:01:08 +00:00
commit-bot@chromium.org
6eac42e3ab Incremental refactoring of GrGLProgram and GrGLShaderBuilder 
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/302663006

git-svn-id: http://skia.googlecode.com/svn/trunk@14980 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 21:29:51 +00:00
commit-bot@chromium.org
d0f824cfbd Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/) 
Reason for revert:
broke all Windows bots

Original issue's description:
> setConfig -> setInfo
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14978

R=robertphillips@google.com, reed@google.com
TBR=reed@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: epoger@google.com

Review URL: https://codereview.chromium.org/302053002

git-svn-id: http://skia.googlecode.com/svn/trunk@14979 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 21:10:32 +00:00
commit-bot@chromium.org
986d681f3e setConfig -> setInfo 
BUG=skia:
R=robertphillips@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/308683005

git-svn-id: http://skia.googlecode.com/svn/trunk@14978 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 20:47:53 +00:00
commit-bot@chromium.org
39e8d93337 DM tweaks 
- Don't print status updates for skipped tasks or count them as pending tasks.
 - Refactor DMReporter a bit for better symmetry, be more explicit about
   how we read atomics (that is, approximately) in printStatus() (née finish()).
 - Remove mutex locking from printStatus().

BUG=skia:
R=halcanary@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/309483003

git-svn-id: http://skia.googlecode.com/svn/trunk@14977 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 20:14:48 +00:00