reed@google.com
f3abaeb0c5
remove (now unused) Sk64 -- just use int64_t
...
BUG=
Review URL: https://codereview.chromium.org/134373006
git-svn-id: http://skia.googlecode.com/svn/trunk@13032 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 22:05:41 +00:00
commit-bot@chromium.org
cd11018625
Just use one version of the scripts in both the browser and in SkV8 by using feature detection to determine if we are running in a browser, and if the platform supports the Path() object. Also add oval, console.log, and the snow example code.
...
BUG=
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/132413002
git-svn-id: http://skia.googlecode.com/svn/trunk@13031 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 21:33:01 +00:00
borenet@google.com
4d5e1366c9
Fixes to roll_deps for the bots
...
The bots are running an older version of git which does not support the
-q/--quiet flag for branch or the --short flag for symbolic-ref.
BUG=
R=halcanary@google.com
Review URL: https://codereview.chromium.org/134723002
git-svn-id: http://skia.googlecode.com/svn/trunk@13030 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 21:02:25 +00:00
bungeman@google.com
698dfa465c
Add a simple test ttc for FontHost test.
...
BUG=skia:1813
git-svn-id: http://skia.googlecode.com/svn/trunk@13029 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 20:56:21 +00:00
commit-bot@chromium.org
6e83423f16
Eliminate useless NULL push by making fIndexedData 0-based.
...
Depends on http://crrev.com/134223002
Testing: out/Debug/dm && out/Debug/tests && echo ok
BUG=skia:1979
R=dominikg@chromium.org , tomhudson@chromium.org , halcanary@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/134283002
git-svn-id: http://skia.googlecode.com/svn/trunk@13028 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 20:13:09 +00:00
bungeman@google.com
2dc54c94f0
Remove printfs from FontHostTest when font is not sfnt.
...
BUG=skia:2009
R=caryclark@google.com
Review URL: https://codereview.chromium.org/134303002
git-svn-id: http://skia.googlecode.com/svn/trunk@13027 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 19:40:56 +00:00
commit-bot@chromium.org
f85251c74d
fNextIndex is redundant. Remove it.
...
This is warmup for removing the NULL at the front.
Testing: out/Debug/tests && out/Debug/dm && echo ok
BUG=skia:1979
R=dominikg@chromium.org , tomhudson@chromium.org , halcanary@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/134223002
git-svn-id: http://skia.googlecode.com/svn/trunk@13026 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 19:37:00 +00:00
commit-bot@chromium.org
1066f08378
If poppler is disable and native pdf is enabled, we still need SkPDFRasterizer.cpp
...
R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/133583004
git-svn-id: http://skia.googlecode.com/svn/trunk@13025 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 19:09:00 +00:00
commit-bot@chromium.org
5c6f1d4424
Revert of https://codereview.chromium.org/112113005/
...
Reason for revert: breaks unit tests
R=mtklein@google.com , bsalomon@google.com , reed@google.com , scroggo@google.com
TBR=bsalomon@google.com , mtklein@google.com , reed@google.com , scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1742
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/134453002
git-svn-id: http://skia.googlecode.com/svn/trunk@13024 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 18:28:23 +00:00
commit-bot@chromium.org
0f7e3470d6
Revert of https://codereview.chromium.org/106563002/
...
Reason for revert: There's a threading issue I don't quite understand yet. Objects are being deleted after we check they're deleted. Will try again.
R=kkinnunen@nvidia.com , kkinnunen@nvidia.com
TBR=kkinnunen@nvidia.com , kkinnunen@nvidia.com
NOTREECHECKS=true
NOTRY=true
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/134363002
git-svn-id: http://skia.googlecode.com/svn/trunk@13023 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 17:58:47 +00:00
commit-bot@chromium.org
f2595e4186
Fix genID cloning bugs.
...
SkBitmap.cpp:
When copyTo calls readPixels, only clone the genID if the resulting
SkPixelRef has the same dimensions as the original. This catches a
bug where copying an SkBitmap representing the subset of an SkPixelRef
(which implements onReadPixels) would result in the copy sharing the
genID. (Thanks to r6710, this case can only happen using setPixelRef,
so the updated GpuBitmapCopyTest checks for that.)
Move some unnecessary NULL checks to asserts.
When copyTo performs a memcpy, only clone the genID if the resulting
SkPixelRef has the same dimensions as the original. This catches a bug
where copying an extracted SkBitmap with the same width as its original
SkPixelRef would incorrectly have the same genID.
Add a comment and assert in deepCopyTo, when cloning the genID, since
that case correctly clones it.
BitmapCopyTest.cpp:
Pull redundant work out of the inner loop (setting up the source bitmaps
and testing extractSubset). Create a new inner loop for extractSubset, to
test copying the result to each different config.
Extract a subset that has the same width as the original, to catch the
bug mentioned above.
Remove the reporter assert which checks for the resulting rowbytes.
Add checks to ensure that copying the extracted subset changes the genID.
GpuBitmapCopyTest:
Create an SkBitmap that shares an existing SkPixelRef, but only represents
a subset. This is to test the first call to cloneGenID in SkBitmap::copyTo.
In this case, the genID should NOT be copied, since only a portion of the
SkPixelRef was copied.
Also test deepCopy on this subset.
TestIndividualCopy now takes a parameter stating whether the genID should
change in the copy. It also does a read back using the appropriate subset.
It no longer differentiates between copyTo and deepCopyTo, since that
distinction was only necessary for copying from/to configs other than 8888
(which are no longer being tested), where copyTo did a read back in 8888 and
then drew the result to the desired config (resulting in an imperfect copy).
BUG=skia:1742
R=mtklein@google.com , bsalomon@google.com , reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/112113005
git-svn-id: http://skia.googlecode.com/svn/trunk@13021 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 17:22:01 +00:00
commit-bot@chromium.org
4a8e17d52d
remove poplar building from mac, until it is fixed
...
BUG=skia:2008
R=mtklein@google.com , vandebo@chromium.org
Author: reed@google.com
Review URL: https://codereview.chromium.org/134243002
git-svn-id: http://skia.googlecode.com/svn/trunk@13020 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 17:21:00 +00:00
commit-bot@chromium.org
2b8aacba52
Delete all invalidated resources with same key
...
Delete all invalidated resources with same key instead of deleting
just the first resource.
R=mtklein@google.com , kkinnunen@nvidia.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/106563002
git-svn-id: http://skia.googlecode.com/svn/trunk@13019 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 16:39:20 +00:00
robertphillips@google.com
7095607705
Suppressing imagefiltersbase_gpu on RHB device
...
https://codereview.chromium.org/134093002/
git-svn-id: http://skia.googlecode.com/svn/trunk@13018 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 15:28:19 +00:00
halcanary@google.com
2d1adf2322
Reduce verbosity of SkGraphics::Init in default case.
...
SkGraphics::Init() now checks to see if there are any non-default
runtime configuration options before announcing that it is about
to print out the non-default runtime configuration options.
This makes the executables in tools/ less verbose.
Add SkRTConfRegistry::countNonDefault() function.
BUG=
R=mtklein@google.com , reed@google.com
Review URL: https://codereview.chromium.org/133583003
git-svn-id: http://skia.googlecode.com/svn/trunk@13017 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 15:00:45 +00:00
halcanary@google.com
a9325fa237
Add REPORTF test macro.
...
This macro replaces:
SkString str;
str.printf("Foo test Expected %d got %d", x, y);
reporter->reportFailed(str);
with the shorter code:
REPORTF(reporter, ("Foo test Expected %d got %d", x, y));
The new form also appends __FILE__:__LINE__ to the message before calling reportFailed().
BUG=
R=mtklein@google.com
Review URL: https://codereview.chromium.org/132843002
git-svn-id: http://skia.googlecode.com/svn/trunk@13016 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 14:58:10 +00:00
halcanary@google.com
9acb8cdf20
SampleApp Cleanup:
...
- Set resoursePath to sensible default.
- Remove verbosity of DitherBitmap.
- SampleEncode no longer tries to mkdir('/encoded'), now stores
encoded data in memory and uses the SkDecodingImageGenerator
to decode.
BUG=
R=reed@google.com
Review URL: https://codereview.chromium.org/132513003
git-svn-id: http://skia.googlecode.com/svn/trunk@13015 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 14:53:49 +00:00
robertphillips@google.com
6791138dc0
Suppress imagefiltersgraph_msaa4 failure on Nexus10
...
https://codereview.chromium.org/133643003/
git-svn-id: http://skia.googlecode.com/svn/trunk@13011 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 13:50:23 +00:00
skia.committer@gmail.com
856673a816
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@13008 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 07:08:11 +00:00
commit-bot@chromium.org
83f56922e2
Fix Mac fontconfig build (try 2)
...
The Mac fontconfig just #defines the cache directory, which works fine if fontconfig never has to look up any fonts (the case until now). If it has to actually find fonts from the disk, the cache directory and config directory need to be properly defined as well as running fc-cache to populate the cache directory.
Populating the cache directory can take some time, but should only happen on a clean build. To remove this extra time, we have to not build poppler on Mac, which can now be accomplished with GYP_DEFINES="skia_mac_poppler=0"
R=epoger@google.com
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/132333002
git-svn-id: http://skia.googlecode.com/svn/trunk@13007 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 22:54:26 +00:00
borenet@google.com
6f0f5b4aad
Remove references to Skia's SVN repository
...
BUG=
R=epoger@google.com
Review URL: https://codereview.chromium.org/132423002
git-svn-id: http://skia.googlecode.com/svn/trunk@13006 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 21:41:39 +00:00
reed@google.com
2e0f1ee593
remove bad gm expected images
...
BUG=skia:1986
R=epoger@google.com
Review URL: https://codereview.chromium.org/132023005
git-svn-id: http://skia.googlecode.com/svn/trunk@13004 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 21:05:59 +00:00
reed@google.com
303c4758ec
use bitmap's fRowBytes, as the pixelref's is not (yet) reliable
...
should fix linux browser_tests for DEPS roll
BUG=
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/132273004
git-svn-id: http://skia.googlecode.com/svn/trunk@13002 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 20:00:14 +00:00
robertphillips@google.com
fe5824af29
Fix for Mac-specific compilation issue in r13000
...
git-svn-id: http://skia.googlecode.com/svn/trunk@13001 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 19:45:29 +00:00
robertphillips@google.com
ed9866cc8a
Expand GatherPixelRefs unit test
...
https://codereview.chromium.org/132293002/
git-svn-id: http://skia.googlecode.com/svn/trunk@13000 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 19:20:45 +00:00
commit-bot@chromium.org
88e1ec84d0
Add 565 to dm defaults.
...
Now that optimizations picture modes pass (are skipped) in 565, add 565 to the default configs DM runs.
BUG=skia:1994
R=bsalomon@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/132133002
git-svn-id: http://skia.googlecode.com/svn/trunk@12999 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 19:14:57 +00:00
bsalomon@google.com
2b199e6d4d
Mark imagefiltersgraph, IntelRhb, msaa4 config as ignore failure due to garbage on bottom line.
...
BUG=skia:2005
Review URL: https://codereview.chromium.org/132303002
git-svn-id: http://skia.googlecode.com/svn/trunk@12998 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 17:59:55 +00:00
commit-bot@chromium.org
32eea431de
Revert of https://codereview.chromium.org/113203003/
...
Reason for revert: Broken under XCode.
R=bungeman@google.com , epoger@google.com
TBR=bungeman@google.com , epoger@google.com
NOTREECHECKS=true
NOTRY=true
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/132093003
git-svn-id: http://skia.googlecode.com/svn/trunk@12997 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 17:52:54 +00:00
commit-bot@chromium.org
2b0f7c321c
Convert Checksum test to DEF_TEST() macro.
...
BUG=None
TEST=tests
R=mtklein@google.com , bungeman@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/126743003
git-svn-id: http://skia.googlecode.com/svn/trunk@12996 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 17:48:48 +00:00
senorblanco@chromium.org
857e320300
Use truncation, not rounding, when converting perlin noise seed (required by SVG spec).
...
BUG=
R=reed@google.com
Review URL: https://codereview.chromium.org/132053002
git-svn-id: http://skia.googlecode.com/svn/trunk@12995 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 17:41:42 +00:00
commit-bot@chromium.org
9a907fa0d3
Fix Mac fontconfig build
...
The Mac fontconfig just #defines the cache directory, which works fine if fontconfig never has to look up any fonts (the case until now). If it has to actually find fonts from the disk, the cache directory and config directory need to be properly defined as well as running fc-cache to populate the cache directory.
Populating the cache directory can take some time, but should only happen on a clean build. To remove this extra time, we have to not build poppler on Mac, which can now be accomplished with GYP_DEFINES="skia_mac_poppler=0"
R=bungeman@google.com , epoger@google.com
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/113203003
git-svn-id: http://skia.googlecode.com/svn/trunk@12994 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 17:37:38 +00:00
bungeman@google.com
18b75e54ab
Fix race on creating the default typeface.
...
BUG=skia:1906
R=mtklein@google.com , reed@google.com
Review URL: https://codereview.chromium.org/113543005
git-svn-id: http://skia.googlecode.com/svn/trunk@12993 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 17:13:32 +00:00
commit-bot@chromium.org
ff007e8ff3
Allocate SkPictureFlat::fScratch lazily.
...
Cuts out half to two thirds of allocations of this object.
Since we're already lazily allocating fWriteBuffer, we don't have to add any other code complexity.
BUG=http://skbug.com/1980
R=mtklein@google.com , tomhudson@google.com
Author: tomhudson@chromium.org
Review URL: https://codereview.chromium.org/131483005
git-svn-id: http://skia.googlecode.com/svn/trunk@12992 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 16:45:45 +00:00
commit-bot@chromium.org
96ab95f458
Disable optimizations GM for 565 targets.
...
BUG=skia:1994
R=robertphillips@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/129373002
git-svn-id: http://skia.googlecode.com/svn/trunk@12991 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 16:45:38 +00:00
robertphillips@google.com
6235b85b0b
Update baselines for NVPR bot
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12989 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 15:57:25 +00:00
robertphillips@google.com
1c6affbd1c
Fix GL context creation on Windows when NV path rendering
...
https://codereview.chromium.org/129033003/
git-svn-id: http://skia.googlecode.com/svn/trunk@12983 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 13:20:48 +00:00
skia.committer@gmail.com
1ae9111f33
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12980 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 07:01:42 +00:00
bungeman@google.com
ca38f2c86e
Fix TODO in SkMutex_win.h to prevent accidental copying.
...
R=mtklein@google.com
Review URL: https://codereview.chromium.org/129533002
git-svn-id: http://skia.googlecode.com/svn/trunk@12979 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 00:02:52 +00:00
commit-bot@chromium.org
41bf930039
Rename GPU functions on SkBlurMaskFilter and pass ctm.
...
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/109823012
git-svn-id: http://skia.googlecode.com/svn/trunk@12978 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 22:25:53 +00:00
commit-bot@chromium.org
f1901788d8
use SkImageInfo directly, instead of convert to Config
...
BUG=
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/128953003
git-svn-id: http://skia.googlecode.com/svn/trunk@12977 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 22:24:55 +00:00
senorblanco@chromium.org
efd0ff108e
More rebaselines after r12895 for the mega-stragglers.
...
TBR=caryclark
BUG=1985
Review URL: https://codereview.chromium.org/126453007
git-svn-id: http://skia.googlecode.com/svn/trunk@12976 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 22:21:07 +00:00
commit-bot@chromium.org
1034ef1af4
Revert of https://codereview.chromium.org/127223004/
...
Reason for revert: VS can't comprehend std::vector without exceptions.
R=bsalomon@google.com , caryclark@google.com , mtklein@chromium.org
TBR=bsalomon@google.com , caryclark@google.com , mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/129443002
git-svn-id: http://skia.googlecode.com/svn/trunk@12975 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:31:11 +00:00
halcanary@google.com
8c5d2c1e75
Changes to roll_deps.py
...
- Code cleanup
- Stop assuming that chromium's checkout would be via git-svn.
- Verbose commit message for the deps revision
- Shorter branch names.
- New default: save_branches = yes.
- New option: --git_hash=GIT_HASH
BUG=skia:1973
BUG=skia:1974
BUG=skia:1993
BUG=skia:1995
R=borenet@google.com
Review URL: https://codereview.chromium.org/126523002
git-svn-id: http://skia.googlecode.com/svn/trunk@12974 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:29:34 +00:00
commit-bot@chromium.org
5a56793b2a
Move geometry allocator for drawVertices inside autoflush scope.
...
BUG=skia:1956
R=bsalomon@google.com , reed@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/128893003
git-svn-id: http://skia.googlecode.com/svn/trunk@12973 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:26:09 +00:00
reed@google.com
1360c52b10
use SkImageInfo directly, instead of converting to SkBitmap::Config
...
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/128933004
git-svn-id: http://skia.googlecode.com/svn/trunk@12972 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:25:26 +00:00
commit-bot@chromium.org
e48ef2ae51
Remove GPU-only flag for vertices GM
...
BUG=skia:1956
R=reed@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/129123004
git-svn-id: http://skia.googlecode.com/svn/trunk@12971 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:19:12 +00:00
commit-bot@chromium.org
d08d23b385
Small tweaks to be able to build everything target:
...
- fParsed is unused.
- Quiet down a bogus -Wuninitialized warning in QWeakPointer.
Tested Clang and GCC on Linux.
BUG=
R=bungeman@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/128573002
git-svn-id: http://skia.googlecode.com/svn/trunk@12970 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:16:14 +00:00
commit-bot@chromium.org
506ecc24bf
For comparison, add std::vector.
...
Where I've tested, it's second-place to SkTDArray, though the closest API equivalent in our code is SkTArray, which it's significantly faster than. This is probably a good approximation to how fast we can possibly make something like SkTArray that constructs and destroys its values. In fact, it might be worth trying making SkTArray a thin shim over std::vector.
BUG=
R=bsalomon@google.com , caryclark@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/127223004
git-svn-id: http://skia.googlecode.com/svn/trunk@12969 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:16:04 +00:00
commit-bot@chromium.org
4b5fba5a3c
Use a spinlock in SkOnce.
...
SkOnceFlag is now statically initializable on all platforms.
Also adds sk_atomic_cas, used to implement new SkSpinlock.
Going to punt on making SkOnceFlag any smaller (for now, it's 8 bytes). We could conceivably get it down to two bits, one for done and one for a one-bit spinlock (we'd need atomic-& and atomic-| to make that work, but they appear to be available everywhere).
BUG=skia:1929
R=bungeman@google.com , reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/123093002
git-svn-id: http://skia.googlecode.com/svn/trunk@12968 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:15:56 +00:00
borenet@google.com
d4ba6e7781
submit_try: create the diff file using git, rather than relying on trychange.py
...
BUG=skia:1862
(SkipBuildbotRuns)
R=epoger@google.com
Review URL: https://codereview.chromium.org/128413004
git-svn-id: http://skia.googlecode.com/svn/trunk@12967 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:00:30 +00:00