Commit Graph

11533 Commits

Author SHA1 Message Date
commit-bot@chromium.org
3b0bcb874e clean up gitignore; sort, add chromeos/externals, remove trailing /.
R=mtklein@google.com, epoger@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14249 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 22:56:46 +00:00
commit-bot@chromium.org
0b17feaa64 Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/)
Reason for revert:
http://skbug.com/2437

Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243

R=bsalomon@chromium.org, geofflang@chromium.org
TBR=bsalomon@chromium.org, geofflang@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:2272

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14248 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 21:31:32 +00:00
commit-bot@chromium.org
53783b026a Revert of Extract most of the mutable state of SkShader into a separate Context object. (https://codereview.chromium.org/207683004/)
Reason for revert:
Causing memory leaks in Chromium.

Original issue's description:
> Extract most of the mutable state of SkShader into a separate Context object.
>
> SkShader currently stores some state during draw calls via setContext(...).
> Move that mutable state into a separate SkShader::Context class that is
> constructed on demand for the duration of the draw.
>
> Calls to setContext() are replaced with createContext() which returns a context
> corresponding to the shader object or NULL if the parameters to createContext
> are invalid.
>
> TEST=out/Debug/dm
> BUG=skia:1976
>
> Committed: http://code.google.com/p/skia/source/detail?r=14216

R=scroggo@google.com, skyostil@chromium.org, tomhudson@chromium.org, senorblanco@chromium.org, reed@google.com, dominikg@chromium.org
TBR=dominikg@chromium.org, reed@google.com, scroggo@google.com, senorblanco@chromium.org, skyostil@chromium.org, tomhudson@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:1976

Author: bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14247 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 21:09:49 +00:00
bungeman@google.com
ec2d8b37b0 Revert r14218.
git-svn-id: http://skia.googlecode.com/svn/trunk@14246 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 21:09:00 +00:00
commit-bot@chromium.org
68ea91a493 Revert of Fix memory leak in SkGradientShader. (https://codereview.chromium.org/240303003/)
Reason for revert:
This and https://codereview.chromium.org/207683004 are causing memory leaks.

Original issue's description:
> Fix memory leak in SkGradientShader.
>
> Make sure pointer to gradient shader cache is unreffed in SkGradientShaderBase::getGradientTableBitmap.
> Rename methods returning a "pre-reffed" object to indicate obligations.
>
> BUG=skia:1976
>
> Committed: http://code.google.com/p/skia/source/detail?r=14223

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

Author: bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14245 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 21:02:29 +00:00
commit-bot@chromium.org
d202528f48 SkiaSampleRenderer - handle case where compiler won't cast jint to void*.
R=djsollen@google.com, scroggo@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14244 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 19:41:06 +00:00
commit-bot@chromium.org
cd66af0ae0 Roll ANGLE.
BUG=skia:2272
R=bsalomon@chromium.org, bsalomon@google.com

Author: geofflang@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14243 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 18:29:06 +00:00
commit-bot@chromium.org
e9e62d5fe4 Ashmem functions compile when size_t != __u32
R=djsollen@google.com, scroggo@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14242 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 17:28:20 +00:00
commit-bot@chromium.org
84f7a06ff9 add some asserts for mipmaps, and cleanup fFilterLevel if mipping failed
BUG=skia:
R=scroggo@google.com, humper@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14241 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 16:46:07 +00:00
reed@google.com
273a00d14f fix expected size in 32bit builds
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14240 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 16:14:26 +00:00
commit-bot@chromium.org
bf6f6ae2e2 allow gyp_skia to be run from any directory.
R=epoger@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14239 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 16:11:58 +00:00
commit-bot@chromium.org
cc277b729b Orphan ProcXfermode, with an eye towards removing it
BUG=skia:
R=scroggo@google.com, mtklein@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14238 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 15:19:32 +00:00
commit-bot@chromium.org
efaf53ba24 remove unused tests to fix new clang build
R=mtklein@google.com

Author: caryclark@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14237 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 15:18:21 +00:00
commit-bot@chromium.org
7518ff2d7e Revert of Add flipped gradient branch to two point conical gradient (https://codereview.chromium.org/227623004/)
Reason for revert:
Breaking all CompareGMs

Original issue's description:
> Add flipped gradient branch to two point conical gradient
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14235

R=bsalomon@google.com, mtklein@google.com
TBR=bsalomon@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14236 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 13:57:31 +00:00
commit-bot@chromium.org
cf41935735 Add flipped gradient branch to two point conical gradient
BUG=skia:
R=bsalomon@google.com, mtklein@google.com

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14235 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 13:28:06 +00:00
skia.committer@gmail.com
667b98d947 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14234 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 03:05:10 +00:00
commit-bot@chromium.org
03f2f81054 More flags needed to build Android framework.
R=djsollen@google.com
TBR=djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14233 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 23:06:29 +00:00
commit-bot@chromium.org
6493ae24ce Don't unset gFCSafeToUse when it's still safe to use.
BUG=skia:
R=bungeman@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14232 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 22:10:52 +00:00
commit-bot@chromium.org
0d317d303a install_dependencides tool for posix-type systems
R=mtklein@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14231 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 22:10:48 +00:00
commit-bot@chromium.org
04f6c4c657 Support picture recording in Android framework.
Fixes master-skia build.

R=djsollen@google.com
TBR=djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14230 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 22:08:32 +00:00
commit-bot@chromium.org
45d86e7072 always store bitfields along with dirty in FlatteningTraits
This allows us to simplify lots of setters in SkPaint, which in the non-android case, could now be just assignments (and therefore inlineable).

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

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14229 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 20:48:10 +00:00
commit-bot@chromium.org
fa443be95b Roll ANGLE.
Contains small changes to ANGLE to pass skia tests.

BUG=skia:2272
R=bsalomon@google.com

Author: geofflang@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14228 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 20:31:54 +00:00
commit-bot@chromium.org
71e800a6f8 This is an short replacement for gclient.
Makes use of our current DEPS file to allow for a smooth transition.

BUG=skia:291
NOTRY=true
R=borenet@google.com, tfarina@chromium.org, epoger@google.com, mtklein@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14227 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 19:21:00 +00:00
robertphillips@google.com
8121c6cb70 Reverting r14225 (Fix SK_SUPPORT_DEPRECATED_RECORD_FLAGS handling - https://codereview.chromium.org/237673017/) due to compiler complaints
git-svn-id: http://skia.googlecode.com/svn/trunk@14226 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 17:10:12 +00:00
robertphillips@google.com
a387db2905 Fix SK_SUPPORT_DEPRECATED_RECORD_FLAGS handling
https://codereview.chromium.org/237673017/



git-svn-id: http://skia.googlecode.com/svn/trunk@14225 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 17:00:05 +00:00
commit-bot@chromium.org
39426e2bcc read/write function_ptrs as just void*, and not as 'array of bytes'
BUG=skia:
R=mtklein@google.com, bungeman@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14224 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 16:24:08 +00:00
commit-bot@chromium.org
9631337be0 Fix memory leak in SkGradientShader.
Make sure pointer to gradient shader cache is unreffed in SkGradientShaderBase::getGradientTableBitmap.
Rename methods returning a "pre-reffed" object to indicate obligations.

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

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14223 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 16:17:39 +00:00
commit-bot@chromium.org
6c508885b6 Double assignment in GrGpuGL::configToGLFormats()
Remove the first one.

R=hcm@google.com, bsalomon@google.com
BUG=skia:2427

Author: siglesias@igalia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14222 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 16:07:37 +00:00
commit-bot@chromium.org
d393b17cf3 Retract SkPicture::kOptimizeForClippedPlayback_RecordingFlag from public API
This CL sets the stage for retracting the SkPicture::kOptimizeForClippedPlayback_RecordingFlag flag
from the public API (more work needs to be done in Blink & Chrome). In the new world the only way
to set this flag (and thus instantiate an SkPicture-derived
class) is by passing a factory to the SkPictureRecorder class. This is to get all clients always using
factories so that we can then change the factory call used (i.e., so the factory just creates a BBH) and
do away with the SkPicture-derived classes.

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

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14221 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 16:02:10 +00:00
commit-bot@chromium.org
4453e8b45a glDiscardFramebuffer() in GrGpuGL::discard uses invalid GLenum
According to the spec:

  "If a framebuffer object is bound to <target>, then <attachments> may
  contain COLOR_ATTACHMENT0, DEPTH_ATTACHMENT, and/or
  STENCIL_ATTACHMENT.  If the framebuffer object is not complete,
  DiscardFramebufferEXT may be ignored.

  If the default framebuffer is bound to <target>,
  then <attachment> may contain COLOR, identifying the color buffer;
  DEPTH, identifying the depth buffer; or STENCIL, identifying the
  stencil buffer."

Do the same as in glInvalidateFramebuffer() case.

Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>

R=bsalomon@google.com
BUG=skia:2411

Author: siglesias@igalia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14220 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 14:33:27 +00:00
bsalomon@google.com
ab16445ae8 Update baselines for bug 2404.
BUG=skia:2404

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14219 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 13:48:52 +00:00
reed@google.com
0fcd6ca4e0 fix #if SK_DEBUG -- should be #ifdef SK_DEBUG
git-svn-id: http://skia.googlecode.com/svn/trunk@14218 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 13:44:43 +00:00
commit-bot@chromium.org
85faf50875 remove legacy filter-flags, and store FilterLevel directly
BUG=skia:
R=robertphillips@google.com, humper@google.com, jvanverth@google.com, mtklein@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14217 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 12:58:02 +00:00
commit-bot@chromium.org
001f4ed2fb Extract most of the mutable state of SkShader into a separate Context object.
SkShader currently stores some state during draw calls via setContext(...).
Move that mutable state into a separate SkShader::Context class that is
constructed on demand for the duration of the draw.

Calls to setContext() are replaced with createContext() which returns a context
corresponding to the shader object or NULL if the parameters to createContext
are invalid.

TEST=out/Debug/dm
BUG=skia:1976
R=scroggo@google.com, skyostil@chromium.org, tomhudson@chromium.org, senorblanco@chromium.org, reed@google.com, bungeman@google.com

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14216 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 10:16:39 +00:00
skia.committer@gmail.com
d1061e254a Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14215 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 03:04:01 +00:00
commit-bot@chromium.org
0dd01ee5b5 Fix bug in SampleApp's Tiling View
SampleApp was crashing when invoked as "SampleApp --slide Tiling" due to r14171 (split SkPictureRecorder out of SkPicture - https://codereview.chromium.org/214953003/)

R=bungeman@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14214 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 23:00:57 +00:00
bungeman@google.com
7dd79b7711 Rebaselines for r14201. (Fix size of rotated text with FreeType.)
git-svn-id: http://skia.googlecode.com/svn/trunk@14213 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 21:43:57 +00:00
commit-bot@chromium.org
ec1ff6aa5e Fix generation of Android SampleApp APK now that we default to using gyp's ninja generator.
R=scroggo@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14212 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 21:37:12 +00:00
commit-bot@chromium.org
0b352ed264 Pull ANGLE's new repository to third_party/external/angle2.
BUG=skia:2272
R=bsalomon@chromium.org, bsalomon@google.com

Author: geofflang@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14211 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 21:11:09 +00:00
commit-bot@chromium.org
86cbfbeee6 arm64_download script - fix error starting vm twice.
R=epoger@google.com
TBR=epoger@google.com
NOTRY=true

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14210 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 20:29:38 +00:00
commit-bot@chromium.org
87126fb154 arm64_download script waits for VM to boot before finishing.
It may take an unknown amount of time to boot.

Also, add `set -e` to the script to simplify error handling.

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

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14209 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 20:05:24 +00:00
bungeman@google.com
089846251b Rebaselines for r14201. (Fix size of rotated text with FreeType.)
git-svn-id: http://skia.googlecode.com/svn/trunk@14208 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 19:39:52 +00:00
commit-bot@chromium.org
c9b511f0e6 Revert of rebaseline_server: multithreaded loading/diffing of images (https://codereview.chromium.org/235923002/)
Reason for revert:
Caused https://code.google.com/p/skia/issues/detail?id=2423 ('"Deadline exceeded" error when connecting to live rebaseline_server').  Reverting until I can figure it out.

Original issue's description:
> rebaseline_server: multithreaded loading/diffing of images
>
> BUG=skia:2414
> NOTRY=True
>
> Committed: http://code.google.com/p/skia/source/detail?r=14184

R=rmistry@google.com
TBR=rmistry@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2414

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14207 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 18:50:12 +00:00
bungeman@google.com
5dfffaaceb Rebaselines for r14201. (Fix size of rotated text with FreeType.)
git-svn-id: http://skia.googlecode.com/svn/trunk@14206 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 18:35:49 +00:00
bungeman@google.com
9b31c5edd9 Rebaselines for r14201. (Fix size of rotated text with FreeType.)
git-svn-id: http://skia.googlecode.com/svn/trunk@14205 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 18:24:58 +00:00
commit-bot@chromium.org
12a0412a5d initialize bounds in this test
BUG=skia:
R=bungeman@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14204 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 18:00:57 +00:00
commit-bot@chromium.org
64b08a1026 Fix artifacts in distance field rendering due to bilerp
Because we were using the full distance field glyph rect, there were cases
when a neighboring texel might be set to full value (e.g. we might copy the
glyph over old data after a purge). This was giving artifacts, and insetting
the rect by 1 solves the problem. In doing this, I discovered that removing the
extra 1 texel pad around the glyph meant to handle bilerp, and insetting by 2,
works just as well and saves space in the glyph atlas.

R=bsalomon@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14203 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 17:53:21 +00:00
bungeman@google.com
51b0d0bc5c Add cast for warning as error on Windows from r14201.
git-svn-id: http://skia.googlecode.com/svn/trunk@14202 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 16:08:29 +00:00
bungeman@google.com
d3fbd34099 Fix size of rotated text with FreeType.
This generalizes and shares the solution found for a similar issue with
GDI. The issue is that the text size is applied early, and the rest of
the transformation late. This allows us to isolate and independently
control the text size from the rest of the transformation.

R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14201 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 15:52:07 +00:00
commit-bot@chromium.org
73cb15351f Make sure SkDrawLooper objects can only be allocated on the heap.
Make constructors of SkLayerDrawLooper and SkBlurDrawLooper non-public.
Remove addLayer* methods from SkLayerDrawLooper. SkLayerDrawLooper::Builder is
used to create new objects.
Provide factory method for creating SkBlurDrawLooper.

BUG=2141
R=scroggo@google.com, reed@google.com, djsollen@google.com

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14200 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 15:48:36 +00:00