commit-bot@chromium.org [Fri, 7 Feb 2014 18:21:59 +0000 (18:21 +0000)]
rebaseline_server: properly handle unexpected GETs
BUG=skia:2147
NOTRY=True
R=rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
157773002
git-svn-id: http://skia.googlecode.com/svn/trunk@13366
2bbb7eff-a529-9590-31e7-
b0007b416f81
fmalita@google.com [Fri, 7 Feb 2014 17:14:01 +0000 (17:14 +0000)]
Bench rebaseline for the new SKPs
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/
156733003
git-svn-id: http://skia.googlecode.com/svn/trunk@13365
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 7 Feb 2014 16:23:27 +0000 (16:23 +0000)]
remove unneeded SK_SUPPORT_LEGACY_NEWRENDERTARGETDIRECT
BUG=skia:
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/
141063004
git-svn-id: http://skia.googlecode.com/svn/trunk@13364
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 7 Feb 2014 16:09:26 +0000 (16:09 +0000)]
remove unneeded SK_SUPPORT_LEGACY_CANVAS_CREATECOMPATIBLEDEVICE
git-svn-id: http://skia.googlecode.com/svn/trunk@13363
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 7 Feb 2014 16:02:41 +0000 (16:02 +0000)]
remove legacy LightingColorFilter impl
TBR:djsollen
Review URL: https://codereview.chromium.org/
151353005
git-svn-id: http://skia.googlecode.com/svn/trunk@13362
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 7 Feb 2014 14:04:48 +0000 (14:04 +0000)]
Set scissor to clip bounding box when using GrConvexPolyEffect
BUG=skia:2051
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
156843005
git-svn-id: http://skia.googlecode.com/svn/trunk@13361
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 7 Feb 2014 13:55:57 +0000 (13:55 +0000)]
Fix android build issues with atomics
Uses inline methods for sk_atomic_inc/add/dec instead of #define.
Since those methods are declared as static in SkThread.h, they need
a definition or else the compiler generates an error. Also corrects
a typo.
BUG=skia:
R=djsollen@google.com, bungeman@google.com, bsalomon@google.com
Author: cdalton@nvidia.com
Review URL: https://codereview.chromium.org/
148113010
git-svn-id: http://skia.googlecode.com/svn/trunk@13360
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 7 Feb 2014 13:29:21 +0000 (13:29 +0000)]
Whitespace change to test Bugdroid II
(SkipBuildbotRuns)
TBR=
NOTRY=true
BUG=skia:2139
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
144713009
git-svn-id: http://skia.googlecode.com/svn/trunk@13359
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 7 Feb 2014 13:27:59 +0000 (13:27 +0000)]
Whitespace change to test Bugdroid
(SkipBuildbotRuns)
TBR=
NOTRY=true
BUG=2139
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
157393003
git-svn-id: http://skia.googlecode.com/svn/trunk@13358
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 7 Feb 2014 12:20:04 +0000 (12:20 +0000)]
Revert of Revert "Serialization of SkPictureImageFilter" (https://codereview.chromium.org/
153583007/)
Reason for revert:
New SKPs with version20 are in Google Storage due to http://108.170.219.160:10117/builders/Housekeeper-Nightly-RecreateSKPs/builds/22
Original issue's description:
> Revert "Serialization of SkPictureImageFilter"
>
> This reverts commit
227321b30106e57942929eb96fa5bc22544f6c9e.
>
> Revert "Sanitizing source files in Housekeeper-Nightly"
>
> This reverts commit
baf28584b7636c01355f8d8d972e06aa7fb66d77.
>
> TBR=robertphillips@google.com,sugoi@google.com
>
> Committed: https://code.google.com/p/skia/source/detail?r=13356
R=robertphillips@google.com, sugoi@google.com, fmalita@google.com, fmalita@chromium.org
TBR=fmalita@chromium.org, fmalita@google.com, robertphillips@google.com, sugoi@google.com
NOTREECHECKS=true
NOTRY=true
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
143163005
git-svn-id: http://skia.googlecode.com/svn/trunk@13357
2bbb7eff-a529-9590-31e7-
b0007b416f81
fmalita@google.com [Fri, 7 Feb 2014 05:55:39 +0000 (05:55 +0000)]
Revert "Serialization of SkPictureImageFilter"
This reverts commit
227321b30106e57942929eb96fa5bc22544f6c9e.
Revert "Sanitizing source files in Housekeeper-Nightly"
This reverts commit
baf28584b7636c01355f8d8d972e06aa7fb66d77.
TBR=robertphillips@google.com,sugoi@google.com
Review URL: https://codereview.chromium.org/
153583007
git-svn-id: http://skia.googlecode.com/svn/trunk@13356
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Fri, 7 Feb 2014 03:02:05 +0000 (03:02 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13355
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 7 Feb 2014 02:09:50 +0000 (02:09 +0000)]
Serialization of SkPictureImageFilter
BUG=skia:
Committed: http://code.google.com/p/skia/source/detail?r=13347
R=senorblanco@google.com, reed@google.com, mtklein@google.com, sugoi@google.com, senorblanco@chromium.org, robertphillips@google.com, scroggo@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/
138063005
git-svn-id: http://skia.googlecode.com/svn/trunk@13354
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 6 Feb 2014 22:03:17 +0000 (22:03 +0000)]
use new instead of createCompatibleDevice, since we know the subclass we want
BUG=skia:
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/
141443009
git-svn-id: http://skia.googlecode.com/svn/trunk@13353
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 6 Feb 2014 22:00:58 +0000 (22:00 +0000)]
impl getROPixels for gpu SkImage
BUG=skia:
R=jvanverth@google.com
Review URL: https://codereview.chromium.org/
150513005
git-svn-id: http://skia.googlecode.com/svn/trunk@13352
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 6 Feb 2014 21:27:40 +0000 (21:27 +0000)]
Disable NEON procs for SkBlitMask_D32_A8 until we can diagnose the source of the SIGILL chrashes seen in chromium.
BUG=2067
R=reed@google.com, kevin.petit.arm@gmail.com, mtklein@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/
132393007
git-svn-id: http://skia.googlecode.com/svn/trunk@13351
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 6 Feb 2014 20:59:47 +0000 (20:59 +0000)]
replace impl of SkLightingColorFilter with SkColorMatrixFilter
BUG=skia:
R=djsollen@google.com
Review URL: https://codereview.chromium.org/
135123008
git-svn-id: http://skia.googlecode.com/svn/trunk@13350
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 6 Feb 2014 20:22:25 +0000 (20:22 +0000)]
rebaseline_server: add "show only"/"show all" buttons to some columns
BUG=skia:2143
NOTRY=True
R=bsalomon@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
156773003
git-svn-id: http://skia.googlecode.com/svn/trunk@13349
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 6 Feb 2014 18:47:25 +0000 (18:47 +0000)]
Revert of r13347 (Serialization of SkPictureImageFilter - https://codereview.chromium.org/
138063005) due to bump in skp file format
git-svn-id: http://skia.googlecode.com/svn/trunk@13348
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 6 Feb 2014 18:06:14 +0000 (18:06 +0000)]
Serialization of SkPictureImageFilter
BUG=skia:
R=senorblanco@google.com, reed@google.com, mtklein@google.com, sugoi@google.com, senorblanco@chromium.org, robertphillips@google.com, scroggo@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/
138063005
git-svn-id: http://skia.googlecode.com/svn/trunk@13347
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 6 Feb 2014 16:53:25 +0000 (16:53 +0000)]
add inital gm for colorfilters
BUG=skia:
R=djsollen@google.com
Review URL: https://codereview.chromium.org/
140393005
git-svn-id: http://skia.googlecode.com/svn/trunk@13346
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 6 Feb 2014 16:26:08 +0000 (16:26 +0000)]
Add ifdef to avoid "not defined" compiler warnings for VS checks
BUG=skia:2130
R=reed@google.com
Author: hcm@google.com
Review URL: https://codereview.chromium.org/
153093004
git-svn-id: http://skia.googlecode.com/svn/trunk@13345
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 6 Feb 2014 16:13:00 +0000 (16:13 +0000)]
Scripts to generate Android.mk for framework Skia.
In order to create Android.mk, run
>> python platform_tools/android/bin/gyp_to_android.py
For the change in the Android.mk file, see
https://googleplex-android-review.git.corp.google.com/#/c/408170/
(SkipBuildbotRuns)
BUG=skia:1975
R=djsollen@google.com, epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/
140503007
git-svn-id: http://skia.googlecode.com/svn/trunk@13344
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 6 Feb 2014 15:17:28 +0000 (15:17 +0000)]
rebaseline_server: get "image size" working again
BUG=skia:2134
NOTRY=True
R=rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
155973003
git-svn-id: http://skia.googlecode.com/svn/trunk@13343
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 6 Feb 2014 14:57:20 +0000 (14:57 +0000)]
Added newline at end of MatrixClipCollapseTest.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@13342
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 6 Feb 2014 14:30:44 +0000 (14:30 +0000)]
return NULL not false for a void* failure
git-svn-id: http://skia.googlecode.com/svn/trunk@13341
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 6 Feb 2014 14:22:47 +0000 (14:22 +0000)]
Add test harness for matrix/clip state collapsing
https://codereview.chromium.org/
133003006/
git-svn-id: http://skia.googlecode.com/svn/trunk@13340
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 6 Feb 2014 14:11:56 +0000 (14:11 +0000)]
add ways to peer into an image to get its pixels
BUG=skia:
R=bsalomon@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/
155763004
git-svn-id: http://skia.googlecode.com/svn/trunk@13339
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 6 Feb 2014 13:43:07 +0000 (13:43 +0000)]
fix refcounting in SkImage::NewRasterData
git-svn-id: http://skia.googlecode.com/svn/trunk@13338
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Thu, 6 Feb 2014 13:39:48 +0000 (13:39 +0000)]
Rebaselines for stragglers (Nexus4 Debug looks like it was really stale.)
TBR=fmalita@chromium.org
BUG=skia:
Review URL: https://codereview.chromium.org/
148253008
git-svn-id: http://skia.googlecode.com/svn/trunk@13337
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Thu, 6 Feb 2014 03:01:46 +0000 (03:01 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13336
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Thu, 6 Feb 2014 01:04:50 +0000 (01:04 +0000)]
Add new baselines for tests affected by https://code.google.com/p/skia/source/detail?r=13323, namely:
colorfilterimagefilter
dropshadowimagefilter
imageblur
imageblur_large
imagefiltersbase
imagefilterscropped
imagefiltersgraph
imagefiltersscaled
morphology
offsetimagefilter
spritebitmap
xfermodeimagefilter
TBR=fmalita@chromium.org
Review URL: https://codereview.chromium.org/
156243003
git-svn-id: http://skia.googlecode.com/svn/trunk@13335
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Thu, 6 Feb 2014 00:36:01 +0000 (00:36 +0000)]
Fix memory leak in imagefiltersclipped GM (found by valgrind).
TBR=robertphillips
Review URL: https://codereview.chromium.org/
146193004
git-svn-id: http://skia.googlecode.com/svn/trunk@13334
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Wed, 5 Feb 2014 23:23:39 +0000 (23:23 +0000)]
Fix SkXPSDevice
Make SkImageFilter parameter for SkXPSDevice::allowImageFilter const to match
the SkBitmapDevice base class.
BUG=skia:2097
R=senorblanco@chromium.org
Review URL: https://codereview.chromium.org/
156213002
git-svn-id: http://skia.googlecode.com/svn/trunk@13333
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Wed, 5 Feb 2014 23:04:28 +0000 (23:04 +0000)]
Mid-air collision: fix constness for onFilterImage in new test.
TBR=fmalita
BUG=skia:
Review URL: https://codereview.chromium.org/
151323003
git-svn-id: http://skia.googlecode.com/svn/trunk@13332
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Wed, 5 Feb 2014 22:36:31 +0000 (22:36 +0000)]
Fix a problem with scaled filters in tiled SkPicture playback.
The matrix used during filter application should be up-to-date, so that
the filter parameters can be scaled by the CTM (e.g., for hiDPI).
However, tiled playback defers setting of the matrix until after the
restore() call which draws the filter, which is too late. Moving the
setMatrix() ahead of the restore() sequence fixes the problem.
TEST=ImageFilterMatrixTest
R=junov@chromium.org
Review URL: https://codereview.chromium.org/
145723007
git-svn-id: http://skia.googlecode.com/svn/trunk@13331
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 5 Feb 2014 22:32:02 +0000 (22:32 +0000)]
Make SkImageFilter methods const.
SkImageFilter had some non-const methods that could all be made const.
This is a first step towards making SkImageFilter immutable.
BUG=skia:2097
R=mtklein@google.com, reed@google.com, robertphillips@google.com
Author: dominikg@chromium.org
Review URL: https://codereview.chromium.org/
148883011
git-svn-id: http://skia.googlecode.com/svn/trunk@13330
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 5 Feb 2014 22:29:35 +0000 (22:29 +0000)]
Rebase gpu images on N4 where persp rect clip is handled by convex poly clip effect.
BUG=skia:2136
Review URL: https://codereview.chromium.org/
156203002
git-svn-id: http://skia.googlecode.com/svn/trunk@13329
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 5 Feb 2014 21:02:35 +0000 (21:02 +0000)]
pass in the real rowBytes
git-svn-id: http://skia.googlecode.com/svn/trunk@13328
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 5 Feb 2014 20:44:56 +0000 (20:44 +0000)]
More canvas-state GM rebaselines
BUG=skia:2051
Review URL: https://codereview.chromium.org/
150573015
git-svn-id: http://skia.googlecode.com/svn/trunk@13327
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 5 Feb 2014 20:34:44 +0000 (20:34 +0000)]
canvas-state GM rebaselines after r13320.
BUG=skia:2051
Review URL: https://codereview.chromium.org/
138833008
git-svn-id: http://skia.googlecode.com/svn/trunk@13326
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 5 Feb 2014 19:49:17 +0000 (19:49 +0000)]
rebaseline_server: add bgcolor slider for pixelDiff column
BUG=skia:1904
NOTRY=True
R=robertphillips@google.com, rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
143273003
git-svn-id: http://skia.googlecode.com/svn/trunk@13325
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 5 Feb 2014 18:44:31 +0000 (18:44 +0000)]
gm self-test: stop checking stdout and stderr
BUG=skia:1568
NOTRY=True
R=bsalomon@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
156023002
git-svn-id: http://skia.googlecode.com/svn/trunk@13324
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Wed, 5 Feb 2014 17:51:22 +0000 (17:51 +0000)]
Implement correct clipping for image filters.
Image filters in Skia currently clip the size of the the offscreen
bitmap used for filtering to the device clip bounds. This means that
any pixel-moving filter (e.g., blur) has edge artifacts at the clip
boundaries. This is problematic for tiling, where a single SkPicture
is played back with a clip set to the tile boundaries.
By implementing the onFilterBounds() traversal, and using it in
saveLayer() when a filter is present, we can clip the layer to the
expanded clip rect. Note that this requires that the traversal be
performed in reverse as compared to computeFastBounds(). (It's also
done in device space, unlike computeFastBounds()).
New test imagefiltersclipped tests pixel-moving filters when clipped
by various clip rects.
New test imageblurtiled tests tiled (compositor-style) rendering of
blurred text. There should be no artifacts at the tile boundaries.
BUG=337831
R=reed@google.com
Review URL: https://codereview.chromium.org/
23011012
git-svn-id: http://skia.googlecode.com/svn/trunk@13323
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 5 Feb 2014 16:39:41 +0000 (16:39 +0000)]
Fix SampleApp for devices who don't support the full OpenGL API
R=bsalomon@google.com, ernstm@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/
137223006
git-svn-id: http://skia.googlecode.com/svn/trunk@13322
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Wed, 5 Feb 2014 16:35:12 +0000 (16:35 +0000)]
Reland "Gyp file changes for the android framework."
Relands https://codereview.chromium.org/
153093003/, which was reverted
with https://skia.googlesource.com/skia.git/+/
eb6295044b97db05ec40625dcebc2459b2a38a98
This reverts commit
6b32be1402eb6c549d5ba1db71860e24f9de2991.
BUG=skia:1975
R=djsollen@google.com
Review URL: https://codereview.chromium.org/
154053002
git-svn-id: http://skia.googlecode.com/svn/trunk@13321
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 5 Feb 2014 16:29:12 +0000 (16:29 +0000)]
Stop discarding in frag shader when coverage is zero and stencil writes are enabled
This fixes the corruption in the NVPR images here:
http://108.170.217.252:10117/builders/Test-Win8-ShuttleA-GTX660-x86-Debug/builds/251/steps/CompareGMs/logs/stdio
caused by:
https://skia.googlesource.com/skia.git/+/
65ee5f424cb4dabd453268902c00086605d77c1d
The stencil path step writes inside and outside the clip when the clip is implemented by
a coverage effect. The path cover step then doesn't write outside of the clip because the FS
discards. This leaves stencil values outside of the clip non-zero which messed up subsequent
path or clip draws to those samples.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
154623002
git-svn-id: http://skia.googlecode.com/svn/trunk@13320
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 5 Feb 2014 15:32:21 +0000 (15:32 +0000)]
remove SkCanvas::createCompatibleDevice, and add SkCanvas::newSurface
BUG=skia:
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/
154163002
git-svn-id: http://skia.googlecode.com/svn/trunk@13319
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Wed, 5 Feb 2014 14:05:38 +0000 (14:05 +0000)]
Clean up SkPictureRecord.cpp
https://codereview.chromium.org/
153983007/
git-svn-id: http://skia.googlecode.com/svn/trunk@13318
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Wed, 5 Feb 2014 13:35:56 +0000 (13:35 +0000)]
Wider perf trigger range for N4 and N7 perf improvements
https://codereview.chromium.org/
141013019/
git-svn-id: http://skia.googlecode.com/svn/trunk@13317
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Wed, 5 Feb 2014 03:01:48 +0000 (03:01 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13316
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 4 Feb 2014 22:45:40 +0000 (22:45 +0000)]
Add magnifier to rebaseline server.
NOTRY=true
BUG=skia:1917
R=epoger@google.com
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
149473005
git-svn-id: http://skia.googlecode.com/svn/trunk@13315
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 4 Feb 2014 22:35:01 +0000 (22:35 +0000)]
Make SkFontMgr interface const.
COLLABORATOR=mtklein@chromium.org
BUG=skia:
R=reed@google.com, bungeman@google.com, mtklein@chromium.org
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
134643028
git-svn-id: http://skia.googlecode.com/svn/trunk@13314
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Tue, 4 Feb 2014 20:35:55 +0000 (20:35 +0000)]
Compilation fix for r13311 (Update SkPictureRecord to allow some ops to be written separately - https://codereview.chromium.org/
153883002/)
git-svn-id: http://skia.googlecode.com/svn/trunk@13313
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Tue, 4 Feb 2014 20:26:04 +0000 (20:26 +0000)]
Ignore failures on GalaxyNexus and NexusS
https://codereview.chromium.org/
154223002/
git-svn-id: http://skia.googlecode.com/svn/trunk@13312
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Tue, 4 Feb 2014 20:07:50 +0000 (20:07 +0000)]
Update SkPictureRecord to allow some ops to be written separately
https://codereview.chromium.org/
153883002/
git-svn-id: http://skia.googlecode.com/svn/trunk@13311
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 4 Feb 2014 19:32:37 +0000 (19:32 +0000)]
Fix crash in bench when "--mode record" is used
R=mtklein@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/
150633008
git-svn-id: http://skia.googlecode.com/svn/trunk@13310
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 4 Feb 2014 18:00:23 +0000 (18:00 +0000)]
TSAN: use somewhat pithier SK_ANNOTATE_UNPROTECTED_READ.
This is a little bit better practice to be i than the existing SK_ANNOTATE_BENIGN_RACE, as UNPROTECTED_READ will only ignore reads, not writes.
Tag SkRefCnt::unique() as a safe unprotected read like SkOnce's double-checked locking.
BUG=skia:
R=reed@google.com, bungeman@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
144953005
git-svn-id: http://skia.googlecode.com/svn/trunk@13309
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 4 Feb 2014 17:49:54 +0000 (17:49 +0000)]
Added root deletion code to fix valgrind error
BUG=skia:
R=robertphillips@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/
153893004
git-svn-id: http://skia.googlecode.com/svn/trunk@13308
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Feb 2014 17:49:52 +0000 (17:49 +0000)]
remove kGL_Capability (unused)
BUG=skia:
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/
153993003
git-svn-id: http://skia.googlecode.com/svn/trunk@13307
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 4 Feb 2014 17:49:48 +0000 (17:49 +0000)]
Use GrConvexPolyEffect when clip is a single convex polygon
BUG=skia:2051
Committed: http://code.google.com/p/skia/source/detail?r=13286
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
151523005
git-svn-id: http://skia.googlecode.com/svn/trunk@13306
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Feb 2014 16:14:58 +0000 (16:14 +0000)]
fix int->scalar warning
git-svn-id: http://skia.googlecode.com/svn/trunk@13305
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Tue, 4 Feb 2014 16:08:48 +0000 (16:08 +0000)]
Gyp file changes for the android framework.
Split off from https://codereview.chromium.org/
140503007/.
The eventual goal is to create our Android.mk from gyp. This patch
adds an option for skia_android_framework with the right settings.
The follow-up (https://codereview.chromium.org/
140503007/) will
use scripts to create the final makefile.
gyp/android_deps.gyp:
Use different dependencies for the framework than for building Skia
normally.
gyp/android_framework_lib.gyp:
Like skia_lib, specifies the minimum needed for building Skia, in this
case for the framework.
gyp/common_conditions.gypi:
Add settings specific to skia_android_framework. In some cases this
means turning off flags and defines.
gyp/common.gypi
Turn off SK_DEBUG and SK_DEVELOPER when building for the framework.
This allows the framework to create a single makefile which can be
modified to add SK_DEBUG and SK_DEVELOPER as desired.
gyp/common_variables.gypi:
Add skia_android_framework.
gyp/core.gyp:
Don't depend on cpufeatures, and add the cutils library for
skia_android_framework.
gyp/freetype.gyp:
skia_android_framework-specific options:
Don't include freetype_static as a dependency.
Include the proper folders.
Include the android library.
gyp/images.gyp:
Don't export libjpeg as a dependency for targets that include images
for the framework.
Also reorder image decoders to match the Android order, leaving our
most commonly used ones last (and therefore first in the chain for
trying them).
gyp/libwebp.gyp:
Use the system webp when building for the Android framework. Specify
the correct settings for the framework.
gyp/opts.gyp:
Specify a default set of files to compile when there are no possible
optimizations.
gyp/pdf.gyp:
Add dependencies for Android framework.
gyp/zlib.gyp:
Include the zlib folder, and undefine SK_ZLIB_INCLUDE.
BUG=skia:1975
R=djsollen@google.com
Committed: https://code.google.com/p/skia/source/detail?r=13298
Review URL: https://codereview.chromium.org/
153093003
git-svn-id: http://skia.googlecode.com/svn/trunk@13304
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Feb 2014 16:03:51 +0000 (16:03 +0000)]
fix samplefuzz, fix some 32/64bit warnings
git-svn-id: http://skia.googlecode.com/svn/trunk@13303
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Feb 2014 15:34:10 +0000 (15:34 +0000)]
remove (unused by chrome) SkDeferredCanvas(device) factory signature
BUG=skia:
R=junov@chromium.org
Review URL: https://codereview.chromium.org/
136753016
git-svn-id: http://skia.googlecode.com/svn/trunk@13302
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Feb 2014 15:30:57 +0000 (15:30 +0000)]
convert gm tool to use surfaces instead of devices
BUG=skia:
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/
148783003
git-svn-id: http://skia.googlecode.com/svn/trunk@13301
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 4 Feb 2014 15:09:16 +0000 (15:09 +0000)]
Add rect clip to convex_poly_clip GM
BUG=skia:2051
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
147793007
git-svn-id: http://skia.googlecode.com/svn/trunk@13300
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Feb 2014 14:58:30 +0000 (14:58 +0000)]
remove redundant GrContext parameter to NewRenderTargetDirect
BUG=skia:
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/
151183003
git-svn-id: http://skia.googlecode.com/svn/trunk@13299
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Tue, 4 Feb 2014 14:50:20 +0000 (14:50 +0000)]
Gyp file changes for the android framework.
Split off from https://codereview.chromium.org/
140503007/.
The eventual goal is to create our Android.mk from gyp. This patch
adds an option for skia_android_framework with the right settings.
The follow-up (https://codereview.chromium.org/
140503007/) will
use scripts to create the final makefile.
gyp/android_deps.gyp:
Use different dependencies for the framework than for building Skia
normally.
gyp/android_framework_lib.gyp:
Like skia_lib, specifies the minimum needed for building Skia, in this
case for the framework.
gyp/common_conditions.gypi:
Add settings specific to skia_android_framework. In some cases this
means turning off flags and defines.
gyp/common.gypi
Turn off SK_DEBUG and SK_DEVELOPER when building for the framework.
This allows the framework to create a single makefile which can be
modified to add SK_DEBUG and SK_DEVELOPER as desired.
gyp/common_variables.gypi:
Add skia_android_framework.
gyp/core.gyp:
Don't depend on cpufeatures, and add the cutils library for
skia_android_framework.
gyp/freetype.gyp:
skia_android_framework-specific options:
Don't include freetype_static as a dependency.
Include the proper folders.
Include the android library.
gyp/images.gyp:
Don't export libjpeg as a dependency for targets that include images
for the framework.
Also reorder image decoders to match the Android order, leaving our
most commonly used ones last (and therefore first in the chain for
trying them).
gyp/libwebp.gyp:
Use the system webp when building for the Android framework. Specify
the correct settings for the framework.
gyp/opts.gyp:
Specify a default set of files to compile when there are no possible
optimizations.
gyp/pdf.gyp:
Add dependencies for Android framework.
gyp/zlib.gyp:
Include the zlib folder, and undefine SK_ZLIB_INCLUDE.
BUG=skia:1975
R=djsollen@google.com
Review URL: https://codereview.chromium.org/
153093003
git-svn-id: http://skia.googlecode.com/svn/trunk@13298
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 4 Feb 2014 14:02:44 +0000 (14:02 +0000)]
change benchmark to use surfaces instead of devices to specify its backends
BUG=skia:
R=mtklein@google.com
Review URL: https://codereview.chromium.org/
153133002
git-svn-id: http://skia.googlecode.com/svn/trunk@13297
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Tue, 4 Feb 2014 03:01:56 +0000 (03:01 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13296
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Tue, 4 Feb 2014 00:28:46 +0000 (00:28 +0000)]
More bot whack-a-mole: fix Win build.
BUG=skia:
TBR=fmalita@chromium.org
Review URL: https://codereview.chromium.org/
146073006
git-svn-id: http://skia.googlecode.com/svn/trunk@13295
2bbb7eff-a529-9590-31e7-
b0007b416f81
fmalita@google.com [Mon, 3 Feb 2014 23:25:32 +0000 (23:25 +0000)]
Speculative build fix after r13292.
TBR=senorblanco@chromium.org
Review URL: https://codereview.chromium.org/
153213002
git-svn-id: http://skia.googlecode.com/svn/trunk@13294
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Mon, 3 Feb 2014 22:36:39 +0000 (22:36 +0000)]
Fix skia_gpu=0 build.
BUG=skia:
TBR=bsalomon@google.com
Review URL: https://codereview.chromium.org/
132503006
git-svn-id: http://skia.googlecode.com/svn/trunk@13293
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Mon, 3 Feb 2014 22:22:16 +0000 (22:22 +0000)]
Fix image filter crop offsets for GPU path.
This is the GPU-side version of
https://codereview.chromium.org/
112803004/.
Also factored the crop offset unit test into a function, so we can
call it with both CPU & GPU devices.
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/
153113003
git-svn-id: http://skia.googlecode.com/svn/trunk@13292
2bbb7eff-a529-9590-31e7-
b0007b416f81
fmalita@google.com [Mon, 3 Feb 2014 21:50:06 +0000 (21:50 +0000)]
Whitespace change to test the DownloadSKImageFiles fix.
TBR=borenet@google.com
NOTRY=true
Review URL: https://codereview.chromium.org/
142093005
git-svn-id: http://skia.googlecode.com/svn/trunk@13291
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 21:20:09 +0000 (21:20 +0000)]
fix script so that the error is actually printed if ant is not installed
R=scroggo@google.com, hcm@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/
148793003
git-svn-id: http://skia.googlecode.com/svn/trunk@13290
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 21:19:04 +0000 (21:19 +0000)]
remove tools/test_rendering.py and tools/test_pictures.py
BUG=skia:2035
R=borenet@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
153083003
git-svn-id: http://skia.googlecode.com/svn/trunk@13289
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 3 Feb 2014 20:09:56 +0000 (20:09 +0000)]
Revert of Use GrConvexPolyEffect when clip is a single convex polygon (https://codereview.chromium.org/
151523005/)
Reason for revert:
unit tests crashing on windows?
Original issue's description:
> Use GrConvexPolyEffect when clip is a single convex polygon
>
> BUG=skia:2051
>
> Committed: http://code.google.com/p/skia/source/detail?r=13286
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2051
Review URL: https://codereview.chromium.org/
142443006
git-svn-id: http://skia.googlecode.com/svn/trunk@13288
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 19:47:13 +0000 (19:47 +0000)]
rename tracing parameter to be more consistent with other methods
BUG=skia:
R=bsalomon@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/
136753013
git-svn-id: http://skia.googlecode.com/svn/trunk@13287
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 19:42:42 +0000 (19:42 +0000)]
Use GrConvexPolyEffect when clip is a single convex polygon
BUG=skia:2051
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
151523005
git-svn-id: http://skia.googlecode.com/svn/trunk@13286
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 19:40:32 +0000 (19:40 +0000)]
Adding int cast to prevent warning
BUG=skia:
R=fmalita@google.com, fmalita@chromium.org, bsalomon@google.com, bsalomon@chromium.org
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/
149463009
git-svn-id: http://skia.googlecode.com/svn/trunk@13285
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 19:36:20 +0000 (19:36 +0000)]
don't initialize the default Skia tracer if one has already been provided
BUG=skia:
R=bsalomon@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/
152903005
git-svn-id: http://skia.googlecode.com/svn/trunk@13284
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 18:09:32 +0000 (18:09 +0000)]
clean up a couple of parameters in the tracing interface
BUG=skia:
R=bsalomon@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/
145973011
git-svn-id: http://skia.googlecode.com/svn/trunk@13283
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 18:08:33 +0000 (18:08 +0000)]
Initial QuadTree implementation
In an effort to find a faster bounding box hierarchy than the R-Tree, a QuadTree has been implemented here.
For now, the QuadTree construction is generally faster than the R-Tree and the queries are a bit slower, so overall, SKP local tests showed QuadTree performance similar to the R-Tree performance.
Tests and bench are included in this cl.
At this point, I'd like to be able to commit this in order to more easily use the bots to test multiple configurations and a larger number of SKPs. The R-Tree BBH is still used by default so this change shouldn't affect chromium.
BUG=skia:
R=junov@chromium.org, junov@google.com, senorblanco@google.com, senorblanco@chromium.org, reed@google.com, sugoi@google.com, fmalita@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/
131343011
git-svn-id: http://skia.googlecode.com/svn/trunk@13282
2bbb7eff-a529-9590-31e7-
b0007b416f81
fmalita@google.com [Mon, 3 Feb 2014 17:58:31 +0000 (17:58 +0000)]
Rebaseline imagefiltersgraph_gpu (Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release)
BUG=skia:2118
TBR=senorblanco@chromium.org
Review URL: https://codereview.chromium.org/
148283012
git-svn-id: http://skia.googlecode.com/svn/trunk@13281
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 15:11:48 +0000 (15:11 +0000)]
hopefully last set of rebaselines for blurrect
BUG=skia:2108
R=epoger@google.com
TBR=epoger
Author: humper@google.com
Review URL: https://codereview.chromium.org/
152803002
git-svn-id: http://skia.googlecode.com/svn/trunk@13280
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 14:48:17 +0000 (14:48 +0000)]
Allow GMs to be used as benchmarks. Make convex_poly_clip opt in.
R=reed@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
151843002
git-svn-id: http://skia.googlecode.com/svn/trunk@13279
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 14:29:55 +0000 (14:29 +0000)]
Whitespace change to test the new PRESUBMIT authors check
BUG=skia:2072
NOTRY=true
TBR=
(SkipBuildbotRuns)
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
139993010
git-svn-id: http://skia.googlecode.com/svn/trunk@13278
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 3 Feb 2014 14:18:32 +0000 (14:18 +0000)]
Check if the issue owner is in the AUTHORS file in PRESUBMIT.py
BUG=skia:2072
NOTRY=true
(SkipBuildbotRuns)
R=borenet@google.com, hcm@google.com
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
131293005
git-svn-id: http://skia.googlecode.com/svn/trunk@13277
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Sat, 1 Feb 2014 15:45:23 +0000 (15:45 +0000)]
Fix valgrind issue in SkBase64Test.cpp
https://codereview.chromium.org/
152153002/
git-svn-id: http://skia.googlecode.com/svn/trunk@13276
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Sat, 1 Feb 2014 15:44:30 +0000 (15:44 +0000)]
Performance trigger rebaselines
https://codereview.chromium.org/
151833004/
git-svn-id: http://skia.googlecode.com/svn/trunk@13275
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Sat, 1 Feb 2014 03:01:57 +0000 (03:01 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13274
2bbb7eff-a529-9590-31e7-
b0007b416f81
tfarina@chromium.org [Fri, 31 Jan 2014 21:48:52 +0000 (21:48 +0000)]
Split GrUnitTests.cpp into two separate unit tests.
GrUnitTests is too generic. Instead we split this file between the two
APIs being tested there, GrTBSearch and GrBinHashKey.
BUG=None
TEST=tests -m GrTBSearchTest && tests -m GrBinHashKeyTest
R=brian@thesalomons.net, robertphillips@google.com
Review URL: https://codereview.chromium.org/
150943002
git-svn-id: http://skia.googlecode.com/svn/trunk@13273
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 31 Jan 2014 19:42:58 +0000 (19:42 +0000)]
add SkCanvas constructor that explicitly creates no_config with dimensions
BUG=skia:
R=scroggo@google.com, halcanary@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/
137833016
git-svn-id: http://skia.googlecode.com/svn/trunk@13272
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 31 Jan 2014 19:12:43 +0000 (19:12 +0000)]
Adding Chromium authors to the AUTHORS file.
Some Googlers commit code into Skia using their chromium.org accounts.
The Chromium AUTHORS file has a similar entry:
http://src.chromium.org/viewvc/chrome/trunk/src/AUTHORS
(SkipBuildbotRuns)
NOTRY=true
BUG=skia:2072
R=hcm@google.com
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
146853004
git-svn-id: http://skia.googlecode.com/svn/trunk@13271
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 31 Jan 2014 17:33:04 +0000 (17:33 +0000)]
Do not enforce the public API presubmit check for Revert CLs.
NOTRY=true
BUG=skia:2068
R=borenet@google.com
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
151573002
git-svn-id: http://skia.googlecode.com/svn/trunk@13270
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 31 Jan 2014 17:32:03 +0000 (17:32 +0000)]
fix leaks in SkConf
These leaks were small and would only happen with non-default
runtime configuration things set, but they were still leaks
and they should be squished.
Valgrind reported leaks pre-patch, and all the rtconf leaks are gone after patch.
BUG=skia:1722
R=reed@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/
136963004
git-svn-id: http://skia.googlecode.com/svn/trunk@13269
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 31 Jan 2014 17:05:33 +0000 (17:05 +0000)]
rebaselines for https://skia.googlesource.com/skia.git/+/
0b9ada1318acf7d5fe90c57331c2a4548aad8b98
BUG=skia:2113
NOTREECHECKS=True
NOTRY=True
R=epoger@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/
151623002
git-svn-id: http://skia.googlecode.com/svn/trunk@13268
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 31 Jan 2014 16:52:15 +0000 (16:52 +0000)]
remaining rebaselines for rects GM test
BUG=skia:2108
NOTREECHECKS=True
NOTRY=True
R=humper@google.com
TBR=humper
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
148483005
git-svn-id: http://skia.googlecode.com/svn/trunk@13267
2bbb7eff-a529-9590-31e7-
b0007b416f81