f04c40ef1e
Fixed xoom bug introduced in r5830
...
https://codereview.appspot.com/6604053/
git-svn-id: http://skia.googlecode.com/svn/trunk@5862 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-09 17:40:32 +00:00
a1c3d78f22
Remove gainFocus() and setMatrixClip() virtuals from SkDevice.
...
R=reed@google.com ,robertphillips@google.com
Review URL: https://codereview.appspot.com/6636050
git-svn-id: http://skia.googlecode.com/svn/trunk@5861 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-09 14:20:37 +00:00
6aea33f92c
checkpoint for shape ops
...
at minimum, the unit tests in SimplyNew_Test pass
git-svn-id: http://skia.googlecode.com/svn/trunk@5860 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-09 14:11:58 +00:00
9598f4256d
fix filter for ios
...
Review URL: https://codereview.appspot.com/6635047
git-svn-id: http://skia.googlecode.com/svn/trunk@5859 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-09 12:32:37 +00:00
f467ce7bc3
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5858 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-09 02:01:37 +00:00
0e354aacd8
Remove external matrix feature.
...
We haven't been testing this for nearly two years.
R=reed@google.com
Review URL: https://codereview.appspot.com/6640044
git-svn-id: http://skia.googlecode.com/svn/trunk@5857 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-08 20:44:25 +00:00
a834746cc1
Make additional code paths go through GrDrawState helper classes for their matrix manipulations.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6615064
git-svn-id: http://skia.googlecode.com/svn/trunk@5856 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-08 18:59:39 +00:00
042aff872a
Speculative fix for Chrome bug
...
https://codereview.appspot.com/6632045/
git-svn-id: http://skia.googlecode.com/svn/trunk@5855 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-08 18:42:14 +00:00
2fdcdeb867
Make GrDrawState::AutoRestoreViewMatrix handle sampler matrices.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6618065
git-svn-id: http://skia.googlecode.com/svn/trunk@5853 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-08 17:15:55 +00:00
0f11e1ab5b
Remove translate param from GrContext::drawPath (and subsequent calls).
...
Review URL: https://codereview.appspot.com/6615062
git-svn-id: http://skia.googlecode.com/svn/trunk@5852 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-08 14:48:36 +00:00
a5b7cc00b9
Remove unnecessary function declaration.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6593082
git-svn-id: http://skia.googlecode.com/svn/trunk@5851 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-08 14:41:10 +00:00
e21a68df5b
Fix typo in SkFontHost_win_dw.cpp.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5850 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-07 22:51:21 +00:00
a18ed03218
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5848 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-06 02:05:26 +00:00
5b3e890c37
Move some auto restore helpers from GrDrawTarget to GrDrawState.
...
R=robertphillips@google.com
git-svn-id: http://skia.googlecode.com/svn/trunk@5846 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 20:13:28 +00:00
c7448cef09
GrPaint encapsulation.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6624052
git-svn-id: http://skia.googlecode.com/svn/trunk@5838 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 19:04:13 +00:00
ffca6ce0e2
No hinting on Mac should be lower priority than subpixel rendering.
...
https://codereview.appspot.com/6612056/
git-svn-id: http://skia.googlecode.com/svn/trunk@5836 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 18:43:58 +00:00
903a4e28b0
Fix find/replace missed in #ifdef'ed out code in r5827.
...
Unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@5834 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 18:08:27 +00:00
254eae2b04
Change SkLightingImageFilter to derive from SkSingleInputImageFilter, so that it can participate in filter DAGs.
...
No tests yet.
Review URL: https://codereview.appspot.com/6620055
git-svn-id: http://skia.googlecode.com/svn/trunk@5832 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 17:38:00 +00:00
8b129aa337
Moved paint color to vertex colors for batched rects
...
https://codereview.appspot.com/6620045/
git-svn-id: http://skia.googlecode.com/svn/trunk@5830 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 15:37:00 +00:00
3f5d682191
cleanup coding style for r5825
...
Review URL: https://codereview.appspot.com/6621054
git-svn-id: http://skia.googlecode.com/svn/trunk@5829 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 15:19:27 +00:00
88becf450f
Rename GrPaint fields/enums/members texture->color mask->coverage.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6615046
git-svn-id: http://skia.googlecode.com/svn/trunk@5827 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 14:54:42 +00:00
6f1dbff980
Reduce Android Log Spam.
...
The logging of system fonts is now hidden behind a #define
Review URL: https://codereview.appspot.com/6609048
git-svn-id: http://skia.googlecode.com/svn/trunk@5825 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 14:48:32 +00:00
43859d5774
Adds a script to help analyze bench ranges to add/change in bench/bench_expectations.txt
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5824 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 14:02:33 +00:00
af84e748ce
Move setPaint from GrContext to GrDrawState.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6624045
git-svn-id: http://skia.googlecode.com/svn/trunk@5823 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 13:23:24 +00:00
dda28c9bde
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5821 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-05 02:01:40 +00:00
b1a72cb90a
Remove state from SkColorSpaceLuminance to avoid memory management.
...
https://codereview.appspot.com/6610047/
git-svn-id: http://skia.googlecode.com/svn/trunk@5820 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 22:03:41 +00:00
30efb8a94f
Do not do PNG encoding/decoding when testing picture serialization.
...
Fixes the build.
Review URL: https://codereview.appspot.com/6624046
git-svn-id: http://skia.googlecode.com/svn/trunk@5819 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 22:02:46 +00:00
5a7c6be72b
Add the ability to provide function pointers to SkPicture serialization
...
and deserialization for encoding and decoding bitmaps.
Remove kForceFlattenBitmapPixels_Flag, which is no longer used.
When an SkOrderedReadBuffer needs to read a bitmap, if it does not
have an image decoder, use a dummy bitmap.
In GM, add a tolerance option for color differences, used when
testing picture serialization, so it can assume two images are the
same even though PNG encoding/decoding may have resulted in small
differences.
Create dummy implementations for SkImageDecoder and SkImageEncoder
functions in SkImageDecoder_empty so that a project that does not
want to include the images project it can still build.
Allow ports to build without images project.
In Mac's image encoder, copy 4444 to 8888 before encoding.
Add SkWriter32::reservePad, to provide a pointer to write non 4 byte
aligned data, padded with zeroes.
In bench_ and render_ pictures, pass decode function to SkPicture
creation from a stream.
BUG=https://code.google.com/p/skia/issues/detail?id=842
Review URL: https://codereview.appspot.com/6551071
git-svn-id: http://skia.googlecode.com/svn/trunk@5818 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 21:46:08 +00:00
94bc60f986
Lock gFTMutex when modifying FT globals.
...
This prevents a crash when running bench_pictures with multiple threads.
Also remove an unused function and fix a typo in SkFontHost.
Review URL: https://codereview.appspot.com/6625043
git-svn-id: http://skia.googlecode.com/svn/trunk@5816 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 20:45:06 +00:00
d5d69ffaea
Add convenience function on GrDrawState to set state bit based on a bool.
...
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6615044
git-svn-id: http://skia.googlecode.com/svn/trunk@5815 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 19:42:00 +00:00
9f7827fcd9
Build fix: work around what appears to be an Intel GLSL driver bug. Unreviewed.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5812 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 18:15:15 +00:00
837ec432cc
Fixed bug(s) in batching of rects
...
https://codereview.appspot.com/6608043/
git-svn-id: http://skia.googlecode.com/svn/trunk@5811 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 17:57:05 +00:00
7823d9a07f
Disable SK_DEBUG_PATH_REF in debug builds.
...
R=reed@google.com
Review URL: https://codereview.appspot.com/6602056
git-svn-id: http://skia.googlecode.com/svn/trunk@5810 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 17:55:30 +00:00
3bc16c8bc1
Implement GPU path for matrix convolution. Note that when not convolving alpha,
...
the premultiplying is done less efficiently than in the raster path: it's
done on each texture access, rather than as a pre-processing pass. This was
so I could do the filter as a single custom stage; will try the optimization
separately.
This implementation gives a ~30X speedup on the GPU results for the
matrixconvolution bench (~10X due to the GPU, and ~3X due to texture
uploads/readback removal).
Note: this changes the matrixconvolution for the software path as well, so
it will likely break the bots until that test is rebaselined.
Review URL: https://codereview.appspot.com/6585069/
git-svn-id: http://skia.googlecode.com/svn/trunk@5809 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 17:18:20 +00:00
3fc070cfce
Change default skia_osx_sdkroot to "macosx" (suitable for Xcode 3.2.6+)
...
See https://codereview.appspot.com/6553044
BUG=https://code.google.com/p/skia/issues/detail?id=796
Review URL: https://codereview.appspot.com/6598055
git-svn-id: http://skia.googlecode.com/svn/trunk@5806 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 14:50:18 +00:00
e6e62d1de9
Make numTextures() be non-virtual on GrCustomStage.
...
R=tomhudson@google.com ,robertphillips@google.com,senorblanco@chromium.org
Review URL: https://codereview.appspot.com/6586081
git-svn-id: http://skia.googlecode.com/svn/trunk@5805 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 14:38:48 +00:00
73d5b2f620
Omit shader swizzle if it is rgba.
...
R=robertphilips@google.com
Review URL: https://codereview.appspot.com/6585082
git-svn-id: http://skia.googlecode.com/svn/trunk@5804 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 13:26:32 +00:00
c7e4a5a02a
Created filter command line tool
...
https://codereview.appspot.com/6595066/
git-svn-id: http://skia.googlecode.com/svn/trunk@5803 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 13:00:33 +00:00
4663822bc9
Allow Xcode to change paths to frameworks based on whether a device or simulator was selected.
...
R=caryclark@google.com
Review URL: https://codereview.appspot.com/6590068
git-svn-id: http://skia.googlecode.com/svn/trunk@5802 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 12:52:03 +00:00
7cc7f49479
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5798 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 02:01:34 +00:00
3a80991b81
Ensure SkPathRef debug code mutex is initialized during creation of statically-initialized SkPaths.
...
R=reed@google.com
Review URL: https://codereview.appspot.com/6592069
git-svn-id: http://skia.googlecode.com/svn/trunk@5797 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 21:37:30 +00:00
c6445a17ab
Make it possible to generate the ios xcode proj by specifying only skia_os="ios" in GYP_DEFINES.
...
R=caryclark@google.com ,epoger@google.com
Review URL: https://codereview.appspot.com/6601051
git-svn-id: http://skia.googlecode.com/svn/trunk@5796 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 20:58:26 +00:00
1ba274d9f3
revert 5794
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5795 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 20:40:38 +00:00
4837724a7e
add test for rotated saveLayer, to see that we clip against the specified bounds
...
(hint: we don't at the moment)
git-svn-id: http://skia.googlecode.com/svn/trunk@5794 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 20:17:22 +00:00
ae09f2dc3f
Adds extra debugging to SkPathRef that can optionally be turned on in a release build.
...
This is pretty hacky but hopefully will be quite short-lived.
Review URL: https://codereview.appspot.com/6584074
git-svn-id: http://skia.googlecode.com/svn/trunk@5793 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 19:57:01 +00:00
2fc2359aaa
Fix test_small_segments3 path measure test.
...
Review URL: https://codereview.appspot.com/6601050
git-svn-id: http://skia.googlecode.com/svn/trunk@5792 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 19:10:31 +00:00
b6e806bf17
Allow render_pictures to render using multiple threads.
...
Make write() a static function so it can be used by the
thread entry functions.
Add a helper function to append a number to a string and
call write to share code.
Review URL: https://codereview.appspot.com/6589062
git-svn-id: http://skia.googlecode.com/svn/trunk@5789 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 17:32:33 +00:00
1dfe88e00a
Revert r5557 (which itself was a revert of r5433). Relands SkPathRef. Will follow with change for extra debug checks to attempt to ferret out http://www.crbug.com/148637 .
...
git-svn-id: http://skia.googlecode.com/svn/trunk@5783 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 13:46:20 +00:00
924352685d
Added bench to replicate Google spreadsheet-style table drawing
...
https://codereview.appspot.com/6593076/
git-svn-id: http://skia.googlecode.com/svn/trunk@5782 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 13:25:13 +00:00
4f45258d45
Delete SkStream_Win.h as it appears to never have been used.
...
https://code.google.com/p/skia/issues/detail?id=281
git-svn-id: http://skia.googlecode.com/svn/trunk@5781 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 04:46:10 +00:00
robertphillips@google.com
bsalomon@google.com
caryclark@google.com
skia.committer@gmail.com
tfarina@chromium.org
bungeman@google.com
senorblanco@chromium.org
djsollen@google.com
bensong@google.com
scroggo@google.com
epoger@google.com
reed@google.com