commit-bot@chromium.org [Mon, 13 Jan 2014 19:09:36 +0000 (19:09 +0000)]
Add no-op NULL picture to bench_record.
Defaults of out/Release/bench_record are still fine; NULL's not too far off
from stable at 900 loops. But for focus on NULL, I'd recommend
something like out/Release/bench_record --loops 100000 --skps.
Also: fail on failures, print 2 significant digits instead of fixed 4.2.
BUG=skia:1850
R=tomhudson@chromium.org
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
136873002
git-svn-id: http://skia.googlecode.com/svn/trunk@13054
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 13 Jan 2014 19:06:10 +0000 (19:06 +0000)]
Misc rebaselines related to recent GPU blur changes.
Review URL: https://codereview.chromium.org/
130523003
git-svn-id: http://skia.googlecode.com/svn/trunk@13053
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 13 Jan 2014 18:28:21 +0000 (18:28 +0000)]
Add handling alpha values in RRGGBBAA formatted styles.
BUG=
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/
136553006
git-svn-id: http://skia.googlecode.com/svn/trunk@13052
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 13 Jan 2014 18:28:14 +0000 (18:28 +0000)]
Allocate memory in SkTDynamicHash on first use.
This eliminates any dynamic allocation for hash tables that are never used.
This helps SkPicture, where some tables (SkPaint) are almost always used, but
some rarely (SkMatrix) or never (SkRegion).
This also removes the (as yet unimportant) ability for the hash table to
shrink. This makes resizing harder to reason about, so I'd like to leave it
out until we see a need.
BUG=skia:1850
R=tomhudson@chromium.org, reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
136403004
git-svn-id: http://skia.googlecode.com/svn/trunk@13051
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 13 Jan 2014 18:27:59 +0000 (18:27 +0000)]
GM: run mode comparisons for all raster configs.
GM works like this today:
- Test all enabled configs directly
- Render into 8888
- Test all enabled modes against that 8888.
This change makes it do this:
- Test all enabled configs directly
- for each config, if it's raster, test all enabled modes against its output.
Upshot is, we now check that picture draws identically to raster for 565 too, not just 8888. optimizations-565 is correctly failing.
BUG=skia:1994
R=epoger@google.com, reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
129203002
git-svn-id: http://skia.googlecode.com/svn/trunk@13050
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 13 Jan 2014 18:26:14 +0000 (18:26 +0000)]
remove _gpu suffix from tests in ignored-tests.txt that are changed on all gpu configs (msaa, ...).
Review URL: https://codereview.chromium.org/
136713005
git-svn-id: http://skia.googlecode.com/svn/trunk@13049
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Mon, 13 Jan 2014 17:15:33 +0000 (17:15 +0000)]
Rebaseline NVPR roundrects images
https://codereview.chromium.org/
136753004/
git-svn-id: http://skia.googlecode.com/svn/trunk@13048
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 13 Jan 2014 16:39:39 +0000 (16:39 +0000)]
Use correct matrix to adjust blur radius for gpu
BUG=skia:1998
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
134973002
git-svn-id: http://skia.googlecode.com/svn/trunk@13047
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 13 Jan 2014 15:57:05 +0000 (15:57 +0000)]
Remove redundant auto rt object in skpaint2grpaintshader function.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
133763006
git-svn-id: http://skia.googlecode.com/svn/trunk@13046
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 13 Jan 2014 15:06:54 +0000 (15:06 +0000)]
Remove rects GM from ignored-tests.txt and rebaseline
BUG=skia:1882
Review URL: https://codereview.chromium.org/
136803002
git-svn-id: http://skia.googlecode.com/svn/trunk@13045
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Mon, 13 Jan 2014 15:06:26 +0000 (15:06 +0000)]
Add CONTRIBUTING file
This will help to direct those who stumble upon the new github mirror
to the proper channels for contributing code.
BUG=
R=jcgregorio@google.com
Review URL: https://codereview.chromium.org/
134663003
git-svn-id: http://skia.googlecode.com/svn/trunk@13044
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 13 Jan 2014 15:04:50 +0000 (15:04 +0000)]
remove (now dead code) for SK_SUPPORT_LEGACY_COLORTYPE and SK_SUPPORT_LEGACY_ALPHATYPE
BUG=
Review URL: https://codereview.chromium.org/
135033002
git-svn-id: http://skia.googlecode.com/svn/trunk@13043
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 13 Jan 2014 14:53:55 +0000 (14:53 +0000)]
remove remaining references to Sk64 (obsolete)
BUG=
Review URL: https://codereview.chromium.org/
136673002
git-svn-id: http://skia.googlecode.com/svn/trunk@13042
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 13 Jan 2014 14:47:00 +0000 (14:47 +0000)]
Handle drawBitmapRect src_rect->dst_rect mapping as a local matrix rather than view matrix when there is a mask filter.
BUG=skia:1998
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
131323004
git-svn-id: http://skia.googlecode.com/svn/trunk@13041
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Mon, 13 Jan 2014 14:13:46 +0000 (14:13 +0000)]
Yet another patch for r13038
git-svn-id: http://skia.googlecode.com/svn/trunk@13040
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Mon, 13 Jan 2014 13:46:45 +0000 (13:46 +0000)]
Fix for r13038
git-svn-id: http://skia.googlecode.com/svn/trunk@13039
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Mon, 13 Jan 2014 13:33:26 +0000 (13:33 +0000)]
Pull in Chromium's version of GatherPixelRefs
https://codereview.chromium.org/
134473002/
git-svn-id: http://skia.googlecode.com/svn/trunk@13038
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 13 Jan 2014 12:03:47 +0000 (12:03 +0000)]
Add bench_record.
I got fed up trying to figure out how best to measure recording cost with bench_pictures, render_pictures, etc, so I wrote a new tool.
Features welcome.
BUG=
R=tomhudson@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
132573002
git-svn-id: http://skia.googlecode.com/svn/trunk@13037
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 13 Jan 2014 08:16:45 +0000 (08:16 +0000)]
NEON fast path for box blur
Calculate 8 channels in parallel by using 16-bits to store each channel. Due to the limitation of VQRDMULH, (int16 * int16 * 2 + 0x8000) >> 16, the fast path can only support kernelSize < 128.
8 significant bits are kept at least in each stage, the final error should less-equal than 1.
Pre-fetching memory for X-direction read. In fact pre-fetching memory doesn't help much for Y direction read, since it is a waste to load a cache line for only read 8 bytes.(I left it there to keep the symmetry. pre-fetch is cheap :) )
bench data on Nexus 10
before:
running bench [640 480] blur_image_filter_large_10.00_10.00 8888: cmsecs = 25081.48
running bench [640 480] blur_image_filter_small_10.00_10.00 8888: cmsecs = 25038.04
running bench [640 480] blur_image_filter_large_1.00_1.00 8888: cmsecs = 25209.04
running bench [640 480] blur_image_filter_small_1.00_1.00 8888: cmsecs = 24928.01
running bench [640 480] blur_image_filter_large_0.00_1.00 8888: cmsecs = 17160.98
running bench [640 480] blur_image_filter_large_0.00_10.00 8888: cmsecs = 17924.11
running bench [640 480] blur_image_filter_large_1.00_0.00 8888: cmsecs = 14609.19
running bench [640 480] blur_image_filter_large_10.00_0.00 8888: cmsecs = 14625.91
after:
running bench [640 480] blur_image_filter_large_10.00_10.00 8888: cmsecs = 14848.42
running bench [640 480] blur_image_filter_small_10.00_10.00 8888: cmsecs = 16037.29
running bench [640 480] blur_image_filter_large_1.00_1.00 8888: cmsecs = 14819.55
running bench [640 480] blur_image_filter_small_1.00_1.00 8888: cmsecs = 14563.69
running bench [640 480] blur_image_filter_large_0.00_1.00 8888: cmsecs = 11905.34
running bench [640 480] blur_image_filter_large_0.00_10.00 8888: cmsecs = 11883.85
running bench [640 480] blur_image_filter_large_1.00_0.00 8888: cmsecs = 9576.51
running bench [640 480] blur_image_filter_large_10.00_0.00 8888: cmsecs = 9793.84
BUG=
R=senorblanco@chromium.org, mtklein@google.com, reed@google.com, kevin.petit@arm.com, kevin.petit.arm@gmail.com
Author: zheng.xu@arm.com
Review URL: https://codereview.chromium.org/
105893003
git-svn-id: http://skia.googlecode.com/svn/trunk@13036
2bbb7eff-a529-9590-31e7-
b0007b416f81
tfarina@chromium.org [Sat, 11 Jan 2014 16:42:10 +0000 (16:42 +0000)]
Cleanup: Remove unused includes from skia_unix.cpp
This also move gWindow into the main function.
BUG=None
TEST=SampleApp
R=mtklein@google.com
Review URL: https://codereview.chromium.org/
133113002
git-svn-id: http://skia.googlecode.com/svn/trunk@13035
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 10 Jan 2014 23:10:13 +0000 (23:10 +0000)]
merge multiple blurrect GMs into one GM and add versions
BUG=skia:1998
R=reed@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
134533006
git-svn-id: http://skia.googlecode.com/svn/trunk@13034
2bbb7eff-a529-9590-31e7-
b0007b416f81
tfarina@chromium.org [Fri, 10 Jan 2014 22:08:27 +0000 (22:08 +0000)]
Add a DEF_GPUTEST() macro.
This macro is similar to DEF_TEST() and simplifies the process of
setting up a GPU test.
BUG=skia:1952
TEST=tests
R=mtklein@google.com
Review URL: https://codereview.chromium.org/
132293005
git-svn-id: http://skia.googlecode.com/svn/trunk@13033
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 10 Jan 2014 22:05:41 +0000 (22:05 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 21:33:01 +0000 (21:33 +0000)]
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
borenet@google.com [Fri, 10 Jan 2014 21:02:25 +0000 (21:02 +0000)]
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
bungeman@google.com [Fri, 10 Jan 2014 20:56:21 +0000 (20:56 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 20:13:09 +0000 (20:13 +0000)]
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
bungeman@google.com [Fri, 10 Jan 2014 19:40:56 +0000 (19:40 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 19:37:00 +0000 (19:37 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 19:09:00 +0000 (19:09 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 18:28:23 +0000 (18:28 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 17:58:47 +0000 (17:58 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 17:22:01 +0000 (17:22 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 17:21:00 +0000 (17:21 +0000)]
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
commit-bot@chromium.org [Fri, 10 Jan 2014 16:39:20 +0000 (16:39 +0000)]
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
robertphillips@google.com [Fri, 10 Jan 2014 15:28:19 +0000 (15:28 +0000)]
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
halcanary@google.com [Fri, 10 Jan 2014 15:00:45 +0000 (15:00 +0000)]
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
halcanary@google.com [Fri, 10 Jan 2014 14:58:10 +0000 (14:58 +0000)]
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
halcanary@google.com [Fri, 10 Jan 2014 14:53:49 +0000 (14:53 +0000)]
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
robertphillips@google.com [Fri, 10 Jan 2014 13:50:23 +0000 (13:50 +0000)]
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
skia.committer@gmail.com [Fri, 10 Jan 2014 07:08:11 +0000 (07:08 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13008
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 9 Jan 2014 22:54:26 +0000 (22:54 +0000)]
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
borenet@google.com [Thu, 9 Jan 2014 21:41:39 +0000 (21:41 +0000)]
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
reed@google.com [Thu, 9 Jan 2014 21:05:59 +0000 (21:05 +0000)]
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
reed@google.com [Thu, 9 Jan 2014 20:00:14 +0000 (20:00 +0000)]
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
robertphillips@google.com [Thu, 9 Jan 2014 19:45:29 +0000 (19:45 +0000)]
Fix for Mac-specific compilation issue in r13000
git-svn-id: http://skia.googlecode.com/svn/trunk@13001
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 9 Jan 2014 19:20:45 +0000 (19:20 +0000)]
Expand GatherPixelRefs unit test
https://codereview.chromium.org/
132293002/
git-svn-id: http://skia.googlecode.com/svn/trunk@13000
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 9 Jan 2014 19:14:57 +0000 (19:14 +0000)]
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
bsalomon@google.com [Thu, 9 Jan 2014 17:59:55 +0000 (17:59 +0000)]
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
commit-bot@chromium.org [Thu, 9 Jan 2014 17:52:54 +0000 (17:52 +0000)]
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
commit-bot@chromium.org [Thu, 9 Jan 2014 17:48:48 +0000 (17:48 +0000)]
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
senorblanco@chromium.org [Thu, 9 Jan 2014 17:41:42 +0000 (17:41 +0000)]
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
commit-bot@chromium.org [Thu, 9 Jan 2014 17:37:38 +0000 (17:37 +0000)]
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
bungeman@google.com [Thu, 9 Jan 2014 17:13:32 +0000 (17:13 +0000)]
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
commit-bot@chromium.org [Thu, 9 Jan 2014 16:45:45 +0000 (16:45 +0000)]
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
commit-bot@chromium.org [Thu, 9 Jan 2014 16:45:38 +0000 (16:45 +0000)]
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
robertphillips@google.com [Thu, 9 Jan 2014 15:57:25 +0000 (15:57 +0000)]
Update baselines for NVPR bot
git-svn-id: http://skia.googlecode.com/svn/trunk@12989
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 9 Jan 2014 13:20:48 +0000 (13:20 +0000)]
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
skia.committer@gmail.com [Thu, 9 Jan 2014 07:01:42 +0000 (07:01 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12980
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Thu, 9 Jan 2014 00:02:52 +0000 (00:02 +0000)]
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
commit-bot@chromium.org [Wed, 8 Jan 2014 22:25:53 +0000 (22:25 +0000)]
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
commit-bot@chromium.org [Wed, 8 Jan 2014 22:24:55 +0000 (22:24 +0000)]
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
senorblanco@chromium.org [Wed, 8 Jan 2014 22:21:07 +0000 (22:21 +0000)]
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
commit-bot@chromium.org [Wed, 8 Jan 2014 21:31:11 +0000 (21:31 +0000)]
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
halcanary@google.com [Wed, 8 Jan 2014 21:29:34 +0000 (21:29 +0000)]
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
commit-bot@chromium.org [Wed, 8 Jan 2014 21:26:09 +0000 (21:26 +0000)]
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
reed@google.com [Wed, 8 Jan 2014 21:25:26 +0000 (21:25 +0000)]
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
commit-bot@chromium.org [Wed, 8 Jan 2014 21:19:12 +0000 (21:19 +0000)]
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
commit-bot@chromium.org [Wed, 8 Jan 2014 21:16:14 +0000 (21:16 +0000)]
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
commit-bot@chromium.org [Wed, 8 Jan 2014 21:16:04 +0000 (21:16 +0000)]
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
commit-bot@chromium.org [Wed, 8 Jan 2014 21:15:56 +0000 (21:15 +0000)]
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
borenet@google.com [Wed, 8 Jan 2014 21:00:30 +0000 (21:00 +0000)]
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
bungeman@google.com [Wed, 8 Jan 2014 20:32:07 +0000 (20:32 +0000)]
Improve 'stretch' in legacy create typeface for DirectWrite.
Previously the stretch (width) property was set to UNDEFINED, since the
legacy create typeface does not have this information. However, a better
default here is NORMAL.
Review URL: https://codereview.chromium.org/
127813003
git-svn-id: http://skia.googlecode.com/svn/trunk@12966
2bbb7eff-a529-9590-31e7-
b0007b416f81
rmistry@google.com [Wed, 8 Jan 2014 19:21:23 +0000 (19:21 +0000)]
Buildbot SKPs have been recreated. Triggering rebuilds.
git-svn-id: http://skia.googlecode.com/svn/trunk@12965
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 8 Jan 2014 17:59:22 +0000 (17:59 +0000)]
fix gm self-test
BUG=skia:1971
NOTREECHECKS=True
NOTRY=True
R=caryclark@google.com
TBR=caryclark
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
128793002
git-svn-id: http://skia.googlecode.com/svn/trunk@12964
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 8 Jan 2014 16:52:42 +0000 (16:52 +0000)]
Move DM from everything to most, to build it by default.
BUG=
R=reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
127423003
git-svn-id: http://skia.googlecode.com/svn/trunk@12962
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Wed, 8 Jan 2014 15:53:19 +0000 (15:53 +0000)]
Work around SkString::gEmptyRec->writable_str() is unwritable.
See https://code.google.com/p/skia/issues/detail?id=1989
R=reed@google.com
Review URL: https://codereview.chromium.org/
128463002
git-svn-id: http://skia.googlecode.com/svn/trunk@12961
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 8 Jan 2014 15:46:19 +0000 (15:46 +0000)]
one more filterbitmap ASAN ignore
BUG=skia:1984
Review URL: https://codereview.chromium.org/
126813004
git-svn-id: http://skia.googlecode.com/svn/trunk@12960
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 8 Jan 2014 15:42:53 +0000 (15:42 +0000)]
Rebaselines for filterbitmap and downsample GMs on gpu N4
BUG=skia:1984
Review URL: https://codereview.chromium.org/
128433002
git-svn-id: http://skia.googlecode.com/svn/trunk@12959
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 8 Jan 2014 15:42:01 +0000 (15:42 +0000)]
change offset to xy for pixelref subsetting
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/
105893012
git-svn-id: http://skia.googlecode.com/svn/trunk@12958
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 8 Jan 2014 15:34:27 +0000 (15:34 +0000)]
Mark ASAN filterbitmap images as ignore failure
BUG=1984
Review URL: https://codereview.chromium.org/
128423002
git-svn-id: http://skia.googlecode.com/svn/trunk@12957
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Wed, 8 Jan 2014 15:26:01 +0000 (15:26 +0000)]
Mark filterbitmap_* on N4 (persp) as ignore failure because of skia issue 1966
BUG=skia:1966
BUG=skia:1984
Review URL: https://codereview.chromium.org/
128383003
git-svn-id: http://skia.googlecode.com/svn/trunk@12956
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Wed, 8 Jan 2014 15:18:20 +0000 (15:18 +0000)]
More rebaselines from r12895.
BUG=1985
TBR=caryclark
Review URL: https://codereview.chromium.org/
128143003
git-svn-id: http://skia.googlecode.com/svn/trunk@12955
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 8 Jan 2014 15:14:09 +0000 (15:14 +0000)]
Move v8 into third_party.
BUG=
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/
116693004
git-svn-id: http://skia.googlecode.com/svn/trunk@12954
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 8 Jan 2014 14:39:34 +0000 (14:39 +0000)]
suppress on gpu for now
BUG=skia:1956
Review URL: https://codereview.chromium.org/
128333002
git-svn-id: http://skia.googlecode.com/svn/trunk@12953
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Wed, 8 Jan 2014 13:18:48 +0000 (13:18 +0000)]
Trigger builds after https://skia.googlesource.com/buildbot/+/
49f751a735103de70ef7e4a5108ebf13d345633f
This will trigger failures on bots who haven't updated their slave-side scripts.
Review URL: https://codereview.chromium.org/
128253002
git-svn-id: http://skia.googlecode.com/svn/trunk@12952
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Wed, 8 Jan 2014 07:01:49 +0000 (07:01 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12950
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 7 Jan 2014 20:11:38 +0000 (20:11 +0000)]
Update utils.gyp to find SkNoSaveLayerCanvas.h in 'src'.
R=robertphillips@google.com
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/
99393008
git-svn-id: http://skia.googlecode.com/svn/trunk@12947
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 7 Jan 2014 19:00:27 +0000 (19:00 +0000)]
Add the gears.js demo and all the code changes needed to get it working, including implementing both fill and stroke style. Also add the HTML and JS files to compare with browser performance.
BUG=
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/
122373003
git-svn-id: http://skia.googlecode.com/svn/trunk@12946
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 7 Jan 2014 17:50:04 +0000 (17:50 +0000)]
more PDF filterbitmap ignores
Review URL: https://codereview.chromium.org/
123933005
git-svn-id: http://skia.googlecode.com/svn/trunk@12944
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 7 Jan 2014 17:21:11 +0000 (17:21 +0000)]
rebaseline_server: allow spaces within test/config names
(SkipBuildbotRuns)
BUG=skia:1969
NOTREECHECKS=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
99373010
git-svn-id: http://skia.googlecode.com/svn/trunk@12943
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Tue, 7 Jan 2014 17:20:33 +0000 (17:20 +0000)]
Make imagealphathreshold GM skip replay modes until it is fixed.
TBR=zork@chromium.org
Review URL: https://codereview.chromium.org/
94043005
git-svn-id: http://skia.googlecode.com/svn/trunk@12942
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 7 Jan 2014 17:03:40 +0000 (17:03 +0000)]
add unittest for render_pictures binary
Once committed, this will be run as part of RunToolSelfTests on http://108.170.217.252:10117/builders/Housekeeper-PerCommit .
BUG=skia:1943
R=rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
124253002
git-svn-id: http://skia.googlecode.com/svn/trunk@12941
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 7 Jan 2014 17:03:31 +0000 (17:03 +0000)]
Add StackBench to measure performance on stack-like (fixed element size) work loads.
BUG=303282
R=reed@google.com, caryclark@google.com, mtklein@chromium.org
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
110893007
git-svn-id: http://skia.googlecode.com/svn/trunk@12940
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Tue, 7 Jan 2014 16:08:04 +0000 (16:08 +0000)]
NoSaveLayerCanvas now its own file
https://codereview.chromium.org/
120553003/
git-svn-id: http://skia.googlecode.com/svn/trunk@12938
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 7 Jan 2014 16:04:01 +0000 (16:04 +0000)]
Fix build warnings in SkAlphaThresholdFilter
BUG=None
R=bsalomon@google.com
Author: zork@chromium.org
Review URL: https://codereview.chromium.org/
101763010
git-svn-id: http://skia.googlecode.com/svn/trunk@12937
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Tue, 7 Jan 2014 07:01:50 +0000 (07:01 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12936
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 6 Jan 2014 23:41:14 +0000 (23:41 +0000)]
Add AlphaThreshold filter.
This is based on the Bitmap Alpha Threshold filter, and will be used by Chromium
to implement the window shape API.
R=bsalomon@chromium.org, wez@chromium.org, bsalomon@google.com, reed@google.com
Author: zork@chromium.org
Review URL: https://codereview.chromium.org/
115633002
git-svn-id: http://skia.googlecode.com/svn/trunk@12935
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 6 Jan 2014 23:25:38 +0000 (23:25 +0000)]
Mark pdf filterbitmap images as failure ignored
Review URL: https://codereview.chromium.org/
121883006
git-svn-id: http://skia.googlecode.com/svn/trunk@12933
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 6 Jan 2014 22:50:28 +0000 (22:50 +0000)]
Rebaseline filterbitmap_image_mandrill N4 GPU images
BUG=skia:1879
Review URL: https://codereview.chromium.org/
102963011
git-svn-id: http://skia.googlecode.com/svn/trunk@12931
2bbb7eff-a529-9590-31e7-
b0007b416f81