rmistry@google.com [Mon, 16 Dec 2013 17:14:02 +0000 (17:14 +0000)]
Refreshed SKPs to version 17. Triggering rebuilds.
git-svn-id: http://skia.googlecode.com/svn/trunk@12690
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Mon, 16 Dec 2013 17:02:39 +0000 (17:02 +0000)]
Supports the cap height for FreeType even when TT OS2 version is 1.
BUG=http://crbug.com/318645
R=bungeman@google.com, reed@google.com
Review URL: https://codereview.chromium.org/
101333004
git-svn-id: http://skia.googlecode.com/svn/trunk@12689
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 16 Dec 2013 15:18:11 +0000 (15:18 +0000)]
Use GrTextureDomain in GrBicubicEffect to perform non-bleeding HQ filter drawBitmap.
R=senorblanco@chromium.org, robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
99203011
git-svn-id: http://skia.googlecode.com/svn/trunk@12687
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 16 Dec 2013 14:17:40 +0000 (14:17 +0000)]
remove SkFP.h and replace SkFP with SkScalar stop respecting SK_SOFTWARE_FLOAT, assume its always false stop respecting SK_SCALAR_SLOW_COMPARES, assume its always false
BUG=
R=caryclark@google.com
Review URL: https://codereview.chromium.org/
116183002
git-svn-id: http://skia.googlecode.com/svn/trunk@12686
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Mon, 16 Dec 2013 07:01:40 +0000 (07:01 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12685
2bbb7eff-a529-9590-31e7-
b0007b416f81
tfarina@chromium.org [Sat, 14 Dec 2013 15:12:48 +0000 (15:12 +0000)]
Fix some presubmit warnings.
I found this while running a modified version of v8's tools/presubmit.py
script.
samplecode/SampleImage.cpp does not end with a single new line.
samplecode/SampleImageDir.cpp does not end with a single new line.
src/ports/SkFontHost_sandbox_none.cpp does not end with a single new line.
tests/FlatDataTest.cpp does not end with a single new line.
tests/ImageCacheTest.cpp has trailing whitespaces in line 31.
* Removed three empty files.
* Add single new line to FlatDataTest.cpp
* Removed trailing whitespace in ImageCacheTest.cpp
BUG=None
TEST=None
R=bsalomon@google.com
TBR=bsalomon@google.com
Review URL: https://codereview.chromium.org/
111503008
git-svn-id: http://skia.googlecode.com/svn/trunk@12684
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Fri, 13 Dec 2013 21:26:02 +0000 (21:26 +0000)]
Use SkScalar when aligning glyphs in user space.
Drawing text from paths is done in user space and not in device space.
All operations in user space should be performed with SkScalars.
BUG=327031
R=reed@google.com
Review URL: https://codereview.chromium.org/
113123005
git-svn-id: http://skia.googlecode.com/svn/trunk@12682
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 13 Dec 2013 21:16:12 +0000 (21:16 +0000)]
remove SkScalarCompare type and header
BUG=
R=fmalita@chromium.org
Review URL: https://codereview.chromium.org/
113193004
git-svn-id: http://skia.googlecode.com/svn/trunk@12681
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Fri, 13 Dec 2013 20:52:36 +0000 (20:52 +0000)]
render_pictures: add --writeJsonSummaryPath
Known issues:
- JSON summary will be empty if --writePath not specified also
- testNames within summary do not include the config (8888, gpu, etc.)
BUG=
R=rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
98643007
git-svn-id: http://skia.googlecode.com/svn/trunk@12680
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 13 Dec 2013 19:58:46 +0000 (19:58 +0000)]
bump picture format to 17 to go with PixelRef Info CL
BUG=
Review URL: https://codereview.chromium.org/
106763004
git-svn-id: http://skia.googlecode.com/svn/trunk@12678
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 13 Dec 2013 19:45:58 +0000 (19:45 +0000)]
Update all callsites to use info for pixelrefs
#define SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR in chrome to keep old API signature (for now)
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/
100723005
git-svn-id: http://skia.googlecode.com/svn/trunk@12677
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Fri, 13 Dec 2013 19:36:25 +0000 (19:36 +0000)]
Improved SkPathRef interface security
https://codereview.chromium.org/
115323004/
git-svn-id: http://skia.googlecode.com/svn/trunk@12676
2bbb7eff-a529-9590-31e7-
b0007b416f81
halcanary@google.com [Fri, 13 Dec 2013 19:25:21 +0000 (19:25 +0000)]
Fix win7 BitmapTest
BUG=
R=bungeman@google.com
Review URL: https://codereview.chromium.org/
110223005
git-svn-id: http://skia.googlecode.com/svn/trunk@12675
2bbb7eff-a529-9590-31e7-
b0007b416f81
halcanary@google.com [Fri, 13 Dec 2013 18:29:51 +0000 (18:29 +0000)]
Allow 0-width SkBitmap in setConfig.
Previously, SkBitmap::setConfig would allow zero height, but not zero
width. This is changed for consistancy.
A unit test was added.
BUG=
R=reed@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/
111953004
git-svn-id: http://skia.googlecode.com/svn/trunk@12673
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Fri, 13 Dec 2013 15:24:37 +0000 (15:24 +0000)]
Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) due to Chromium/Blink compilation errors
https://codereview.chromium.org/
112603003/
git-svn-id: http://skia.googlecode.com/svn/trunk@12667
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Fri, 13 Dec 2013 14:34:12 +0000 (14:34 +0000)]
Mac 10.6 compiler fix for r12665 (Remove duplicate impl for SkImageInfo flattening)
https://codereview.chromium.org/
101913006/
git-svn-id: http://skia.googlecode.com/svn/trunk@12666
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 13 Dec 2013 14:18:14 +0000 (14:18 +0000)]
Remvoe duplicate impl for SkImageInfo flattening
Add onNewLockPixels
This reverts commit
bb8eff6a70c52b7644391cfd4f4d21bf7294a6bf.
BUG=
Review URL: https://codereview.chromium.org/
111323005
git-svn-id: http://skia.googlecode.com/svn/trunk@12665
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Fri, 13 Dec 2013 13:41:14 +0000 (13:41 +0000)]
Revert "Revert of https://codereview.chromium.org/
112783004/"
This reverts commit
3293fe57a7507541e9040eab880dcd82c43881f4.
Conflicts:
src/core/SkScaledImageCache.cpp
BUG=
Review URL: https://codereview.chromium.org/
108613005
git-svn-id: http://skia.googlecode.com/svn/trunk@12663
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Thu, 12 Dec 2013 23:54:33 +0000 (23:54 +0000)]
Don't run the GM in serialization modes.
git-svn-id: http://skia.googlecode.com/svn/trunk@12662
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Thu, 12 Dec 2013 23:28:52 +0000 (23:28 +0000)]
Implement an SkPicture image filter source. This is required for the external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect.
R=reed@google.com
Review URL: https://codereview.chromium.org/
114263002
git-svn-id: http://skia.googlecode.com/svn/trunk@12661
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 12 Dec 2013 23:03:51 +0000 (23:03 +0000)]
Move segment mask from SkPath to SkPathRef
https://codereview.chromium.org/
105083003/
git-svn-id: http://skia.googlecode.com/svn/trunk@12660
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 23:00:10 +0000 (23:00 +0000)]
Perlin noise rebaseline
BUG=skia:1881
Committed: https://code.google.com/p/skia/source/detail?r=5f145c9
R=sugoi@google.com, mtklein@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/
99433007
git-svn-id: http://skia.googlecode.com/svn/trunk@12659
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 12 Dec 2013 22:37:32 +0000 (22:37 +0000)]
be sure to unlock the discardablememory before deleting it
BUG=
Review URL: https://codereview.chromium.org/
114673002
git-svn-id: http://skia.googlecode.com/svn/trunk@12658
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Thu, 12 Dec 2013 22:23:32 +0000 (22:23 +0000)]
Revert "Implement an SkPicture image filter source. This is required for the external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect."
This reverts commit
a620349a24471546ad2e8f0679774c1f5b4de0a4 (r12656).
git-svn-id: http://skia.googlecode.com/svn/trunk@12657
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Thu, 12 Dec 2013 22:00:34 +0000 (22:00 +0000)]
Implement an SkPicture image filter source. This is required for the external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect.
R=reed@google.com
Review URL: https://codereview.chromium.org/
114263002
git-svn-id: http://skia.googlecode.com/svn/trunk@12656
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 21:48:32 +0000 (21:48 +0000)]
Fixed a displacement issue
The displacement filter was assuming that both inputs were of the same size, which is true in blink, but not necessarily in a compromised stream.
BUG=327372
R=senorblanco@chromium.org, senorblanco@google.com, reed@google.com, fmalita@chromium.org, fmalita@google.com, sugoi@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/
101623007
git-svn-id: http://skia.googlecode.com/svn/trunk@12655
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 12 Dec 2013 21:37:25 +0000 (21:37 +0000)]
detect if the scaledimagecache returns a purged bitmap
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/
110383005
git-svn-id: http://skia.googlecode.com/svn/trunk@12654
2bbb7eff-a529-9590-31e7-
b0007b416f81
tfarina@chromium.org [Thu, 12 Dec 2013 21:11:12 +0000 (21:11 +0000)]
Use DEFINE_TESTCLASS_SHORT macro in tests.
The three version of DEFINE_TESTCLASS macro is deprecated and thus just
use the simple, short one.
BUG=None
TEST=out/Debug/tests
R=mtklein@google.com, bsalomon@google.com, robertphillips@google.com
Review URL: https://codereview.chromium.org/
100113004
git-svn-id: http://skia.googlecode.com/svn/trunk@12653
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Thu, 12 Dec 2013 21:00:58 +0000 (21:00 +0000)]
Bounds fixes for SkXfermodeImageFilter:
1) Change the default bounds to the union of the foreground and background bounds.
2) Use a canvas translate instead of manually offsetting the foreground and background bounds by the union.
3) Apply the transfer mode to all pixels, including those outside the foreground rect by using a difference clip.
Covered by the offset test cases in the xfermodeimagefilter GM (will need rebaselines).
R=reed@google.com
Review URL: https://codereview.chromium.org/
112683004
git-svn-id: http://skia.googlecode.com/svn/trunk@12652
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 20:55:00 +0000 (20:55 +0000)]
Try another GYP DEPS
This one is just before the introduction of the Python 2.7 requirement.
BUG=
R=rmistry@google.com, robertphillips@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/
99583004
git-svn-id: http://skia.googlecode.com/svn/trunk@12651
2bbb7eff-a529-9590-31e7-
b0007b416f81
borenet@google.com [Thu, 12 Dec 2013 19:58:10 +0000 (19:58 +0000)]
Revert r12648
Review URL: https://codereview.chromium.org/
114453002
git-svn-id: http://skia.googlecode.com/svn/trunk@12650
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 19:47:09 +0000 (19:47 +0000)]
Preventing division by 0
I did bench tests and I can't compute the denom before the if condition without taking a hit. After a few quick tests on my linux desktop, computing the 1st denom costs 6ms, the 2nd one 5ms and both together cost 9ms. The reason for this is that both if conditions here are exceptions and are expected to be false, so the denom computation should be skipped, if possible. The bench test I ran was :
out/Release/bench --match Xfermode_Hue --config 8888 --minMs 1000
BUG=
R=senorblanco@chromium.org, senorblanco@google.com, reed@google.com, sugoi@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/
114173002
git-svn-id: http://skia.googlecode.com/svn/trunk@12649
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 19:39:04 +0000 (19:39 +0000)]
Update GYP DEPS to obtain VS 2013 support
R=rmistry@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/
103893006
git-svn-id: http://skia.googlecode.com/svn/trunk@12648
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 18:08:08 +0000 (18:08 +0000)]
Revert of https://codereview.chromium.org/
112783004/
Reason for revert: Failing assert on Android
R=scroggo@google.com, halcanary@google.com, reed@google.com, rmistry@google.com
TBR=halcanary@google.com, reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/
93673005
git-svn-id: http://skia.googlecode.com/svn/trunk@12646
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 16:47:06 +0000 (16:47 +0000)]
GM: stroke-fill results for pdf-poppler
(some stragglers that snuck in overnight while pdf-poppler was still ignored)
NOTRY=True
NOTREECHECKS=True
R=rmistry@google.com
TBR=rmistry
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
103383003
git-svn-id: http://skia.googlecode.com/svn/trunk@12644
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 16:34:50 +0000 (16:34 +0000)]
GM: stop ignoring pdf-poppler failures
BUG=skia:1657
NOTRY=True
R=vandebo@chromium.org
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
108813007
git-svn-id: http://skia.googlecode.com/svn/trunk@12643
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Thu, 12 Dec 2013 16:27:12 +0000 (16:27 +0000)]
ensure that we call onUnlock only when we onLock succeeded
BUG=
R=halcanary@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/
112783004
git-svn-id: http://skia.googlecode.com/svn/trunk@12642
2bbb7eff-a529-9590-31e7-
b0007b416f81
scroggo@google.com [Thu, 12 Dec 2013 15:19:30 +0000 (15:19 +0000)]
Initialize SkPixelRef::fInfo.
Still will need to make subclasses call the version of the constructor
that initializes fInfo properly.
R=reed@google.com
Review URL: https://codereview.chromium.org/
110843006
git-svn-id: http://skia.googlecode.com/svn/trunk@12639
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 14:55:45 +0000 (14:55 +0000)]
The default size of mask canvas is not appropriate. its height is too small: 150, while its width is 300. As a result, for non-alphaMask canvas who doesn't update the mask canvas size, this tool just magnify the upper part of 'Expected Image' as well as 'Actual Image' when user open view.html to show skpdiff_output.json in browser for many cases. The other part can't be shown because it is out of the mask canvas. This CL update non-alphaMask canvas size according to baseline canvas for each case, then the tool can magnify anywhere you want for the whole image when you click and move mouse on the mask canvas.
R=djsollen@google.com
Author: yunchao.he@intel.com
Review URL: https://codereview.chromium.org/
105823010
git-svn-id: http://skia.googlecode.com/svn/trunk@12638
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Thu, 12 Dec 2013 14:24:20 +0000 (14:24 +0000)]
Reverting r12635 (Make leak counters thread-safe - https://codereview.chromium.org/
99483003) due to compile errors on Mac 10.6 & in Chrome
git-svn-id: http://skia.googlecode.com/svn/trunk@12637
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 14:00:12 +0000 (14:00 +0000)]
Make leak counters thread-safe and turn them on by default for Debug
Make leak counters implemented with SK_DECLARE_INST_COUNT thread-safe.
Enable the leak counting for Debug builds.
Protect the instance counter initialization step (initStep) by
using SkOnce.
Makes SkOnce.h part of the public API, since SkInstCnt is public.
Protect the per-class child list shared variable with a per-class mutex.
Changes the behavior in the way that if the child list has been
"cleaned up", it will still try to create subsequent child lists.
BUG=skia:1219
R=robertphillips@google.com, mtklein@google.com, bungeman@gmail.com, bsalomon@google.com, bungeman@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/
99483003
git-svn-id: http://skia.googlecode.com/svn/trunk@12635
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Thu, 12 Dec 2013 14:00:01 +0000 (14:00 +0000)]
Whitespace change to test commit queue.
(SkipBuildbotRuns)
BUG=
TBR=borenet@google.com
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/
94103005
git-svn-id: http://skia.googlecode.com/svn/trunk@12634
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 11 Dec 2013 23:54:31 +0000 (23:54 +0000)]
[PDF] Fix font width generation when glyph 0 is used.
Using glyph 0 caused gid 0 to be in the subset list twice, which violated an assumption in the code. Added an assert for the assumption and updated the code to not insert gid 0 into the subset list twice.
BUG=skia:1889
R=bungeman@google.com
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/
113093004
git-svn-id: http://skia.googlecode.com/svn/trunk@12632
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 11 Dec 2013 21:22:39 +0000 (21:22 +0000)]
Revert "remvoe duplicate impl for SkImageInfo flattening"
Reason: breaks chrome_mac_tests which still have non-imageinfo constructors
This reverts commit
a06b8cf60b39bda93e9ef1a73579007b2b930d29.
BUG=
Review URL: https://codereview.chromium.org/
103033005
git-svn-id: http://skia.googlecode.com/svn/trunk@12631
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 11 Dec 2013 21:15:58 +0000 (21:15 +0000)]
Revert "Revert of https://codereview.chromium.org/
108773003/"
This reverts commit
947e6a3142af66b750f1247ef933b11ed8455dd4.
BUG=
Review URL: https://codereview.chromium.org/
112963003
git-svn-id: http://skia.googlecode.com/svn/trunk@12630
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 11 Dec 2013 20:55:41 +0000 (20:55 +0000)]
Revert of https://codereview.chromium.org/
108773003/
Reason for revert: breaks chrome-mac-tests
TBR=
NOTREECHECKS=true
NOTRY=true
Author: reed@google.com
Review URL: https://codereview.chromium.org/
113193003
git-svn-id: http://skia.googlecode.com/svn/trunk@12629
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 11 Dec 2013 20:19:42 +0000 (20:19 +0000)]
Tiny, urgent fix for rebaseline_server to accept new baselines.
(SkipBuildbotRuns)
R=jcgregorio@google.com
TBR=jcgregorio
NOTREECHECKS=True
NOTRY=True
BUG=
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
99763007
git-svn-id: http://skia.googlecode.com/svn/trunk@12628
2bbb7eff-a529-9590-31e7-
b0007b416f81
vandebo@chromium.org [Wed, 11 Dec 2013 20:11:27 +0000 (20:11 +0000)]
Update stroke-fill_pdf-native.png after r12625
TBR=bungeman@google.com
Review URL: https://codereview.chromium.org/
102443006
git-svn-id: http://skia.googlecode.com/svn/trunk@12627
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 11 Dec 2013 20:08:18 +0000 (20:08 +0000)]
remaining GM baselines for pdf-poppler
R=vandebo@chromium.org
TBR=vandebo
BUG=
(SkipBuildbotRuns)
NOTRY=True
NOTREECHECKS=True
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
112973004
git-svn-id: http://skia.googlecode.com/svn/trunk@12626
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 11 Dec 2013 18:47:11 +0000 (18:47 +0000)]
[PDF] Fix bug in ToUnicode table generation for Type 3 fonts.
True glyphIDs where being using in the Type3 ToUnicode table instead of IDs of 1-255. This causes poppler to complain about each entry.
BUG:skia:1565
R=bungeman@google.com
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/
112053005
git-svn-id: http://skia.googlecode.com/svn/trunk@12625
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 11 Dec 2013 18:38:46 +0000 (18:38 +0000)]
remvoe duplicate impl for SkImageInfo flattening
Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap.""""""
This reverts commit
eabd6b2ed4e494b323c08f32358f45950a0368c3.
BUG=
Review URL: https://codereview.chromium.org/
108773003
git-svn-id: http://skia.googlecode.com/svn/trunk@12624
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 11 Dec 2013 18:19:10 +0000 (18:19 +0000)]
Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap."""""
This reverts commit
d08eca87a0bef10112a211de540f89656a80b86a.
BUG=
Review URL: https://codereview.chromium.org/
108303003
git-svn-id: http://skia.googlecode.com/svn/trunk@12623
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 11 Dec 2013 18:04:56 +0000 (18:04 +0000)]
PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap.""""
BUG=
Review URL: https://codereview.chromium.org/
110503003
git-svn-id: http://skia.googlecode.com/svn/trunk@12622
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 11 Dec 2013 17:34:58 +0000 (17:34 +0000)]
Added canvas.fillStyle with support for just the "#RRGGBB" style of colors.
Also renamed drawRect to fillRect, which now take x,y,w,h parameters.
BUG=
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/
108813004
git-svn-id: http://skia.googlecode.com/svn/trunk@12621
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 11 Dec 2013 17:05:23 +0000 (17:05 +0000)]
Fix SampleApp bounding box hierarchy shortcut collision.
'b' is currently bound to the AA toggle, AND to the bounding box
hierachy toggle.
The CL switches BBH to 'B', and fixes a deferred title update issue.
R=reed@google.com, robertphillips@google.com
Author: fmalita@chromium.org
Review URL: https://codereview.chromium.org/
112903002
git-svn-id: http://skia.googlecode.com/svn/trunk@12620
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Wed, 11 Dec 2013 15:35:41 +0000 (15:35 +0000)]
be more careful about OOB source pixels in the scanline rescaler, and
less certain about why the standalone scaler might have faileds
BUG=
R=reed@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/
100473011
git-svn-id: http://skia.googlecode.com/svn/trunk@12619
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Wed, 11 Dec 2013 15:30:24 +0000 (15:30 +0000)]
add more tests for discardable caches
BUG=
R=halcanary@google.com
Review URL: https://codereview.chromium.org/
112833003
git-svn-id: http://skia.googlecode.com/svn/trunk@12618
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Wed, 11 Dec 2013 07:02:06 +0000 (07:02 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12617
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 23:06:54 +0000 (23:06 +0000)]
Avoid heap allocation in SkPictureStateTree constructor
This makes empty state trees cheaper. ~1% improvement on rasterize_and_record_micro.key_silk_cases on Android.
BUG=1772
R=tomhudson@chromium.org, tomhudson@google.com
Author: skyostil@chromium.org
Review URL: https://codereview.chromium.org/
111573002
git-svn-id: http://skia.googlecode.com/svn/trunk@12616
2bbb7eff-a529-9590-31e7-
b0007b416f81
fmalita@google.com [Tue, 10 Dec 2013 22:25:53 +0000 (22:25 +0000)]
More signed/unsigned comparison warnings.
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/
100103006
git-svn-id: http://skia.googlecode.com/svn/trunk@12615
2bbb7eff-a529-9590-31e7-
b0007b416f81
fmalita@google.com [Tue, 10 Dec 2013 22:12:40 +0000 (22:12 +0000)]
Fix warning after
bbe43a9ce051.
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/
108973006
git-svn-id: http://skia.googlecode.com/svn/trunk@12614
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 21:51:06 +0000 (21:51 +0000)]
Add SkTileGridPicture SampleApp playback support.
SampleApp already supports switching to a bbox hierarchy playback mode
('b' shortcut). This CL adds an SkTileGridPicture bbox mode.
R=reed@google.com, robertphillips@google.com, fmalita@google.com
Author: fmalita@chromium.org
Review URL: https://codereview.chromium.org/
108513006
git-svn-id: http://skia.googlecode.com/svn/trunk@12613
2bbb7eff-a529-9590-31e7-
b0007b416f81
halcanary@google.com [Tue, 10 Dec 2013 21:11:12 +0000 (21:11 +0000)]
Sk_API for SkImageGenerator and SkInstallDiscardablePixelRef
Added SK_API to SkImageGenerator (already in include/).
Moved SkDiscardablePixelRef::Install to SkInstallDiscardablePixelRef,
added SK_API to that function, and moved declaration to
SkImageGenerator.h
This keeps the SkDiscardablePixelRef internal to Skia, but exposes a
method to install it into a bitmap.
Modifed tests that rely on this functio to use new version.
BUG=
R=mtklein@google.com, reed@google.com
Review URL: https://codereview.chromium.org/
111713002
git-svn-id: http://skia.googlecode.com/svn/trunk@12612
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 20:37:41 +0000 (20:37 +0000)]
Support MSAA4 and (non-ES) OpenGL in Android SampleApp
Add a menu item to set the OpenGL context type that SampleApp uses on
Android. The submenu of the new item will present options to create
OpenGL ES or OpenGL, aliased or multisampled.
R=djsollen@google.com, bsalomon@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/
60273006
git-svn-id: http://skia.googlecode.com/svn/trunk@12610
2bbb7eff-a529-9590-31e7-
b0007b416f81
halcanary@google.com [Tue, 10 Dec 2013 18:33:07 +0000 (18:33 +0000)]
Implement SkAshmemDiscardableMemory
- Implement ashmem-backed SkDiscardableMemory subclass:
This class in only accesible via the SkDiscardableMemory::Create()
function, which replaces the mock implementation in
SkDiscardableMemory_none.cpp
- Added SkDiscardableMemory_ashmem.cpp to the Android port of Skia
Removed SkDiscardableMemory_none.cpp from the Android port.
- Added DiscardableMemoryTest.
Still needs work.
- SkDiscardablePixelRef Bugfix:
onLockPixels() now calls SkDELETE on the SkDiscardableMemory pointer
when it fails to unlock.
- Improved documentation inside ashmem.h
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/
83563002
git-svn-id: http://skia.googlecode.com/svn/trunk@12608
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Tue, 10 Dec 2013 18:09:36 +0000 (18:09 +0000)]
improve bitmap font support (FreeType only)
This commit improves SkFontHost_FreeType's support for bitmap fonts,
adding a number of features:
- Intelligent bitmap strike selection.
- Inter-strike bitmap font scaling.
- Colour bitmap font support (FreeType 2.5.0+).
BUG=
R=reed@google.com
Review URL: https://codereview.chromium.org/
23684041
git-svn-id: http://skia.googlecode.com/svn/trunk@12607
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 17:59:04 +0000 (17:59 +0000)]
Revert of https://codereview.chromium.org/
111853003/
Reason for revert: Was not the culprit.
R=bungeman@google.com, reed@google.com
TBR=bungeman@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
102243009
git-svn-id: http://skia.googlecode.com/svn/trunk@12606
2bbb7eff-a529-9590-31e7-
b0007b416f81
vandebo@chromium.org [Tue, 10 Dec 2013 17:22:41 +0000 (17:22 +0000)]
Revert "[PDF] Fix font embedding restrictions."
This reverts r12600 and r12601, likely causing crash on Mac.
Review URL: https://codereview.chromium.org/
111893002
git-svn-id: http://skia.googlecode.com/svn/trunk@12604
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 17:08:55 +0000 (17:08 +0000)]
Revert of https://codereview.chromium.org/
109033002/
Reason for revert: I suspect this is causing GM to crash on Mac.
R=bungeman@google.com, reed@google.com
TBR=bungeman@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
111853003
git-svn-id: http://skia.googlecode.com/svn/trunk@12603
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Tue, 10 Dec 2013 16:53:13 +0000 (16:53 +0000)]
change 'n' toggle to cycle through all filterlevels
BUG=
R=humper@google.com
Review URL: https://codereview.chromium.org/
109473004
git-svn-id: http://skia.googlecode.com/svn/trunk@12602
2bbb7eff-a529-9590-31e7-
b0007b416f81
vandebo@chromium.org [Tue, 10 Dec 2013 16:49:25 +0000 (16:49 +0000)]
Fix missing ; in win code.
Review URL: https://codereview.chromium.org/
104533005
git-svn-id: http://skia.googlecode.com/svn/trunk@12601
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 16:32:06 +0000 (16:32 +0000)]
[PDF] Fix font embedding restrictions.
Stop using restricted font outlines and honor don't subset restriction.
R=reed@google.com, bungeman@google.com
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/
107863002
git-svn-id: http://skia.googlecode.com/svn/trunk@12600
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 16:27:44 +0000 (16:27 +0000)]
Shut up the CoreText performance note.
Aped from https://codereview.qt-project.org/70097
Please keep in mind: https://www.google.com/search?q=i+have+no+idea+what+i'm+doing+dog&tbm=isch
BUG=
R=bungeman@google.com, reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
109033002
git-svn-id: http://skia.googlecode.com/svn/trunk@12599
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Tue, 10 Dec 2013 15:51:43 +0000 (15:51 +0000)]
Fix error in r12597 (can't forget that newline at the end of a file)
git-svn-id: http://skia.googlecode.com/svn/trunk@12598
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Tue, 10 Dec 2013 15:19:32 +0000 (15:19 +0000)]
New Composite CSS border object
https://codereview.chromium.org/
86263003/
git-svn-id: http://skia.googlecode.com/svn/trunk@12597
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 14:53:16 +0000 (14:53 +0000)]
Add support for reading a directory of images with --expectations (-r).
DM writes out its images in a hierarchy that's a little different than GM,
so this can't read GM's output. But it can read its own, written with -w.
Example usage:
$ out/Release/dm -w /tmp/baseline
$ out/Release/dm -r /tmp/baseline -w /tmp/new
(and optionally)
$ mkdir /tmp/diff; out/Release/skdiff /tmp/baseline /tmp/new /tmp/diff
GM's IndividualImageExpectationsSource and Expectations are a little too eager
about decoding and hashing the expected images, so I took the opportunity to
add DM::Expectations that mostly replaces skiagm::ExpectationsSource and
skiagm::Expectations in DM. It mainly exists to move the image decoding and
comparison off the main thread, which would otherwise be a major speed
bottleneck.
I tried to use skiagm code where possible. One notable place where I differed
is in this new feature. When -r is a directory of images, DM does no hashing.
It considerably faster to read the expected file into an SkBitmap and do a
byte-for-byte comparison than to hash the two bitmaps and check those.
The example usage above isn't quite working 100% yet. Expectations on some GMs
fail, even with no binary change. I haven't pinned down whether this is due to
- a bug in DM
- flaky GMs
- unthreadsafe GMs
- flaky image decoding
- unthreadsafe image decoding
- something else
but I intend to. Leon, Derek and I have suspected PNG decoding isn't
threadsafe, but are as yet unable to prove it.
I also seem to be able to cause malloc to fail on my laptop if I run too many
configs at once, though I never seem to be using more than ~1G of RAM. Will
track that down too.
BUG=
R=reed@google.com, bsalomon@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/
108963002
git-svn-id: http://skia.googlecode.com/svn/trunk@12596
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 14:13:03 +0000 (14:13 +0000)]
Add a canvas object with drawRect() and inval().
BUG=
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/
110693002
git-svn-id: http://skia.googlecode.com/svn/trunk@12595
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Tue, 10 Dec 2013 12:56:56 +0000 (12:56 +0000)]
Add clipped-bitmap-shaders-*-hq_angle.png to ignore-tests.txt
git-svn-id: http://skia.googlecode.com/svn/trunk@12594
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 12:54:21 +0000 (12:54 +0000)]
Correct baseline images for new "bitmapshaders" test
(SkipBuildbotRuns)
NOTRY=True
BUG=
R=djsollen@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
110643002
git-svn-id: http://skia.googlecode.com/svn/trunk@12593
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 12:53:56 +0000 (12:53 +0000)]
Add support for MIPS to android build
R=borenet@google.com, scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/
109323004
git-svn-id: http://skia.googlecode.com/svn/trunk@12592
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Tue, 10 Dec 2013 12:53:39 +0000 (12:53 +0000)]
Make GrBicubicEffect take tile modes rather than GrTextureParams.
GrTextureParams allows the caller to override the filter mode. But no filtering other than nearest neighbor makes sense.
Also removes coord set from creation signature since it is unused.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
99523008
git-svn-id: http://skia.googlecode.com/svn/trunk@12591
2bbb7eff-a529-9590-31e7-
b0007b416f81
skia.committer@gmail.com [Tue, 10 Dec 2013 07:02:03 +0000 (07:02 +0000)]
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12590
2bbb7eff-a529-9590-31e7-
b0007b416f81
vandebo@chromium.org [Mon, 9 Dec 2013 23:22:15 +0000 (23:22 +0000)]
[PDF] PDF rasterizers fed garbage data in release mode.
BUG=skia:1885
TBR=epoger@google.com
Review URL: https://codereview.chromium.org/
103213007
git-svn-id: http://skia.googlecode.com/svn/trunk@12589
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 9 Dec 2013 22:29:30 +0000 (22:29 +0000)]
support scaledimagecache instantiable using discardablememory
Add this to your build/gyp system to use discardable instead of malloc+budget
#define SK_USE_DISCARDABLE_SCALEDIMAGECACHE
R=halcanary@google.com
Review URL: https://codereview.chromium.org/
105933003
git-svn-id: http://skia.googlecode.com/svn/trunk@12588
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 9 Dec 2013 22:09:41 +0000 (22:09 +0000)]
add
git-svn-id: http://skia.googlecode.com/svn/trunk@12587
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 9 Dec 2013 22:01:03 +0000 (22:01 +0000)]
make info real in SkPixelRef, and add bitmap::asImageInfo
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/
108663004
git-svn-id: http://skia.googlecode.com/svn/trunk@12586
2bbb7eff-a529-9590-31e7-
b0007b416f81
epoger@google.com [Mon, 9 Dec 2013 21:02:11 +0000 (21:02 +0000)]
GM expectations: create initial empty expectations for Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release-Valgrind
(SkipBuildbotRuns)
TBR=djsollen
Review URL: https://codereview.chromium.org/
100643003
git-svn-id: http://skia.googlecode.com/svn/trunk@12585
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 9 Dec 2013 20:52:47 +0000 (20:52 +0000)]
add hq clipped biptmap shader GMs to ignored-tests.txt
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/
93633003
git-svn-id: http://skia.googlecode.com/svn/trunk@12584
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Mon, 9 Dec 2013 20:52:40 +0000 (20:52 +0000)]
New Nexus4 baselines due to r12571.
R=robertphillips
Review URL: https://codereview.chromium.org/
110603003
git-svn-id: http://skia.googlecode.com/svn/trunk@12583
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 9 Dec 2013 20:41:00 +0000 (20:41 +0000)]
Mark rrect_clip_aa, skbug1719, and pathopsskpclip as ignored on N4 gpu
BUG=skia:1888
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/
107843003
git-svn-id: http://skia.googlecode.com/svn/trunk@12582
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Mon, 9 Dec 2013 20:35:03 +0000 (20:35 +0000)]
Revert the revert of (ARM Skia NEON patches - 34 - Blur Filter - https://codereview.chromium.org/
109403004/)
git-svn-id: http://skia.googlecode.com/svn/trunk@12581
2bbb7eff-a529-9590-31e7-
b0007b416f81
reed@google.com [Mon, 9 Dec 2013 20:31:50 +0000 (20:31 +0000)]
cast -1 to Mode to avoid warning (enum compared to signed int)
git-svn-id: http://skia.googlecode.com/svn/trunk@12580
2bbb7eff-a529-9590-31e7-
b0007b416f81
robertphillips@google.com [Mon, 9 Dec 2013 20:16:17 +0000 (20:16 +0000)]
Reverting r12568 (ARM Skia NEON patches - 34 - Blur Filter - https://codereview.chromium.org/
109403004) due to image quality regressions on the N4.
git-svn-id: http://skia.googlecode.com/svn/trunk@12578
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Mon, 9 Dec 2013 19:30:28 +0000 (19:30 +0000)]
Fix one too many levels of indirection introduced in 12573.
git-svn-id: http://skia.googlecode.com/svn/trunk@12577
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 9 Dec 2013 19:15:37 +0000 (19:15 +0000)]
Do not use GrBicubic effect when downscaling. Also, don't use glTexStorage as it interferes with deleyed mipmap generation.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
105353002
git-svn-id: http://skia.googlecode.com/svn/trunk@12576
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 9 Dec 2013 19:08:44 +0000 (19:08 +0000)]
adding to whitespace.txt using a pure git checkout
(SkipBuildbotRuns)
BUG=
R=rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/
110553002
git-svn-id: http://skia.googlecode.com/svn/trunk@12574
2bbb7eff-a529-9590-31e7-
b0007b416f81
bungeman@google.com [Mon, 9 Dec 2013 18:58:31 +0000 (18:58 +0000)]
Fix threading issue in DirectWrite port initialization.
The DirectWrite port maintains a global instance of an IDWriteFactory,
which is used to create all other DirectWrite objects. However, the
initialization of this object is not currently thread safe.
R=caryclark@google.com
Review URL: https://codereview.chromium.org/
107963003
git-svn-id: http://skia.googlecode.com/svn/trunk@12573
2bbb7eff-a529-9590-31e7-
b0007b416f81
bsalomon@google.com [Mon, 9 Dec 2013 18:48:51 +0000 (18:48 +0000)]
fix file names in gpu.gypi
Review URL: https://codereview.chromium.org/
99193004
git-svn-id: http://skia.googlecode.com/svn/trunk@12572
2bbb7eff-a529-9590-31e7-
b0007b416f81
senorblanco@chromium.org [Mon, 9 Dec 2013 18:31:42 +0000 (18:31 +0000)]
Implement srcRect and dstRect functionality in SkBitmapSource. This is required for the "preserveAspectRatio" options of SVG's feImage. Covered by new GM "bitmapsource".
This also includes some changes to the xfermodeimagefilter and tileimagefilter GMs to properly handle the CTM. This worked before only because SkBitmapSource was ignoring the CTM. Now that it respects it, we need to give the correct transform. This also means the GMs now work while zoomed. It also implements CTM support for SkTileImageFilter.
NOTE: this will require rebaselining a number of imagefilter GMs on Nexus4, since they render in perspective (using the CTM). The changes to the results should all be improvements.
R=reed@google.com, robertphillips@google.com
Review URL: https://codereview.chromium.org/
106933002
git-svn-id: http://skia.googlecode.com/svn/trunk@12571
2bbb7eff-a529-9590-31e7-
b0007b416f81
commit-bot@chromium.org [Mon, 9 Dec 2013 17:03:02 +0000 (17:03 +0000)]
Make texture domain a helper so that it can be incorporated into other effects.
R=robertphillips@google.com, jvanverth@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/
98893006
git-svn-id: http://skia.googlecode.com/svn/trunk@12569
2bbb7eff-a529-9590-31e7-
b0007b416f81