commit-bot@chromium.org
d09461fe0e
Undo troublesome SSE 4.1 change for now to unblock Skia -> Chrome roll.
...
BUG=chromium:374796
NOTREECHECKS=true
R=fmalita@chromium.org , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/292563005
git-svn-id: http://skia.googlecode.com/svn/trunk@14816 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 23:07:26 +00:00
commit-bot@chromium.org
bbdfe29a17
Rebaseline Alex/Debug for FP math with SSE.
...
BUG=skia:
NOTREECHECKS=true
R=mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/297703003
git-svn-id: http://skia.googlecode.com/svn/trunk@14815 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 22:31:46 +00:00
commit-bot@chromium.org
a3e7c18027
Rebaseline Alex/Release for FP math with SSE.
...
BUG=skia:
NOTREECHECKS=true
R=mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/298793002
git-svn-id: http://skia.googlecode.com/svn/trunk@14814 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 20:48:23 +00:00
commit-bot@chromium.org
7bdd6b5118
Rebase 32-bit Linux GMs now that they use SSE for FP math.
...
BUG=skia:
NOTREECHECKS=true
R=mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/297683006
git-svn-id: http://skia.googlecode.com/svn/trunk@14813 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 20:29:04 +00:00
commit-bot@chromium.org
815d3600e9
Remove -mfpmath=sse for clang, which does it automatically and sometimes is annoyed by it.
...
BUG=skia:
NOTREECHECKS=true
R=mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/296793003
git-svn-id: http://skia.googlecode.com/svn/trunk@14812 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 19:42:03 +00:00
commit-bot@chromium.org
6a106ce251
SSE2 everywhere.
...
As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
requires SSSE3 on Macs). Android already requires SSE2 for x86 chips.
This effectively just forces it on for 32-bit Linux builds; everyone else already had it.
BUG=skia:
Committed: http://code.google.com/p/skia/source/detail?r=14800
R=reed@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/294963002
git-svn-id: http://skia.googlecode.com/svn/trunk@14811 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 19:02:55 +00:00
bsalomon@google.com
fc9eef4b43
rebaseline pictureshader GM on GPU
...
Review URL: https://codereview.chromium.org/294103003
git-svn-id: http://skia.googlecode.com/svn/trunk@14810 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 18:57:34 +00:00
commit-bot@chromium.org
9927bd355f
Centralize decision about whether to do bicubic filtering, and fallbacks to mip, bilerp, or nearest
...
R=robertphillips@google.com , humper@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/282293004
git-svn-id: http://skia.googlecode.com/svn/trunk@14809 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 17:51:13 +00:00
commit-bot@chromium.org
97133ade53
Changed JSON formatting more, workaround bug where SkStringPrintf causes encoding issues
...
BUG=skia:
R=bensong@google.com , jcgregorio@google.com , reed@google.com , bsalomon@google.com
Author: kelvinly@google.com
Review URL: https://codereview.chromium.org/294093002
git-svn-id: http://skia.googlecode.com/svn/trunk@14808 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 17:35:10 +00:00
commit-bot@chromium.org
7ed173b1eb
formalize named picture versions
...
BUG=skia:
R=mtklein@google.com , robertphillips@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/291913004
git-svn-id: http://skia.googlecode.com/svn/trunk@14807 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 17:31:08 +00:00
commit-bot@chromium.org
731b28daaa
Revert ""Revert of eliminate config param -- it was always self's config ( https://codereview.chromium.org/246513002/ )"""
...
This reverts commit 3dbceb4f8283b2fb1728d0daf010d036099a2eae.
BUG=skia:
R=bsalomon@google.com , robertphillips@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/291163005
git-svn-id: http://skia.googlecode.com/svn/trunk@14806 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 17:08:12 +00:00
commit-bot@chromium.org
93d5355447
Rebaseline poppler (for me) and pictureshader/bleed on GPU (for Brian).
...
BUG=skia:
R=mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/284313009
git-svn-id: http://skia.googlecode.com/svn/trunk@14805 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 17:05:45 +00:00
commit-bot@chromium.org
311a3cda94
Add function to get both min and max scale factors from matrix
...
R=reed@google.com , jvanverth@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/298473002
git-svn-id: http://skia.googlecode.com/svn/trunk@14804 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 17:02:03 +00:00
commit-bot@chromium.org
6379129229
Revert of SSE2 everywhere. ( https://codereview.chromium.org/294963002/ )
...
Reason for revert:
Making GM run fewer tests than expected?
Original issue's description:
> SSE2 everywhere.
>
> As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
> requires SSSE3 on Macs). Android already requires SSE2 for x86 chips.
>
> This effectively just forces it on for 32-bit Linux builds; everyone else already had it.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14800
R=reed@google.com , mtklein@chromium.org
TBR=mtklein@chromium.org , reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/282093015
git-svn-id: http://skia.googlecode.com/svn/trunk@14803 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 15:27:35 +00:00
commit-bot@chromium.org
3056bdd236
Since we're only using it on Linux now, just require poppler as a system dependency.
...
The Ubuntu package needed is libpoppler-cpp-dev.
iconv and fontconfig were only used as Poppler dependencies. bson_c is also unused.
BUG=skia:
R=reed@google.com , rmistry@google.com , borenet@google.com , halcanary@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/294683003
git-svn-id: http://skia.googlecode.com/svn/trunk@14802 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 15:07:53 +00:00
commit-bot@chromium.org
9e967ad6e5
Preserve GrContext's matrix when calling SkShader::asNewEffect.
...
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/298713002
git-svn-id: http://skia.googlecode.com/svn/trunk@14801 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 15:06:29 +00:00
commit-bot@chromium.org
28f070d2a4
SSE2 everywhere.
...
As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
requires SSSE3 on Macs). Android already requires SSE2 for x86 chips.
This effectively just forces it on for 32-bit Linux builds; everyone else already had it.
BUG=skia:
R=reed@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/294963002
git-svn-id: http://skia.googlecode.com/svn/trunk@14800 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 14:54:09 +00:00
commit-bot@chromium.org
c4e416ce49
Add Memcpy32 bench.
...
This compares 32-bit copies using memcpy, autovectorization, and when SSE2 is
available, aligned and unaligned SSE2.
Running this on my desktop (Intel(R) Xeon(R) CPU E5-2690 0 @ 2.90GHz), I see
all four perform essentially the same, except Clang's autovectorization looks
a little better than GCC's. memcpy is calling libc 2.19's __memcpy_sse2_unaligned.
BUG=skia:
R=reed@google.com , qiankun.miao@intel.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/290533002
git-svn-id: http://skia.googlecode.com/svn/trunk@14799 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 14:54:04 +00:00
commit-bot@chromium.org
1878651990
Rename SkMatrix::get(Max|Min)Stretch to get(Min|Max)Scale
...
R=reed@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/295713002
git-svn-id: http://skia.googlecode.com/svn/trunk@14798 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 14:53:45 +00:00
commit-bot@chromium.org
941ff78d79
Remove legacy constructor for blur draw looper.
...
Now that Android no longer uses the constructor, remove it, along
with the flag.
R=djsollen@google.com , reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/299683002
git-svn-id: http://skia.googlecode.com/svn/trunk@14797 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 14:53:32 +00:00
commit-bot@chromium.org
4297430b93
Rebaselines for gpu dashing
...
NOTREECHECKS=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/291893004
git-svn-id: http://skia.googlecode.com/svn/trunk@14796 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 13:43:34 +00:00
reed@google.com
555e74f6fb
"Revert of eliminate config param -- it was always self's config ( https://codereview.chromium.org/246513002/ )""
...
This reverts commit 65b9f33cab9f53821720f982667412e56a340093.
git-svn-id: http://skia.googlecode.com/svn/trunk@14795 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 12:39:37 +00:00
commit-bot@chromium.org
61830df198
bench rebase after 3b9e8be
...
R=robertphillips@google.com
TBR=robertphillips@google.com
NOTRY=true
Author: bensong@google.com
Review URL: https://codereview.chromium.org/289283005
git-svn-id: http://skia.googlecode.com/svn/trunk@14794 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 11:58:08 +00:00
skia.committer@gmail.com
3b9e8be760
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@14793 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 03:05:34 +00:00
commit-bot@chromium.org
dc20432ce0
Add missing include in SkBlurImage optimization
...
Adds the missing include for smmintrin.h in the
SkBlurImage_opts_SSE2.cpp file.
Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
BUG=chromium:374796
TEST=Unknown
R=tomhudson@chromium.org , vapier@chromium.org , reed@chromium.org , bsalomon@chromium.org , dgreid@chromium.org , dgarrett@chromium.org , michaelpg@chromium.org , vandebo@chromium.org
Author: henrik.smiding@intel.com
Review URL: https://codereview.chromium.org/290923002
git-svn-id: http://skia.googlecode.com/svn/trunk@14792 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 23:07:56 +00:00
commit-bot@chromium.org
7126fef7b6
Update valgrind suppression file
...
BUG=skia:
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/292453010
git-svn-id: http://skia.googlecode.com/svn/trunk@14791 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 21:06:01 +00:00
commit-bot@chromium.org
3595f88aff
Pass in GrContext instead of SkGpuDevice for dashing and Sk2GrPaint conversion
...
BUG=skia:
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/292773002
git-svn-id: http://skia.googlecode.com/svn/trunk@14790 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 19:35:57 +00:00
commit-bot@chromium.org
584f337832
fix utf32 text in subpixel mode
...
BUG=skia:2568
R=scroggo@google.com , anders@kilohearts.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/290893003
git-svn-id: http://skia.googlecode.com/svn/trunk@14789 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 19:04:02 +00:00
commit-bot@chromium.org
7ba1702bbb
fix off-by-one error in texture coordinate calculations for rrect gpu
...
blur; output now matches CPU
BUG=
R=bsalomon@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/292773003
git-svn-id: http://skia.googlecode.com/svn/trunk@14788 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 18:51:05 +00:00
commit-bot@chromium.org
8d093d5059
bench rebase after 71db882
...
R=robertphillips@google.com , fmalita@google.com
TBR=robertphillips@google.com
NOTRY=true
Author: fmalita@chromium.org
Review URL: https://codereview.chromium.org/299453002
git-svn-id: http://skia.googlecode.com/svn/trunk@14787 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 18:19:21 +00:00
commit-bot@chromium.org
a4c367737b
Add gzip encoding responses.
...
BUG=skia:
R=mtklein@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/298433002
git-svn-id: http://skia.googlecode.com/svn/trunk@14786 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 17:38:52 +00:00
commit-bot@chromium.org
a369e36e9d
Revert "Revert of eliminate config param -- it was always self's config ( https://codereview.chromium.org/246513002/ )"
...
TBR=bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/290883005
git-svn-id: http://skia.googlecode.com/svn/trunk@14785 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 17:29:16 +00:00
commit-bot@chromium.org
71e55762e6
Changed JSON formatting to fit BigQuery requirements
...
BUG=skia:
R=bensong@google.com , jcgregorio@google.com
Author: kelvinly@google.com
Review URL: https://codereview.chromium.org/290903002
git-svn-id: http://skia.googlecode.com/svn/trunk@14784 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 17:29:01 +00:00
commit-bot@chromium.org
015c08e5ca
Move zooming into its own component, imported via HTML Imports.
...
Also, start building our own polyfill library (polyfill.js) using Grunt and Bower.
Finally, refactor all the web pages so that the common header and footer material comes from templates.
BUG=skia:
R=mtklein@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/292433002
git-svn-id: http://skia.googlecode.com/svn/trunk@14783 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 16:40:08 +00:00
commit-bot@chromium.org
99bd7d8174
Try out SkMatrix::Concat.
...
This should RVO to the same as doing it on the stack with setConcat.
BUG=skia:
R=reed@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/293693002
git-svn-id: http://skia.googlecode.com/svn/trunk@14782 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 15:51:12 +00:00
commit-bot@chromium.org
7b1715215a
gradient api sans (deprecated) unitmapper
...
BUG=skia:
R=robertphillips@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/293643004
git-svn-id: http://skia.googlecode.com/svn/trunk@14781 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 15:46:09 +00:00
commit-bot@chromium.org
da797e1c1f
bench rebase after 8216506
...
R=robertphillips@google.com , fmalita@google.com
TBR=robertphillips@google.com
NOTRY=true
Author: fmalita@chromium.org
Review URL: https://codereview.chromium.org/289413003
git-svn-id: http://skia.googlecode.com/svn/trunk@14780 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 15:44:50 +00:00
commit-bot@chromium.org
abeb9589ec
make render_pictures properly handle empty expectations file
...
note that this changes the parameters taken by ImageResultsAndExpectations::Parse()
BUG=skia:1942
R=scroggo@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/289063010
git-svn-id: http://skia.googlecode.com/svn/trunk@14779 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 15:25:10 +00:00
commit-bot@chromium.org
0a98d87044
Don't clobber initial transform with SetMatrix.
...
BUG=skia:2378
R=reed@google.com , mtklein@google.com , robertphillips@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/290883004
git-svn-id: http://skia.googlecode.com/svn/trunk@14778 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 15:15:24 +00:00
commit-bot@chromium.org
71db88225d
Real fix for Widnows build errors for GrDashingEffect
...
NOTREECHECKS=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/291903002
git-svn-id: http://skia.googlecode.com/svn/trunk@14777 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 14:59:04 +00:00
commit-bot@chromium.org
ad88340cf1
Fix build error for windows for Dashing CL
...
NOTREECHECKS=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/291803004
git-svn-id: http://skia.googlecode.com/svn/trunk@14776 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 14:43:45 +00:00
commit-bot@chromium.org
628ed0b220
Add Dashing gpu effect for simple dashed lines
...
BUG=skia:
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/274673004
git-svn-id: http://skia.googlecode.com/svn/trunk@14775 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 14:32:49 +00:00
commit-bot@chromium.org
2a67e123a3
This adds a checkbox to the debugger to allow seeing the effect pathops has on the clip. A new tab shows the C code that the pathops generate.
...
Once in place, this CL found a bug in the pathops code where it was not handling empty clip stack elements correctly. The Cl also has the change to SkCanvas to fix this bug.
R=robertphillips@google.com , reed@google.com
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/282283002
git-svn-id: http://skia.googlecode.com/svn/trunk@14774 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 13:53:10 +00:00
commit-bot@chromium.org
2ee3c2ce64
Add choke point for performing a fake endRecording
...
My goal here was to add a single location where we could patch up the created PicturePlayback. Unfortunately, the complexity of the recording process (e.g., the BBH) makes this quite complex.
I will investigate altering the behavior of SkPicturePlayback to account for a potentially unbalanced set of saves/saveLayers.
R=reed@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/283333007
git-svn-id: http://skia.googlecode.com/svn/trunk@14773 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 12:36:15 +00:00
commit-bot@chromium.org
821650655b
Ensure playing back a picture always balances saves and restores
...
This "fixes" the legacy interface's possible creation of pictures with unbalanced save/restores.
The Android dox will need to be updated once/if this lands.
R=reed@google.com , scroggo@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/286033005
git-svn-id: http://skia.googlecode.com/svn/trunk@14772 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-19 12:26:58 +00:00
commit-bot@chromium.org
114487ceb4
Fix generation tests.
...
R=epoger@google.com
TBR=epoger
NOTRY=true
BUG=skia:2565
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/284313007
git-svn-id: http://skia.googlecode.com/svn/trunk@14771 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 19:48:57 +00:00
commit-bot@chromium.org
90a17674f1
make buildbot_globals.py read global_variables.json file from googlesource
...
BUG=skia:2564
NOTRY=True
R=borenet@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/291563008
git-svn-id: http://skia.googlecode.com/svn/trunk@14770 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 19:19:31 +00:00
commit-bot@chromium.org
a267d41f27
Fix windows build.
...
Windows won't let me insert #ifdefs inside macro expansion.
R=borenet@google.com
TBR=borenet
NOTRY=true
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/289853003
git-svn-id: http://skia.googlecode.com/svn/trunk@14769 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 18:27:11 +00:00
commit-bot@chromium.org
120c99993e
Generate Android.mk for DM.
...
ifdef out code that won't build where we don't have jsoncpp.
Include ctype instead of string.h for tolower.
Depends on https://codereview.chromium.org/282053002/
BUG=skia:2447
R=mtklein@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/290603002
git-svn-id: http://skia.googlecode.com/svn/trunk@14768 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 18:11:51 +00:00
commit-bot@chromium.org
25c1066e4d
Generate gm/Android.mk, minus JSON.
...
When running gyp_to_android.py, generate the makefile for gm.
For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.
gm/gm_expectations.cpp:
gm/gm_expectations.h:
gm/gmmain.cpp:
Remove all json functionality when SK_BUILD_JSON_WRITER is not defined.
This flag is not defined when SK_BUILD_FOR_ANDROID is defined.
gyp/gm.gyp:
Depend on skia and cutils.
platform_tools/android/bin/gyp_to_android.py:
Generate gm/Android.mk.
platform_tools/android/gyp_gen/makefile_writer.py:
Build gm/Android.mk when building external/skia.
Depends on https://codereview.chromium.org/282053002/
BUG=skia:2447
BUG=skia:2448
R=epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/281303003
git-svn-id: http://skia.googlecode.com/svn/trunk@14767 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 17:56:43 +00:00