AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,731 Commits 1 Branch 0 Tags 544 MiB
81cdf2381f
Commit Graph

10731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commit-bot@chromium.org
81cdf2381f Small adjustments of two bench ranges. 
BUG=skia:2169
NOTRY=true
R=jvanverth@google.com
TBR=jvanverth@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13445 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 22:52:51 +00:00
commit-bot@chromium.org
e734c15aeb fix debugging script for the SampleApp 
R=scroggo@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13444 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 22:31:48 +00:00
commit-bot@chromium.org
d5414e5efe ensure that opaque-only colortypes always report opaque-alphatype 
BUG=skia:
R=scroggo@google.com, djsollen@google.com, reed@google.com

Author: reed@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13443 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 22:30:38 +00:00
commit-bot@chromium.org
fa9e5fa42a replace setConfig+allocPixels with alloc-or-install-pixels 
BUG=skia:
R=scroggo@google.com, halcanary@google.com, reed@google.com

Author: reed@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13442 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 22:00:04 +00:00
commit-bot@chromium.org
a7692a9ac6 Adding list of Skia's CQ committers 
BUG=skia:2170
NOTRY=true
R=mtklein@google.com, hcm@google.com

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13441 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 21:02:38 +00:00
commit-bot@chromium.org
a4b9b39dda Use a bench alert algorithm with wider ranges. TBR=jvanverth NOTRY=true 
BUG=skia:2169
R=jvanverth@google.com, bsalomon@google.com, robertphillips@google.com
TBR=jvanverth@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13440 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 20:40:56 +00:00
commit-bot@chromium.org
33fed14b1d Fixed clusterfuzz found crash 
BUG=343461
R=senorblanco@google.com, senorblanco@chromium.org, reed@chromium.org, reed@google.com

Author: sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13439 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 18:46:13 +00:00
commit-bot@chromium.org
be233d63ca ARM Skia NEON patches - 27 - S32A_D565_Blend 
BlitRow565: new intrinsics version of S32A_D565_Blend

This new version is basically a rewrite of the existing code with
a few speed and accuracy improvements. There is a switch to enable
pixel perfect results at the cost of a (quite big) decrease of
performances (disabled in this patch).

Here are the benchmark results (speedup vs. existing code):

+-------+------------+------------+
| count | Cortex -A9 | Cortex-A15 |
+-------+------------+------------+
| 1     | +103.6%    | +12%       |
+-------+------------+------------+
| 2     | +3.6%      | +21.6%     |
+-------+------------+------------+
| 4     | +0.8%      | -0.8%      |
+-------+------------+------------+
| 8     | +3.9%      | -1%        |
+-------+------------+------------+
| 16    | +14.7%     | +5.7%      |
+-------+------------+------------+
| 64    | +18.1%     | +13.2%     |
+-------+------------+------------+
| 256   | +16.3%     | +27.4%     |
+-------+------------+------------+
| 1024  | +78.2%     | +17.4%     |
+-------+------------+------------+

Signed-off-by: Kévin PETIT <kevin.petit@arm.com>

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

Author: kevin.petit@arm.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13438 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 18:37:35 +00:00
commit-bot@chromium.org
35d4872f9a Gyp flag to disable inlining. 
To turn off all inlining, rebuild after running the command

$ GYP_DEFINES=skia_disable_inlining=1 ./gyp_skia

Provides an initial value in one GM to avoid an uninitialized variable warning.

BUG=skia:2126
R=scroggo@google.com, mtklein@google.com, tomhudson@google.com

Author: tomhudson@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13437 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 18:36:36 +00:00
commit-bot@chromium.org
ca21a00c73 SkWriter32: throw in the SkTDArray towel. 
I think it's looking more clear we don't have a clean way to use SkTDArray in
SkWriter32.  We can't give SkWriter32 meaningful control over SkTDArray's
reallocation without making moot SkTDArray's raison d'etre.

Let's just use an SkAutoTMalloc<uint8_t> instead.  It wants SkWriter32 to
control it.  Also, it's lower overhead: SkAutoTMalloc<uint8_t> is just a smart
poiter: no size or capacity stored.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13436 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 18:35:54 +00:00
jvanverth@google.com
989ac549c1 Another try at updating expectations 
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13435 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 18:34:56 +00:00
commit-bot@chromium.org
536b15ffb0 rebaseline_server: create ImagePairSet-- holds a number of ImagePairs to examine 
See https://goto.google.com/ChangingRbsJson and bug 1919 for additional context

BUG=skia:1919
NOTRY=True
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13434 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 17:17:05 +00:00
commit-bot@chromium.org
ed3bb1a3a5 Bench rebaseline to use narrower ranges. This also tests the new range calculation algorithm. 
BUG=skia:2163
R=robertphillips@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13433 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 17:16:56 +00:00
commit-bot@chromium.org
c3bd8af6d5 add peekPixels to SkCanvas and SkSurface 
fix reference to SkBaseDevice, which was only a problem in no-gpu build

This reverts commit 4fa44a6bf73891b21917fb90d02beef9143bffa3.

R=reed@google.com

Author: reed@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13432 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 17:14:46 +00:00
commit-bot@chromium.org
e1df56579f Add conicTo(). 
BUG=skia:
R=robertphillips@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13431 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 16:00:58 +00:00
commit-bot@chromium.org
ea7d08e3bb Add unit test for unbalanced save and restores in pictures. 
R=reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13430 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 16:00:51 +00:00
commit-bot@chromium.org
310ec8e32c Update directions and lib paths for ninja. 
BUG=skia:
R=robertphillips@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13429 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 15:30:06 +00:00
commit-bot@chromium.org
bda591c739 Revert of add peekPixels to SkCanvas and SkSurface (https://codereview.chromium.org/161733002/) 
Reason for revert:
compile issues with gm/xfermodes3

Original issue's description:
> add peekPixels to SkCanvas and SkSurface
>
> clone of https://codereview.chromium.org/159723006/
>
> Committed: https://code.google.com/p/skia/source/detail?r=13427

R=jvanverth@google.com
NOTREECHECKS=true
NOTRY=true

Author: reed@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13428 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 15:29:03 +00:00
mike@reedtribe.org
b2d93a9122 add peekPixels to SkCanvas and SkSurface 
clone of https://codereview.chromium.org/159723006/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13427 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 15:11:11 +00:00
mike@reedtribe.org
deee496cd3 replace setConfig+allocPixels with single call 
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13426 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 14:41:43 +00:00
jvanverth@google.com
b720ffd208 Updated GM expectations for Win7-ShuttleA-HD2000 
BUG=skia:2167

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13425 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 14:24:59 +00:00
skia.committer@gmail.com
22ef2c37e6 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13424 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 03:01:57 +00:00
commit-bot@chromium.org
9a67a7e2a0 Just a bit of cleanup. This doesn't alter the matrix/clip stack manager's behavior or its memory consumption. 
R=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13423 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-12 23:22:15 +00:00
commit-bot@chromium.org
6e715f8eb0 Empty expectations for bots affected by GM perspective switch 
BUG=skia:2146
R=epoger@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13422 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-12 18:33:56 +00:00
commit-bot@chromium.org
5e1a7f2cc6 Revert of r13379 (Move fLastMoveToIndex from SkPath to SkPathRef - https://codereview.chromium.org/146913002/) due to image quality regression in Chromium. See crbug.com/343123 (Regression - UI issue observed for any "Notification infobars" in Chrome browser) 
R=bsalomon@google.com
TBR=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13421 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-12 17:44:30 +00:00
commit-bot@chromium.org
c5dada85e8 This CL doesn't radically change the behavior of the matrix\clip stack reducer. It just cleans up the matrix handling a bit. 
R=bsalomon@google.com, mtklein@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13420 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-12 15:48:04 +00:00
reed@google.com
8441f0c697 remove width>=0 asserts, as clients rely on this (at least for testing) 
git-svn-id: http://skia.googlecode.com/svn/trunk@13419 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-12 13:21:55 +00:00
skia.committer@gmail.com
877c44956d Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13418 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-12 03:02:04 +00:00
mike@reedtribe.org
6fe16a3db0 remove unused deviceconfig from SkShader 
git-svn-id: http://skia.googlecode.com/svn/trunk@13417 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-12 01:28:30 +00:00
commit-bot@chromium.org
536ac5e20c Templetized SkWriter32 readTAt() & overwriteTAt() 
Convert SkWriter32::{read,write}32At() to ::{read,overwrite}TAt<>() to allow
peeking/updating arbitrary records.


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

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13416 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 22:38:51 +00:00
commit-bot@chromium.org
14747e58f8 Adding new 'extend' mode to SkPath::addPath 
BUG=261727
R=reed@google.com, caryclark@google.com, schenney@chromium.org, robertphillips@google.com

Author: junov@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13415 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 21:16:29 +00:00
commit-bot@chromium.org
e07dfe54c4 Update Mac 10.6 bench expectation for tabl_worldjournal. 
R=robertphillips@google.com
TBR=robertphillips@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13414 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 20:27:05 +00:00
commit-bot@chromium.org
3ae0e6c2b2 Add dev bounds to bmp txt context, use bounds to ignore clips 
R=robertphillips@google.com, jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13413 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 18:24:25 +00:00
commit-bot@chromium.org
a87b21cd00 Reland SkWriter32 growth change with build fixes. 
- SkSWriter32 resets itself with its stack block;
  - Track the full capacity of fInternal (which may be >size after a reset).

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13412 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 18:22:04 +00:00
commit-bot@chromium.org
61e96cd446 SkBitmap now really stores SkImageInfo -- config is just a ruse 
BUG=skia:
R=scroggo@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13411 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 18:21:45 +00:00
commit-bot@chromium.org
44546f85d9 Add the perceptual difference metric to the rebaseline server 
* Finds the location of the skpdiff binary.
* Calculates the perceptual difference percentage using the skpdiff binary (treats -1 as 0% perceptual similarity).
* Replaces the weightedDiffMeasure in view.html with perceptualDifferent.

BUG=skia:2019
NOTRY=true

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

R=epoger@google.com

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13410 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 18:21:26 +00:00
robertphillips@google.com
e79f320ed6 Revert of r13384 (Stateful PathRenderer implementation) 
https://codereview.chromium.org/142543007/



git-svn-id: http://skia.googlecode.com/svn/trunk@13409 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 16:30:21 +00:00
djsollen@google.com
27d7ede2e6 bugfix for typo in skpdiff tool 
Review URL: https://codereview.chromium.org/154263008

git-svn-id: http://skia.googlecode.com/svn/trunk@13408 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 16:29:39 +00:00
djsollen@google.com
60bce6cfcc Return -1 in error condition instead of removing diff result. 
BUG=skia:2160
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13407 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 16:22:58 +00:00
commit-bot@chromium.org
09f0ba7eb3 Revert of Change growth function for SkWriter32 (https://codereview.chromium.org/150663014/) 
Reason for revert:
See https://codereview.chromium.org/152703007/.

Original issue's description:
> Change growth function for SkWriter32
>
> Add setCountExact to SkTDArray to allow external control of array growth.
> Use it to allow SkWriter to control the buffer growth pattern.
> Change buffer growth pattern to 1.5n+4096
>
> BUG=skia:2125
>
> Committed: http://code.google.com/p/skia/source/detail?r=13401

R=tomhudson@google.com, reed@google.com, iancottrell@google.com
TBR=iancottrell@google.com, reed@google.com, tomhudson@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2125

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13406 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 15:56:57 +00:00
robertphillips@google.com
d321a45aea clang complaint fix 
git-svn-id: http://skia.googlecode.com/svn/trunk@13405 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 15:51:36 +00:00
robertphillips@google.com
3cd6fdf64e Fix build 
https://codereview.chromium.org/159813002/



git-svn-id: http://skia.googlecode.com/svn/trunk@13404 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 15:40:54 +00:00
robertphillips@google.com
dd31ac470b Fix valgrind suppressions 
https://codereview.chromium.org/158493004/



git-svn-id: http://skia.googlecode.com/svn/trunk@13403 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 15:23:21 +00:00
robertphillips@google.com
105a4a584c Collapse matrix & clip stack in PictureRecord 
https://codereview.chromium.org/137093004/



git-svn-id: http://skia.googlecode.com/svn/trunk@13402 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 15:10:40 +00:00
commit-bot@chromium.org
93d5ffda58 Change growth function for SkWriter32 
Add setCountExact to SkTDArray to allow external control of array growth.
Use it to allow SkWriter to control the buffer growth pattern.
Change buffer growth pattern to 1.5n+4096

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

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13401 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 15:07:26 +00:00
commit-bot@chromium.org
ac14aac67b Whitespace change to test bugdroid links. 
(SkipBuildbotRuns)
BUG=skia:2139
TBR=
NOTREECHECKS=true
NOTRY=true

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13400 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 13:57:15 +00:00
commit-bot@chromium.org
589bd3da34 Revert of Add the perceptual difference metric to the rebaseline server (https://codereview.chromium.org/147453003/) 
Reason for revert:
Caused failure in RunGmSelfTests:
http://108.170.219.160:10117/builders/Housekeeper-PerCommit/builds/154/steps/RunGmSelfTests/logs/stdio

Filed:
https://code.google.com/p/skia/issues/detail?id=2160

Original issue's description:
> Add the perceptual difference metric to the rebaseline server
>
> * Finds the location of the skpdiff binary.
> * Calculates the perceptual difference percentage using the skpdiff binary.
> * Replaces the weightedDiffMeasure in view.html with perceptualDifferent.
>
> BUG=skia:2019
> NOTRY=true
>
> Committed: http://code.google.com/p/skia/source/detail?r=13398

R=epoger@google.com
TBR=epoger@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2019

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13399 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 13:30:33 +00:00
commit-bot@chromium.org
af34eb9b74 Add the perceptual difference metric to the rebaseline server 
* Finds the location of the skpdiff binary.
* Calculates the perceptual difference percentage using the skpdiff binary.
* Replaces the weightedDiffMeasure in view.html with perceptualDifferent.

BUG=skia:2019
NOTRY=true
R=epoger@google.com

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13398 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 12:33:58 +00:00
commit-bot@chromium.org
afe38b16f0 Fix broken debug build 
BUG=skia:
R=tomhudson@google.com

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13397 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 11:18:12 +00:00
commit-bot@chromium.org
046f1f6ff4 Cleaner external buffer handling in SkWriter32 
This unifies the internal and external buffer handling so that the difference only has to be noticed when growing.
Removing the branches from the common read and write cases gives a significant speedup.

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

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13396 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-11 10:17:02 +00:00