AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,173 Commits 1 Branch 0 Tags 544 MiB
99e5b524ce
Commit Graph

11173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commit-bot@chromium.org
cdbbbcc909 Mark strokerects_gpu GM as ignore-failure on Win7/Perspective 
BUG=skia:2295
R=bsalomon@google.com, epoger@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13788 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-13 16:23:20 +00:00
commit-bot@chromium.org
56b7a6d52c --dryRun flag for bench 
causes bench to print out what tests it would be running, without actually running them.

BUG=skia:2294
R=reed@google.com

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13787 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-13 16:22:00 +00:00
commit-bot@chromium.org
e5eee51211 fix memory leak introduced in 9e5f85e8 
R=sugoi@chromium.org, robertphillips@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13786 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-13 16:18:49 +00:00
commit-bot@chromium.org
b17ccc992d --dryRun flag for gm 
Causes gm to not actually run any tests / create any directories, just print its normal output.  Useful for showing what tests would be run without actually taking the time to run them.

BUG=skia:2294
R=reed@google.com

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13785 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-13 16:16:36 +00:00
senorblanco@chromium.org
fb882d774e New GPU baselines for colormatrix GM. 
TBR=halcanary@google.com
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13784 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-13 15:33:02 +00:00
commit-bot@chromium.org
7498d95bde rebaseline_server: generate JSON that can be viewed without a live server 
BUG=skia:1919
NOTREECHECKS=True
NOTRY=True
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13783 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-13 14:56:29 +00:00
skia.committer@gmail.com
affa77db64 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13782 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-13 03:02:23 +00:00
bungeman@google.com
2f5820903e Add required parens for r13779. 
git-svn-id: http://skia.googlecode.com/svn/trunk@13781 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 21:56:23 +00:00
commit-bot@chromium.org
1db03d2fad remove SK_SUPPORT_LEGACY_COPYTO_CONFIG 
TBR=robertphillips@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13780 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 21:47:51 +00:00
bungeman@google.com
562b2e67a2 Fix (1 << 31) to (1u << 31) in SkOTTable_OS_2. 
When ints are 32 bits, (1 << 31) is undefined.

R=reed@google.com

Committed: https://code.google.com/p/skia/source/detail?r=13757

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13779 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 21:41:06 +00:00
senorblanco@chromium.org
2ca677e75d Fix GPU colormatrix color filter with saturated alpha. 
Clamp RGBA values before unpremultiplying, to match the raster path. This causes a problem when the resulting
alpha is >1.0, resulting in overly saturated RGB.

Covered by the setYUV2RGB() test case in the colormatrix GM.

R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13778 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 21:37:42 +00:00
commit-bot@chromium.org
641e33b3f6 add gm to show bug in stroked-text in drawPosText 
BUG=skia:
R=fmalita@google.com, bungeman@google.com, fmalita@chromium.org

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13777 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 20:31:24 +00:00
commit-bot@chromium.org
e54a23fcfa De-virtualize SkCanvas save/restore. 
This moves the state management logic into non-virtual SkCanvas methods,
and turns the virtuals into protected notifiers.

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

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13776 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 20:21:48 +00:00
commit-bot@chromium.org
f11943f21d render_pictures unittests: run over a dir with multiple SKPs, like production 
BUG=skia:1942
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13775 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 20:09:46 +00:00
reed@google.com
9c135db83d support direct writing to top layer, and hide getTopLayer() 
this should remove many of the chrome callers that today call
accessBitmap on the toplayer, so they can read/write those pixels.

The ultimate fix will be to support custom allocation of raster layers
(via GDI/cairo/mac) so we can remove PlatformDevice subclassing in
skia/ext

BUG=skia:
R=bsalomon@google.com, scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13774 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 18:28:35 +00:00
fmalita@google.com
9d201d6364 Remove unused zero_fill() in GrAtlas.cpp 
Triggers warnings with some local clang builds.

R=jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13773 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 17:31:20 +00:00
bsalomon@google.com
2ae9501e6f Fix unit tests 
Review URL: https://codereview.chromium.org/197823002

git-svn-id: http://skia.googlecode.com/svn/trunk@13772 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 17:29:46 +00:00
robertphillips@google.com
1e35304734 Fix for test failure 
git-svn-id: http://skia.googlecode.com/svn/trunk@13771 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 17:16:59 +00:00
commit-bot@chromium.org
ae79612092 Add compile flag to force usage of distance fields for all SkPaints. 
BUG=skia:2173
R=reed@google.com, robertphillips@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13770 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 17:05:46 +00:00
commit-bot@chromium.org
c30dcb9b12 Add capture snapshot as data to SkWriter32, use it to optimise record->playback. 
This is a new way of implementing https://codereview.chromium.org/155863005/
It uses copy on write semantics to return a buffer without copying it, so that record -> playback does not need to copy the buffer.

BUG=skia:2125
R=tomhudson@google.com, mtklein@google.com, reed@google.com, iancottrell@chromium.org

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13769 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 17:04:28 +00:00
commit-bot@chromium.org
84cd099704 Clean up SkImageFilter. 
Rename more occurences of 'target' to 'kernelOffset'.
This is a follow-up patch to
https://codereview.chromium.org/182983003/

BUG=skia:2187
R=senorblanco@chromium.org

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13768 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 16:36:08 +00:00
commit-bot@chromium.org
758bc7aa48 Stores per-iteration bench values in BenchDataPoint. 
BUG=skia:2225
NOTRY=true
R=borenet@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13767 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 16:23:33 +00:00
commit-bot@chromium.org
4355f21dbc Add elliptical-corner rrect clip effect. Currently only handles the case where all corners have the same pair of radii. 
BUG=skia:2181
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13766 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 15:32:50 +00:00
commit-bot@chromium.org
069a55a7fe Revert of Revert of Revert "De-virtualize SkCanvas save/restore." (https://codereview.chromium.org/196323003/) 
Reason for revert:
Pulling out to rename the virtuals.

Original issue's description:
> Revert of Revert "De-virtualize SkCanvas save/restore." (https://codereview.chromium.org/194923008/)
>
> Reason for revert:
> Re-landing after roll fix.
>
> Original issue's description:
> > Revert "De-virtualize SkCanvas save/restore."
> >
> > (To allow a roll fix into the tree).
> >
> > This reverts commit edf702204be42c945254191f9f9cd6585b3d189b.
> >
> > R=halcanary@google.com
> >
> > Committed: https://code.google.com/p/skia/source/detail?r=13748
>
> TBR=halcanary@google.com,fmalita@chromium.org
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: http://code.google.com/p/skia/source/detail?r=13754

R=halcanary@google.com, fmalita@chromium.org
TBR=fmalita@chromium.org, halcanary@google.com
NOTREECHECKS=true
NOTRY=true

Author: fmalita@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13765 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 15:08:22 +00:00
commit-bot@chromium.org
9e5f85e89d Fixing SkPicture serialization 
Fixed a few issues while attempting to use the new
serialization path for SkPicture inside a fuzzer:
- SkReadBuffer and SkValidatingReadBuffer both had a fReader
member instead of sharing the same member, which leads to
problems if a base class function is used
- In SkPicture, a header is now written as a single chunk of
data, so it also has to be read as a single chunk of data
- In the SkPicturePlayback destructor, a bad deserialization
would lead to a crash if we don't safely unref fOpData
- Also in SkPicturePlayback, if we only use a ReadBuffer for
the whole deserialization, additional tags must be added to
parseBufferTag()
- SkValidatingReadBuffer::readBitmap() was broken, but this
path wasn't usen't since the only use case for
SkValidatingReadBuffer is currently image filters and
bitmaps are unflattened as part of the deserialization of
SkBitmapSource
- SkPictureImageFilter was not deserializable. Added it to
SkGlobalInitialization*
- Added a test that exercises the SkPicture serialization /
deserialization code

BUG=skia:
R=senorblanco@google.com, senorblanco@chromium.org, reed@google.com, robertphillips@google.com

Author: sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13764 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 14:46:41 +00:00
commit-bot@chromium.org
b6401863fb Add NVPR configs to DM 
Add NVPR configs to DM. The bench and gm parts support NVPR already.

R=bsalomon@google.com

Author: kkinnunen@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13763 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 14:46:31 +00:00
senorblanco@chromium.org
fb142aa07a New baselines for imagefiltersclipped, offsetimagefilter GMs. 
These were modified by
https://code.google.com/p/skia/source/detail?r=13744

TBR=halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13762 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 14:01:48 +00:00
robertphillips@google.com
cf69bf4662 Rebaseline performance triggers for Mac10.6 & N7 
https://codereview.chromium.org/196573006/



git-svn-id: http://skia.googlecode.com/svn/trunk@13761 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 13:35:23 +00:00
commit-bot@chromium.org
79fbb40bca [WIP] Add Context to SkDrawLooper. 
SkDrawLooper carries some state during draws. This CL extracts this state into
a separate class Context, which is then passed by the users of SkDrawLooper
into the appropriate methods.
This is a step towards making SkDrawLooper immutable.

BUG=skia:2141
R=scroggo@google.com, reed@google.com, sugoi@google.com

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13760 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 09:42:01 +00:00
bungeman@google.com
ad07e69d4c Revert the rest of r13757. 
git-svn-id: http://skia.googlecode.com/svn/trunk@13759 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 04:00:25 +00:00
bungeman@google.com
e60ae2eca3 Revert 13757. 
git-svn-id: http://skia.googlecode.com/svn/trunk@13758 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 03:46:48 +00:00
bungeman@google.com
3258a5348b Fix (1 << 31) to (1u << 31) in SkOTTable_OS_2. 
When ints are 32 bits, (1 << 31) is undefined.

R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13757 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 03:13:48 +00:00
commit-bot@chromium.org
2cccf83326 make onReadPixels protected and have default impl (so we can remove chrome override) 
R=reed@google.com
TBR=bsalomon@google.com

Author: reed@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13756 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 03:04:08 +00:00
skia.committer@gmail.com
0b70816eb1 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13755 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 03:02:18 +00:00
commit-bot@chromium.org
4fcd92d0bf Revert of Revert "De-virtualize SkCanvas save/restore." (https://codereview.chromium.org/194923008/) 
Reason for revert:
Re-landing after roll fix.

Original issue's description:
> Revert "De-virtualize SkCanvas save/restore."
>
> (To allow a roll fix into the tree).
>
> This reverts commit edf702204be42c945254191f9f9cd6585b3d189b.
>
> R=halcanary@google.com
>
> Committed: https://code.google.com/p/skia/source/detail?r=13748

R=halcanary@google.com, fmalita@chromium.org
TBR=fmalita@chromium.org, halcanary@google.com
NOTREECHECKS=true
NOTRY=true

Author: fmalita@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13754 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 23:47:35 +00:00
commit-bot@chromium.org
ab373bd459 remove SK_SUPPORT_LEGACY_COPYTO_CONFIG 
R=halcanary@google.com
TBR=halcanary@google.com
NOTRY=True
NOTREECHECK=True

Author: reed@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13753 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 22:58:24 +00:00
commit-bot@chromium.org
51c040ed1e Alter bench_pictures to "respect" the logPerIter flag. 
When --logPerIters is set and --repeat is great then 2 then bench_pictures will run each test "repeat" times (to generate the correct number of timings) by rendering 5 times.

This CL also adds a swapBuffers in addition to the pre-existing flush calls.

R=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13752 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 22:58:00 +00:00
commit-bot@chromium.org
6f458fc221 First pass at a web app that lets you run Skia code and see the results. 
BUG=skia:
R=reed@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13751 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 22:57:50 +00:00
commit-bot@chromium.org
e63306df4d Only set USE_ANDROID_NDK_CPU_FEATURES if it's not already been explicitly set 
R=djsollen@google.com, reed@google.com
BUG=skia:

Author: george@mozilla.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13750 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 22:57:21 +00:00
commit-bot@chromium.org
c169f44460 fix build error in chromium 
NOTREECHECKS=true
NOTRY=true
R=fmalita@google.com, jvanverth@google.com, fmalita@chromium.org
TBR=fmalita@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13749 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 21:50:00 +00:00
fmalita@google.com
f1292bc01f Revert "De-virtualize SkCanvas save/restore." 
(To allow a roll fix into the tree).

This reverts commit edf702204be42c945254191f9f9cd6585b3d189b.

R=halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13748 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 21:46:56 +00:00
fmalita@google.com
80b10518a2 De-virtualize SkCanvas save/restore. 
This moves the state management logic into non-virtual SkCanvas methods,
and turns the virtuals into protected notifiers.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13747 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 21:04:41 +00:00
robertphillips@google.com
53ba425c91 Drop executable flag from headers so that they can be packaged 
https://codereview.chromium.org/194883004/



git-svn-id: http://skia.googlecode.com/svn/trunk@13746 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 19:55:51 +00:00
commit-bot@chromium.org
f16d797497 Fix linking errors on android builds due to cdd0f92b1a 
NOTREECHECKS=true
NOTRY=true
R=iancottrell@google.com, tomhudson@google.com
TBR=tomhudson@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13745 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 19:12:44 +00:00
senorblanco@chromium.org
06342a2666 Fix SkOffsetImageFilter to use a temporary for bounds computations. 
SkOffsetImageFilter::onFilterBounds() was writing to *dst, and later
referring to src. These may be the same memory location, so the results
were incorrect.

Covered by the 5th test case in offsetimagefilter.

BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13744 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 18:29:42 +00:00
commit-bot@chromium.org
cdd0f92b1a New version of the bbh shootout. 
There were a bunch of problems with the existing code, all of which I would of ignored, except it could only benchmark none and rtree.
The new version measures the same numbers, in almost exactly the same way, it's the structure over the top of the actual test runner that I changed.
Now it only loads the pictures once, it is configurable in which bbh's it runs and how may loops on them it does, it uses standard command line processing, and it does not do so much redundant work so it runs quicker. It is also much easier to understand and change IMHO.

Doing this so I can reasonably compare the new QuadTree implementation.
BUG=skia:2242

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

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

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13743 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 17:27:07 +00:00
bsalomon@google.com
de9f251427 Fix radical assumption that 0.5 in double is exactly convertible to float. 
BUG=skia:2181

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13742 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 17:09:17 +00:00
commit-bot@chromium.org
b97c3ffddf Enable use of distance fields via SkPaint flag. 
Now that distance field generation is fast enough to make it practical, this makes distances field fonts easily available to anyone who wants to try them out (i.e Chromium).

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

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13741 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 17:07:15 +00:00
commit-bot@chromium.org
8065ec50f1 Add new module for distance field generation. 
This improves the speed over the previous method by 10x+, and makes using distance fields practical.

BUG=skia:2173

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

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

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13740 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 15:57:40 +00:00
commit-bot@chromium.org
c5c748c147 Handle rrects with one circular corner and three square corners in GrRRectEffect. 
BUG=skia:2181
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13739 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-11 15:54:51 +00:00