caryclark@google.com
11f6614727
add missing dependency
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4276 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-18 14:40:51 +00:00
reed@google.com
1bdf7fe8f6
tools/pinspect: quick tool to inspeact the header (and rough validity) of 1 or more picture files
...
Review URL: https://codereview.appspot.com/6295085
git-svn-id: http://skia.googlecode.com/svn/trunk@4258 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-14 18:58:40 +00:00
junov@chromium.org
777442d52e
Adding the render_pictures test tool
...
Submitted on behalf of keyar@chromium.org
Review URL: https://codereview.appspot.com/6300056/
git-svn-id: http://skia.googlecode.com/svn/trunk@4235 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 14:56:36 +00:00
robertphillips@google.com
f6747b0b90
Split GrContext's AA Rect drawing methods into helper class
...
http://codereview.appspot.com/6300070/
git-svn-id: http://skia.googlecode.com/svn/trunk@4233 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 00:32:28 +00:00
tomhudson@google.com
f2e91a3907
Dilate & Erode benchmarks. Unlike the blur benchmarks (which test
...
Convolution), they show no improvement from unrolling the GLSL loops
in src/gpu/effects/GrMorphologyEffect.cpp
http://codereview.appspot.com/6299067/
git-svn-id: http://skia.googlecode.com/svn/trunk@4230 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 19:22:01 +00:00
bsalomon@google.com
19bbd3d02e
Null canvas
...
Review URL: http://codereview.appspot.com/6117051/
git-svn-id: http://skia.googlecode.com/svn/trunk@4220 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:39:15 +00:00
bsalomon@google.com
64aef2bacd
Towards NV path rendering
...
Review URL: http://codereview.appspot.com/6302049/
git-svn-id: http://skia.googlecode.com/svn/trunk@4219 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-11 15:36:13 +00:00
scroggo@google.com
b073d920c9
Add a tiled pipe mode to SampleApp.
...
Using the "Pipe" checkbox in SamleApp, you can now
toggle amongst three states: no pipe, a normal pipe
(or others depending on #defines), and a tiled pipe.
You can also use shift + p to toggle.
Review URL: https://codereview.appspot.com/6303055
git-svn-id: http://skia.googlecode.com/svn/trunk@4213 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-08 15:35:03 +00:00
reed@google.com
83226976b5
extend asAGradient for Conical type (to be implemented by PDF and XPS)
...
Review URL: https://codereview.appspot.com/6308051
git-svn-id: http://skia.googlecode.com/svn/trunk@4207 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-07 20:26:47 +00:00
scroggo
93b4375fd4
Fix the build for GM.
...
Add src/pipe/utils as an include directory.
git-svn-id: http://skia.googlecode.com/svn/trunk@4200 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 21:26:31 +00:00
scroggo@google.com
72c9672ce2
Add tiled rendering as an option to GM.
...
Use an SkGPipe to play back drawing into tiles.
This will help us to debug differences in drawing
while tiled.
Pass --tiledPipe to gm to use the tiled pipe.
Review URL: https://codereview.appspot.com/6295050
git-svn-id: http://skia.googlecode.com/svn/trunk@4199 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 21:07:10 +00:00
caryclark@google.com
b462a42b6d
Turn more warnings on, including
...
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation
Review URL: https://codereview.appspot.com/6307043
git-svn-id: http://skia.googlecode.com/svn/trunk@4190 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:12:28 +00:00
robertphillips@google.com
977b9c8af3
Instance counting for SkRefCnt-derived objects (w/ CanvasTest fix)
...
http://codereview.appspot.com/6242070/
git-svn-id: http://skia.googlecode.com/svn/trunk@4170 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 19:35:09 +00:00
borenet@google.com
b52cf3dd95
Support Mac-Android Cross-Compilation
...
- Rename Android sampleApp target to SampleAppAndroid to avoid name collision
- Detect skia_os on Darwin to differentiate between xcode and make builds
Review URL: https://codereview.appspot.com/6303044
git-svn-id: http://skia.googlecode.com/svn/trunk@4168 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 17:57:48 +00:00
robertphillips@google.com
25c199343d
Reverting r4162
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4164 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 16:24:32 +00:00
reed@google.com
4384fabab4
add gm (no images yet) for two-point-radial gradients
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4163 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 16:14:23 +00:00
robertphillips@google.com
3227ab5f64
Added instance counting system for SkRefCnt-derived objects
...
http://codereview.appspot.com/6242070/
git-svn-id: http://skia.googlecode.com/svn/trunk@4162 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 15:40:54 +00:00
robertphillips@google.com
941ee9303b
Fixed flattening of SkStippleMaskFilter
...
http://codereview.appspot.com/6279052/
git-svn-id: http://skia.googlecode.com/svn/trunk@4154 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-05 12:55:05 +00:00
scroggo@google.com
5af9b2032b
Make the GM tool run GMs through an SkGPipe.
...
Add pipe to core gyp project.
Do not run samplerstress through the pipe, since its
custom MaskFilter will not draw correctly.
Fix an assert in SkGPipeWrite when writing a typeface.
Review URL: https://codereview.appspot.com/6276044
git-svn-id: http://skia.googlecode.com/svn/trunk@4139 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 17:17:36 +00:00
reed@google.com
1830c7aa3c
--pictureDir foo will load serialized pictures <>.skp from the foo directory
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4132 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-04 12:05:43 +00:00
bsalomon@google.com
7e5c6249f1
Move GrGpuGL::programUnitTest into its own file
...
Review URL: http://codereview.appspot.com/6272043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4124 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-01 19:28:26 +00:00
djsollen@google.com
9714516a0d
Add SkFontDescriptor for serializing fonts.
...
Review URL: https://codereview.appspot.com/6250080
git-svn-id: http://skia.googlecode.com/svn/trunk@4106 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 19:55:08 +00:00
tomhudson@google.com
7fab52d4c7
Add GrGradientEffects files. These implementations will be invoked from
...
GrGLPrograms in a further change, replacing the current CoordMapping
enums.
http://codereview.appspot.com/6250081/
git-svn-id: http://skia.googlecode.com/svn/trunk@4104 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 19:40:13 +00:00
bungeman@google.com
30140a43e2
Enable typeface from stream test for Mac.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4103 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 19:10:30 +00:00
bsalomon@google.com
b505a128ef
Implement morphology as a custom effect
...
Review URL: http://codereview.appspot.com/6250073/
git-svn-id: http://skia.googlecode.com/svn/trunk@4102 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 18:40:36 +00:00
bsalomon@google.com
5739d2c168
Merge GrGpuGLShaders into its parent class, GrGpuGL
...
Review URL: http://codereview.appspot.com/6245076/
git-svn-id: http://skia.googlecode.com/svn/trunk@4095 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 15:07:19 +00:00
bsalomon@google.com
9aabfc789e
Use a single GrDrawState in GrContext for direct and buffered drawing
...
Review URL: http://codereview.appspot.com/5933043
git-svn-id: http://skia.googlecode.com/svn/trunk@4091 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 14:12:46 +00:00
caryclark@google.com
e5720e3202
suppress warning on Mac
...
http://codereview.appspot.com/6245070/
M gyp/common_conditions.gypi
git-svn-id: http://skia.googlecode.com/svn/trunk@4087 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 12:39:18 +00:00
djsollen@google.com
dde718c558
Add bench to test the performance of creating a picture.
...
Review URL: https://codereview.appspot.com/6258062
git-svn-id: http://skia.googlecode.com/svn/trunk@4076 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-30 16:50:11 +00:00
digit@google.com
eec9dbcace
arm: First step towards dynamic NEON support.
...
This patch adds minimal support for dynamic ARM NEON support,
i.e. the ability to probe the CPU at runtime for NEON and
provide alternate code paths when it is available.
- Add include/core/SkUtilsArm.h, which declares a few helper
macros (e.g. SK_NEON_ARM_IS_DYNAMIC), plus the handy
function 'sk_cpu_arm_has_neon()' which returns true if
the target CPU supports the ARM NEON instruction set.
Note that the header is in include/core/ because it will
have to be included from NEON-specific code under src/code/
It would probably be more logical to put it under include/opts/
instead, but this would require moving all the NEON-specific
stuff under src/code/ into src/opts/, which is not trivial
due to the way the code is currently architected.
- Add src/core/SkUtilsArm.cpp which implements
'sk_cpu_arm_has_neon' for ARM-based Linux systems, only
when SK_NEON_ARM_IS_DYNAMIC is true.
(For other cases, 'sk_cpu_arm_has_neon' is an inline function
that returns a constant 'true' or 'false' value).
There is no user-level accessible CPUID instruction on ARM,
so do all CPU feature probing by parsing /proc/cpuinfo.
This is Linux-specific.
For Debug build types, the CPU probing result is printed
to the Android log (or Linux command-line) for easier
debugging.
- Create a new 'opts_neon' target (static library) which shall
contain all the NEON-specific code paths for the library.
This is necessary because -mfpu=neon impacts also non-scalar
code. Just like with -mssse3 on x86, we can't build the rest
of the library with this flag.
Note that for now, we only include memset16_neon and
memset32_neon in this library.
- Modify opts_check_arm.cpp to implement SK_ARM_NEON_IS_DYNAMIC
properly.
Compared to a 'xoom' build, the only difference is the use of
NEON-optimized memset16/32 functions. Later patches will move
more NEON-specific code paths to 'opts_neon'.
Review URL: https://codereview.appspot.com/6247058
git-svn-id: http://skia.googlecode.com/svn/trunk@4069 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-30 13:54:41 +00:00
caryclark@google.com
65f9f0a166
shape ops work in progress (get rid of some warnings)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4037 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-23 18:09:25 +00:00
robertphillips@google.com
67febd9506
Converted AAClips SampleApp slide to GM:simpleaaclip
...
http://codereview.appspot.com/6220043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4025 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-22 12:14:50 +00:00
reed@google.com
7b578928a5
~glyphcache_globals needs to actually delete its cache
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4011 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-21 15:29:27 +00:00
caryclark@google.com
b45a1b46ee
shape ops work in progress
...
git-svn-id: http://skia.googlecode.com/svn/trunk@4006 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-18 20:50:33 +00:00
bsalomon@google.com
ae4f96a9e0
Some refactoring of GrCustomStage and friends
...
Review URL: http://codereview.appspot.com/6209071/
git-svn-id: http://skia.googlecode.com/svn/trunk@4003 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-18 19:54:48 +00:00
bungeman@google.com
a550199c6f
CreateTypefaceFromStream for GDI.
...
http://codereview.appspot.com/5616047/
git-svn-id: http://skia.googlecode.com/svn/trunk@4001 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-18 19:06:41 +00:00
reed@google.com
ebd24962df
change SkChunkAlloc to grow its allocations geometrically (not linearly)
...
plus add a bench and unittest for it.
git-svn-id: http://skia.googlecode.com/svn/trunk@3989 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-17 14:28:11 +00:00
reed@google.com
ff793db2ef
move Release build to -O3 (from -O2)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3988 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-17 13:58:26 +00:00
bungeman@google.com
a02bc1519c
WeakRefCnt
...
http://codereview.appspot.com/5649046/
git-svn-id: http://skia.googlecode.com/svn/trunk@3978 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-16 18:21:56 +00:00
robertphillips@google.com
4debcac8c3
Debug Windows compiler complaint fixes
...
http://codereview.appspot.com/6208055/
git-svn-id: http://skia.googlecode.com/svn/trunk@3924 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-14 16:33:36 +00:00
bungeman@google.com
5548752100
Add bench and test for SkRefCnt.
...
http://codereview.appspot.com/6195071/
This also adds a cross platform SkThread for testing purposes.
git-svn-id: http://skia.googlecode.com/svn/trunk@3921 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-14 14:09:24 +00:00
tomhudson@google.com
f9ad8867f2
Extract ShaderCodeSegments from GrGLProgram into a new class,
...
GrGLShaderBuilder. Begin populating its interface.
Requires gyp changes.
http://codereview.appspot.com/6197076/
git-svn-id: http://skia.googlecode.com/svn/trunk@3916 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-11 20:38:48 +00:00
bsalomon@google.com
7ffe6810c6
Remove tesselated path renderer and supporting code, glu, and libtess target
...
Review URL: http://codereview.appspot.com/6197075/
git-svn-id: http://skia.googlecode.com/svn/trunk@3912 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-11 17:32:43 +00:00
djsollen@google.com
39a7475179
Set no rtti option to avoid warnings on Android.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3905 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-11 13:29:32 +00:00
tomhudson@google.com
d8f856c32b
Move convolution from code in GrGLProgram to new GrConvolutionEffect
...
class. This is the first test of the new Ganesh shader pipeline.
Also includes some cleanup of the gpu.gyp file: added src/gpu, allowing
us to remove ../ from many #include directives.
http://codereview.appspot.com/6199053/
git-svn-id: http://skia.googlecode.com/svn/trunk@3887 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-10 12:13:36 +00:00
robertphillips@google.com
beeb97c94d
Added stack to AA clip mask cache
...
http://codereview.appspot.com/6201058/
git-svn-id: http://skia.googlecode.com/svn/trunk@3885 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-09 21:15:28 +00:00
bsalomon@google.com
637d5e9297
Move GL function prototype typdefs to a separate header
...
Review URL: http://codereview.appspot.com/6189054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3864 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 21:33:56 +00:00
caryclark@google.com
15fa138f22
shape ops work in progress
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3861 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 20:49:36 +00:00
reed@google.com
48ca7e37ef
impl SkTLS for windows, refactoring to share code with pthread impl
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3859 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 20:23:27 +00:00
bsalomon@google.com
91bcc94e87
Make GrGLDefines.h be a private header
...
Review URL: http://codereview.appspot.com/6198048/
git-svn-id: http://skia.googlecode.com/svn/trunk@3851 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 17:28:41 +00:00
bsalomon@google.com
9c1f1ac5d3
Move function decls and macros out of public headers that are meant for internal use.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3849 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 17:09:37 +00:00
reed@google.com
c56a83ca9c
add bench for SkPath::Iter and SkPath::RawIter
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3844 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 13:46:32 +00:00
reed@google.com
35a81dfdb2
add gm for dashing variations
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3842 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-04 21:49:27 +00:00
reed@google.com
4aa1a70ab7
add initial bench for dashing (more work to do)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3841 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-04 16:37:45 +00:00
epoger@google.com
58b8d4a7a8
recreate http://codereview.appspot.com/6131051/ in svn instead of git
...
Review URL: https://codereview.appspot.com/6181044
git-svn-id: http://skia.googlecode.com/svn/trunk@3829 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 14:02:17 +00:00
robertphillips@google.com
d9d5385791
Added GM test to stress test the texture unit/sampler allocation
...
http://codereview.appspot.com/6134058/
git-svn-id: http://skia.googlecode.com/svn/trunk@3814 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 13:55:06 +00:00
robertphillips@google.com
7c2578d392
Second half of refactoring to move SW path rendering to GrPathRenderer
...
http://codereview.appspot.com/6125046/
git-svn-id: http://skia.googlecode.com/svn/trunk@3804 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 12:19:34 +00:00
robertphillips@google.com
443e5a52b7
Re-adding red texture support (by rolling back r3800)
...
http://code.google.com/p/skia/source/detail?r=3622 - for original review
http://crbug.com/125596 ('M20 windows renderer stability maze') - for issue
git-svn-id: http://skia.googlecode.com/svn/trunk@3802 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 20:01:21 +00:00
epoger@google.com
0048469578
Roll back http://code.google.com/p/skia/source/detail?r=3622 to deal with http://crbug.com/125596 ('M20 windows renderer stability maze')
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3800 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 19:02:08 +00:00
reed@google.com
8c2cc1a4dd
add RegionBench, in preparation for speeding up intersects and contains for chrome
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3784 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-27 19:29:52 +00:00
bsalomon@google.com
8d033a1b12
Remove GrPath typedef
...
Review URL: http://codereview.appspot.com/6128045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3780 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-27 15:52:53 +00:00
tomhudson@google.com
07eecdca3e
Hooks up the GrCustomStage/GrGLProgramStageFactory/GrGLProgramStage
...
classes from r3726 so they can be used. Does not implement any actual
effect stages.
Has one large known bug: if custom stages are provided, GrSamplerState
comparisons will break; this should preserve correct drawing, but decrease
performance - among other things, we'll break draw batching. To fix this
we'll need a RTTI system for GrCustomState objects, and we'll need to change
the GrSamplerState comparison from a memcmp to something that also does a
deep type-sensitive compare of any GrCustomState objects present.
http://codereview.appspot.com/6074043/
git-svn-id: http://skia.googlecode.com/svn/trunk@3742 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-20 18:35:38 +00:00
bsalomon@google.com
7361f54294
Make GM able to run MSAA modes and multiple GPU configs in a single run.
...
Review URL: http://codereview.appspot.com/6061051/
git-svn-id: http://skia.googlecode.com/svn/trunk@3734 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-19 19:15:35 +00:00
tomhudson@google.com
168e63418c
Infrastructure for new Ganesh shader pipeline: base classes for GPU
...
implementation of user-defined effects.
http://codereview.appspot.com/6052047/
git-svn-id: http://skia.googlecode.com/svn/trunk@3726 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-18 17:49:20 +00:00
robertphillips@google.com
1e945b7e70
Minor refactoring to pull GrClipMaskManager into its own files
...
http://codereview.appspot.com/5978055/
git-svn-id: http://skia.googlecode.com/svn/trunk@3697 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 18:03:03 +00:00
robertphillips@google.com
0dd84a399a
Minor code cleanup of Debug GL Interface
...
http://codereview.appspot.com/6032043/
git-svn-id: http://skia.googlecode.com/svn/trunk@3690 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 16:24:35 +00:00
epoger@google.com
4f8975ea0f
roll out http://code.google.com/p/skia/source/detail?r=3687 because Mac 10.6 bot is failing
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3688 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 15:49:04 +00:00
epoger@google.com
cff7f5bbf5
Make Mac build generate both 32-bit and 64-bit code.
...
BUG=http://code.google.com/p/skia/issues/detail?id=524
Review URL: https://codereview.appspot.com/6022057
git-svn-id: http://skia.googlecode.com/svn/trunk@3687 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 15:14:22 +00:00
bsalomon@google.com
580a99c58f
add gm circles
...
Committed on behalf of Guanqun.Lu@gmail.com
Review URL: http://codereview.appspot.com/6005047/
git-svn-id: http://skia.googlecode.com/svn/trunk@3682 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-16 14:10:47 +00:00
mike@reedtribe.org
6093e65829
dd DrawPathTest to gyp
...
add regression tests for bug 533
git-svn-id: http://skia.googlecode.com/svn/trunk@3678 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-14 12:55:17 +00:00
djsollen@google.com
2b2ede3e71
Decouple the SkFlattenable from SkReader32/SkWriter32.
...
The current impl for SkFlattenable read/write buffers is
that they extend from SkReader32 and SkWriter32, but that
dependency must be abstract if we are to add any other
serialization format.
Review URL: https://codereview.appspot.com/5999045
git-svn-id: http://skia.googlecode.com/svn/trunk@3654 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-12 13:24:04 +00:00
robertphillips@google.com
6995068c5a
Initial version of R8 support
...
http://codereview.appspot.com/5967067/
git-svn-id: http://skia.googlecode.com/svn/trunk@3622 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-06 18:06:10 +00:00
robertphillips@google.com
022976554c
Fix xcode 4.1 build issue
...
http://codereview.appspot.com/5992048/
git-svn-id: http://skia.googlecode.com/svn/trunk@3621 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-05 19:29:04 +00:00
robertphillips@google.com
3a4553ea57
Redelivering r3611 changes (enabling cmyk jpeg changes in .gyps)
...
http://codereview.appspot.com/5967047/
git-svn-id: http://skia.googlecode.com/svn/trunk@3617 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-05 14:52:01 +00:00
robertphillips@google.com
dd743fefad
Initial split up of Debug Interface into separate files
...
http://codereview.appspot.com/5979048/
git-svn-id: http://skia.googlecode.com/svn/trunk@3616 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-05 14:40:53 +00:00
robertphillips@google.com
7800e3008f
Rolling back r3611 until the Android compilation issue is resolved
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3613 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-05 13:38:27 +00:00
robertphillips@google.com
f919147559
Finally enabled libjpeg functionality in .gyps
...
http://codereview.appspot.com/5967047/
git-svn-id: http://skia.googlecode.com/svn/trunk@3611 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-05 13:20:35 +00:00
bsalomon@google.com
3286989f97
Remove old D3D9 stuff
...
Review URL: http://codereview.appspot.com/5966071/
git-svn-id: http://skia.googlecode.com/svn/trunk@3601 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-04 19:05:31 +00:00
junov@chromium.org
26be399261
Fixing gm build with SkXPSDevice enabled
...
REVIEW=http://codereview.appspot.com/5981054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3591 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-03 20:20:47 +00:00
robertphillips@google.com
021bce94a3
Delivering .gyp files to enable building & linking w/ ANGLE on Windows
...
http://codereview.appspot.com/5933057/
git-svn-id: http://skia.googlecode.com/svn/trunk@3580 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-02 20:42:26 +00:00
caryclark@google.com
198e054b33
shape ops work in progress
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3566 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-30 18:47:02 +00:00
bungeman@google.com
5a64e58ebb
Revert 3538.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3539 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 14:51:56 +00:00
bungeman@google.com
29b63dc863
Correct dependencies in gyp files.
...
http://codereview.appspot.com/5934044/
git-svn-id: http://skia.googlecode.com/svn/trunk@3538 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-29 14:28:59 +00:00
bungeman@google.com
998547641c
Move SkColorMatrix to effects.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3535 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 21:14:17 +00:00
bungeman@google.com
802eee956c
Move SkTextBox.h from utils to views.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3531 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 20:01:06 +00:00
robertphillips@google.com
78ff6b4ab6
Moved mac, unix, win and mesa directories under src/gpu/gl
...
http://codereview.appspot.com/5937052/
git-svn-id: http://skia.googlecode.com/svn/trunk@3530 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 19:37:51 +00:00
djsollen@google.com
3d29b6330d
Remove unused classes from the build.
...
Review URL: https://codereview.appspot.com/5938053
git-svn-id: http://skia.googlecode.com/svn/trunk@3529 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 19:36:39 +00:00
robertphillips@google.com
d91f370835
Moved Debug GL interface to src/gpu/gl/debug in preparation for splitting it up.
...
http://codereview.appspot.com/5938054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3526 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 18:22:01 +00:00
caryclark@google.com
988ad539ec
shape ops builders; fix typo
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3521 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 17:04:08 +00:00
caryclark@google.com
a5764233aa
first support at shape ops support for quads
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3520 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 16:20:21 +00:00
bsalomon@google.com
8500322537
disable GPU blur on small paths
...
Change originally by Guanqun.Lu@gmail.com with minor edits and sample added by me
COULD POSSIBLY CHANGE GPU RESULTS OF GM SLIDES WITH BLUR, WILL REBASILINE IF SO.
Review URL: https://codereview.appspot.com/5940045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3514 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 14:44:37 +00:00
caryclark@google.com
11fa4a7095
Files to build Cary's Shape Ops test projects.
...
These will be moved to experimental/Intersection
later.
git-svn-id: http://skia.googlecode.com/svn/trunk@3501 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-27 13:27:36 +00:00
epoger@google.com
4db4adc0e1
Build libjpeg from source for all platforms
...
(We were already doing so on Mac and Windows.)
Review URL: https://codereview.appspot.com/5909067
git-svn-id: http://skia.googlecode.com/svn/trunk@3497 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 20:04:54 +00:00
epoger@google.com
9fee7ad449
Copy libjpeg.gyp from third_party/externals/libjpeg/ to gyp/
...
This should get our use of libjpeg-from-source unblocked; see http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp from Chrome's libjpeg port, rather than making our own copy') for a better long-term solution.
Review URL: https://codereview.appspot.com/5908058
git-svn-id: http://skia.googlecode.com/svn/trunk@3496 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-26 18:29:26 +00:00
djsollen@google.com
41b46be215
Fix android build
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3484 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-23 19:36:53 +00:00
djsollen@google.com
a2ca41e3af
Cleanup Macros arround static initializers for SkFlattenable.
...
This CL also removes an unused debugging function from the class
Review URL: https://codereview.appspot.com/5890043
git-svn-id: http://skia.googlecode.com/svn/trunk@3483 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-23 19:00:34 +00:00
reed@google.com
8926b169f6
apply imagefilter to all draw calls
...
Review URL: https://codereview.appspot.com/5856048
git-svn-id: http://skia.googlecode.com/svn/trunk@3476 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-23 15:36:36 +00:00
bungeman@google.com
5e41b37b23
Remove circular dependency of views and animator.
...
http://codereview.appspot.com/5874056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3473 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-23 14:11:43 +00:00
vandebo@chromium.org
7d6c8f997f
[PDF] Move most of the headers to be private.
...
Compute font stats in SkPDFDocument in order to make more of the headers private.
Previous review: https://codereview.appspot.com/5868049/
Review URL: https://codereview.appspot.com/5875049
git-svn-id: http://skia.googlecode.com/svn/trunk@3470 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-22 20:45:15 +00:00
bungeman@google.com
f85abda8c9
Remove mutual dependency of gr and skgr.
...
http://codereview.appspot.com/5879043/
git-svn-id: http://skia.googlecode.com/svn/trunk@3467 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-22 17:56:29 +00:00
epoger@google.com
c62923d6ad
Move unix_test_app/main.cpp to src/views/unix/skia_unix.cpp
...
Review URL: https://codereview.appspot.com/5881048
git-svn-id: http://skia.googlecode.com/svn/trunk@3466 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-22 15:37:22 +00:00
vandebo@chromium.org
ec1a7fa304
Move SkBitSet to utils.
...
Review URL: https://codereview.appspot.com/5875043
git-svn-id: http://skia.googlecode.com/svn/trunk@3460 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 23:11:46 +00:00
bungeman@google.com
cbd76ae138
Utils must not depend on Views.
...
http://codereview.appspot.com/5867051/
git-svn-id: http://skia.googlecode.com/svn/trunk@3459 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 20:59:49 +00:00
vandebo@chromium.org
76d6de0845
Revert "[PDF] Move most of the headers to be private."
...
This reverts r3457
TBR=epoger@google.com
Review URL: https://codereview.appspot.com/5866051
git-svn-id: http://skia.googlecode.com/svn/trunk@3458 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 20:31:08 +00:00
vandebo@chromium.org
bd960c7f19
[PDF] Move most of the headers to be private.
...
Compute font stats in SkPDFDocument in order to make more of the headers private.
Previous review: https://codereview.appspot.com/5865048/
Review URL: https://codereview.appspot.com/5868049
git-svn-id: http://skia.googlecode.com/svn/trunk@3457 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 19:59:04 +00:00
vandebo@chromium.org
79d3cb4ba7
[PDF] Add GM and infrastructure to test drawing shaders with an initial transform.
...
Previous review at https://codereview.appspot.com/5867047/ and https://codereview.appspot.com/5849045/
TBR=reed@google.com
Review URL: https://codereview.appspot.com/5860044
git-svn-id: http://skia.googlecode.com/svn/trunk@3452 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 17:34:30 +00:00
vandebo@chromium.org
a43a532e94
Revert "[PDF] Add GM and infrastructure to test drawing shaders with an initial transform."
...
This reverts r3450
TBR=reed@google.com
Review URL: https://codereview.appspot.com/5864050
git-svn-id: http://skia.googlecode.com/svn/trunk@3451 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 17:11:27 +00:00
vandebo@chromium.org
b0ccdec166
[PDF] Add GM and infrastructure to test drawing shaders with an initial transform.
...
Review URL: https://codereview.appspot.com/5867047
git-svn-id: http://skia.googlecode.com/svn/trunk@3450 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-21 16:45:47 +00:00
tomhudson@google.com
599445130c
Move SkClampRange into src/effects, where it isn't being advertised as
...
something for end-users.
http://codereview.appspot.com/5864044/
git-svn-id: http://skia.googlecode.com/svn/trunk@3445 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 21:18:43 +00:00
robertphillips@google.com
0a89c90d18
reverting to 3437
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3439 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 15:13:04 +00:00
robertphillips@google.com
d5c9e996df
Fix for CMYK jpeg decoding issue (69 - unable to read some jpeg files on android)
...
http://codereview.appspot.com/5785054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3438 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-20 14:51:47 +00:00
robertphillips@google.com
0da3719050
Added debug GL Interface. This interface tracks various GL objects in order to find leaks & invalid accesses.
...
Core Review: http://codereview.appspot.com/5846049/
git-svn-id: http://skia.googlecode.com/svn/trunk@3426 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-19 14:42:13 +00:00
tomhudson@google.com
8dd90a926a
(SSE2) acceleration for rectangular opaque erases.
...
15% speedup for rectangles < 31 px wide, 5% for larger.
http://codereview.appspot.com/5843050/
git-svn-id: http://skia.googlecode.com/svn/trunk@3423 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-19 13:49:50 +00:00
epoger@google.com
ce47fec10c
Add libjpeg.gyp that wraps third_party/externals/libjpeg/libjpeg.gyp
...
Review URL: https://codereview.appspot.com/5848046
git-svn-id: http://skia.googlecode.com/svn/trunk@3419 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-16 19:01:38 +00:00
epoger@google.com
573e8ba41c
Add os_posix gyp variable, nesting variables dicts as needed to do so.
...
Review URL: https://codereview.appspot.com/5845050
git-svn-id: http://skia.googlecode.com/svn/trunk@3418 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-16 18:28:24 +00:00
bsalomon@google.com
f4a9c82918
Split GrTextContext into baseclass and subclass
...
This is a step towards enabling alternate text rendering code paths (GLyphy in particular)
Committed on behalf of baranowski@chromium.org
Review URL: http://codereview.appspot.com/5796071/
git-svn-id: http://skia.googlecode.com/svn/trunk@3412 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-16 14:02:46 +00:00
epoger@google.com
aa3b6a965e
Make all gyp targets automatically include common.gypi
...
Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too.
Review URL: https://codereview.appspot.com/5820068
git-svn-id: http://skia.googlecode.com/svn/trunk@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-16 13:52:49 +00:00
bsalomon@google.com
1a38d5508f
Perform degenerate check in device coords in convex path renderer
...
Review URL: http://codereview.appspot.com/5821053/
git-svn-id: http://skia.googlecode.com/svn/trunk@3401 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-15 14:40:46 +00:00
reed@google.com
4bc0a9db18
use higher precision (64bit) fixed-point for matrix proc
...
Review URL: https://codereview.appspot.com/5772044
git-svn-id: http://skia.googlecode.com/svn/trunk@3336 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-07 21:47:41 +00:00
reed@google.com
b8c39178ff
add bench for various interp techniques used in bitmapshader_matrix
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3333 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-07 12:36:07 +00:00
bsalomon@google.com
20c0a18e05
Change skia_target_arch != arm to skia_target_arch == x86 in gyp files
...
BUG= http://code.google.com/p/skia/issues/detail?id=478
Review URL: http://codereview.appspot.com/5757053/
git-svn-id: http://skia.googlecode.com/svn/trunk@3332 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-06 20:43:53 +00:00
senorblanco@chromium.org
05054f1a78
Erode and dilate image filter effects, CPU and GPU implementations.
...
Review URL: http://codereview.appspot.com/5656067/
git-svn-id: http://skia.googlecode.com/svn/trunk@3310 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-02 21:05:45 +00:00
bsalomon@google.com
b4a4ab1e99
Remove offscreen supersampler.
...
THIS IS EXPECTED TO BREAK MANY GM TESTS. They will be rebaselined.
Review URL: http://codereview.appspot.com/5722044/
git-svn-id: http://skia.googlecode.com/svn/trunk@3305 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-02 18:57:25 +00:00
tomhudson@google.com
3f5ebb431f
Remove libjpeg image decoder, since we've never built it since we changed
...
to gyp.
http://codereview.appspot.com/5722046/
git-svn-id: http://skia.googlecode.com/svn/trunk@3302 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-02 15:38:23 +00:00
reed@google.com
48a4cbc668
add experimental files to encapsulate device-level font settings
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3292 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-01 19:21:11 +00:00
tomhudson@google.com
893ff3053f
Remove references to svg.gyp from projects that don't use it.
...
svg is now an orphan and can be deprecated.
http://codereview.appspot.com/5703047/
git-svn-id: http://skia.googlecode.com/svn/trunk@3279 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-28 19:03:13 +00:00
reed@google.com
1ac8350821
implement gamma correction for freetype text.
...
Need to opt-in to have it applied to kA8 text (which chrome can't for a while)
A8 text needs to use Slight hinting to look better, but that is not forced...
git-svn-id: http://skia.googlecode.com/svn/trunk@3277 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-28 17:06:02 +00:00
tomhudson@google.com
301968088a
Remove referenecs to nonexistent file SkImageDecoder_libpvjpeg.c from gyp
...
http://codereview.appspot.com/5707046/
git-svn-id: http://skia.googlecode.com/svn/trunk@3275 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-28 16:46:01 +00:00
djsollen@google.com
85c1c6ed88
Enable Android GM to produce PNG images.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3253 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-24 19:45:16 +00:00
reed@google.com
61c22047dc
add SkCreateDataProviderFromStream to SkCGUtils
...
implement SkFontHost create_from_file/stream using SkCGUtils
git-svn-id: http://skia.googlecode.com/svn/trunk@3249 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-24 15:29:00 +00:00
djsollen@google.com
3a2b35f0af
Fix typo in the gyp file.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3248 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-24 14:10:44 +00:00
djsollen@google.com
cf7403040e
Enable hardware float for all armv7 and add NDK required linker flags
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3247 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-24 14:09:02 +00:00
djsollen@google.com
809a2a9fb7
Add a bench for picture playback.
...
Review URL: https://codereview.appspot.com/5694053
git-svn-id: http://skia.googlecode.com/svn/trunk@3245 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-23 20:57:09 +00:00
bsalomon@google.com
a91e923874
GPU device preserves pixel values across read/write/read of unpremul pixel values
...
Review URL: http://codereview.appspot.com/5695047/
git-svn-id: http://skia.googlecode.com/svn/trunk@3237 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-23 15:39:54 +00:00
reed@google.com
17aa07df01
add unittest for FontHost (just tables at the moment)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3233 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-23 14:51:10 +00:00
bsalomon@google.com
fb0d741d69
Use nested template expansions to implement Config8888 conversions.
...
Review URL: https://codereview.appspot.com/5690068
git-svn-id: http://skia.googlecode.com/svn/trunk@3230 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-22 21:25:34 +00:00
bsalomon@google.com
ca13d39f5e
Revert 3191
...
Review URL: http://codereview.appspot.com/5656068/
git-svn-id: http://skia.googlecode.com/svn/trunk@3203 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-15 21:16:03 +00:00
djsollen@google.com
60abb078e5
Merge changes from the android repo upstream to Skia
...
Review URL: https://codereview.appspot.com/5545070
git-svn-id: http://skia.googlecode.com/svn/trunk@3199 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-15 18:49:15 +00:00
epoger@google.com
2109923520
hack to enable SSSE3 on Macs
...
Review URL: https://codereview.appspot.com/5649091
git-svn-id: http://skia.googlecode.com/svn/trunk@3195 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 19:49:19 +00:00
tomhudson@google.com
4ef14f8e83
Attempt to make Windows and Mac compilers happy after breakage in r3193.
...
Verified that changes in parameter signatures
git-svn-id: http://skia.googlecode.com/svn/trunk@3194 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 19:42:39 +00:00
tomhudson@google.com
95ad155263
Add SSSE3 acceleration for S32_{opaque,alpha}_D32_filter_DX; should yield
...
25% speedup on 64b architectures, something smaller but still valuable on
32b.
Adds new files, breaking client gyps.
http://codereview.appspot.com/5515044/
git-svn-id: http://skia.googlecode.com/svn/trunk@3193 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 18:28:54 +00:00
bsalomon@google.com
621dfe6c84
Add test to detect bias in conversion of frag shader floats to bytes
...
Review URL: http://codereview.appspot.com/5669045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3191 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 17:03:16 +00:00
reed@google.com
ed3ee6418a
add test for colored text drawing (hopefully gamma corrected)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3190 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 16:12:49 +00:00
tomhudson@google.com
6bf38b59c9
Move GL-specific include files to their own subdirectory, to better
...
coexist alongside D3D backend.
Requires gyp change.
http://codereview.appspot.com/5665045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3185 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 15:11:59 +00:00
epoger@google.com
7bc13a6260
Set LCD font smoothing to "medium" for gm on Mac, regardless of system settings
...
http://code.google.com/p/skia/issues/detail?id=382 ('make gm results consistent regardless of system LCDtext settings')
Review URL: https://codereview.appspot.com/5661043
git-svn-id: http://skia.googlecode.com/svn/trunk@3184 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 14:53:59 +00:00
bsalomon@google.com
f7fa806d84
Make GLCaps be standalone and be a member of GrGLContextInfo
...
Review URL: http://codereview.appspot.com/5654084/
git-svn-id: http://skia.googlecode.com/svn/trunk@3183 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-14 14:09:57 +00:00
bsalomon@google.com
632151bc91
Add path effect GM
...
Review URL: http://codereview.appspot.com/5649069/
git-svn-id: http://skia.googlecode.com/svn/trunk@3172 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-13 15:18:34 +00:00
tomhudson@google.com
4072556641
Add two files missed in r3165; most critically the gyp!
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3166 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-10 21:35:06 +00:00
bsalomon@google.com
89ec61e33d
Add GrGLContextInfo
...
Review URL: http://codereview.appspot.com/5653060/
git-svn-id: http://skia.googlecode.com/svn/trunk@3162 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-10 20:05:18 +00:00
bungeman@google.com
8ec9956bdf
Add more TT table definitions and create fake enum typedef.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3150 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-07 21:30:21 +00:00
bungeman@google.com
af5bbf2449
Move SkBase64 to utils, allow user defined encoding.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3148 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-07 20:47:38 +00:00
junov@chromium.org
1f9767c03b
Fixing backing store access in SkDeferredCanvas.
...
Chromium CL required for rolling skia DEPS past this change is posted here: https://chromiumcodereview.appspot.com/9341003/
BUG=http://code.google.com/p/skia/issues/detail?id=475
REVIEW=http://codereview.appspot.com/5626047/
TEST=DeferredCanvas unit test
git-svn-id: http://skia.googlecode.com/svn/trunk@3147 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-07 16:27:57 +00:00
bungeman@google.com
f8d1aee252
Open type table definitions.
...
http://codereview.appspot.com/5577064/
git-svn-id: http://skia.googlecode.com/svn/trunk@3131 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-02 19:15:21 +00:00
digit@google.com
1771cbf43d
posix: Avoid static initializers in static/global mutexes
...
This patch removes static initializers related to static and
global mutexes from the final library's machine code when
building on a pthread-capable system.
We use PTHREAD_MUTEX_INITIALIZER to perform POD-style
initialization. You need a line like the following to declare
a global mutex with it:
SkBaseMutex gMutex = { PTHREAD_MUTEX_INITIALIZER };
We introduce the SK_DECLARE_STATIC_MUTEX and SK_DECLARE_GLOBAL_MUTEX
macros to be able to declare static/global mutexes in the source tree
uniformly.
SkMutex is now defined as a sub-class of SkBaseMutex, with standard
construction/destruction semantics. This is useful if the mutex
object is a member of another C++ class, or allocated dynamically.
We also modify a few places to refer to SkBaseMutex instead of a
SkMutex, where it makes sense. Generally speaking, client code
should hold and use pointers to SkBaseMutex whenever they can
now.
We defined a new built-time macro named SK_USE_POSIX_THREADS
to indicate that we're using a pthread-based SkThread.h
interface. The macro will also be used in future patches
to implement other helper thread synchronization classes.
Finally, we inline the acquire() and release() functions in the
case of Posix to improve performance a bit.
Running: 'bench -repeat 10 -match mutex' on an Android device or
a 2.4GHz Xeon Linux desktop shows the following improvements:
Before After
Galaxy Nexus 1.64 1.45
Nexus S 1.47 1.16
Xoom 1.86 1.66
Xeon 0.36 0.31
This removes 5 static mutex initializers from the library
Review URL: https://codereview.appspot.com/5501066
git-svn-id: http://skia.googlecode.com/svn/trunk@3091 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-26 21:26:40 +00:00
senorblanco@chromium.org
7288c49cf2
Fix a warning in libtess in Release builds; define NDEBUG in Release on all
...
platforms.
BUG: http://code.google.com/p/skia/issues/detail?id=456
Review URL: http://codereview.appspot.com/5555054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3076 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-19 19:59:22 +00:00
junov@google.com
4370aedf7f
Adding class SkDeferredCanvas for deferred rendering.
...
TEST=added a new pass to gm, so all gm tests are run through SkDeferredCanvas
REVIEW=http://codereview.appspot.com/5430058/
git-svn-id: http://skia.googlecode.com/svn/trunk@3059 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-18 16:21:08 +00:00
bsalomon@google.com
69cc6ad20e
Add convex path renderer (disabled)
...
Review URL: http://codereview.appspot.com/5533061/
git-svn-id: http://skia.googlecode.com/svn/trunk@3040 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-17 14:25:10 +00:00
bungeman@google.com
2211b62327
Subpixel text 3/8 of a pixel too far to the right.
...
http://codereview.appspot.com/5502097/
git-svn-id: http://skia.googlecode.com/svn/trunk@3037 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-13 15:02:58 +00:00
bsalomon@google.com
9f169a4b01
Add gyp variable to disable OSAA
...
Review URL: http://codereview.appspot.com/5539047
git-svn-id: http://skia.googlecode.com/svn/trunk@3033 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-12 20:56:52 +00:00
bsalomon@google.com
150d28465d
Add code path to SW rasterize paths and upload as a mask texture
...
Review URL: http://codereview.appspot.com/5542043/
git-svn-id: http://skia.googlecode.com/svn/trunk@3031 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-12 20:19:56 +00:00
reed@google.com
3e71a88762
add gm for reverseAddPath
...
git-svn-id: http://skia.googlecode.com/svn/trunk@3001 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 18:44:37 +00:00
reed@google.com
63d73749fb
add SkPath::reverseAddPath()
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2995 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 15:33:12 +00:00
digit@google.com
70ccffe0e7
Android: disable static global initializers
...
Review URL: http://codereview.appspot.com/5503066
git-svn-id: http://skia.googlecode.com/svn/trunk@2992 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 10:28:30 +00:00
djsollen@google.com
fa394d491b
Change remaining ANDROID ifdefs to SK_BUILD_FOR_ANDROID
...
Review URL: http://codereview.appspot.com/5528050
git-svn-id: http://skia.googlecode.com/svn/trunk@2990 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-09 20:40:25 +00:00
djsollen@google.com
a44e6c6b53
Add ARM optimizations to the build.
...
Also had to fix a problem in the ARM memset code that was
causing some tests and bench to fail.
Review URL: http://codereview.appspot.com/5522052
git-svn-id: http://skia.googlecode.com/svn/trunk@2989 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-09 14:38:25 +00:00
mike@reedtribe.org
c52b1927c2
add unittest for sk_memset16 and sk_memset32
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2985 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-07 03:49:13 +00:00
bsalomon@google.com
cadbcb8e53
Towards enabling -Werror in skia on Linux
...
Review URL: http://codereview.appspot.com/5516044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2983 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-06 19:22:11 +00:00
senorblanco@chromium.org
a0b0c122b5
Fix incorrect use of the SK_RESTRICT macro in SkColorMatrixFilter, and re-enable
...
the colormatrix GM test.
Review URL: http://codereview.appspot.com/5509048/
git-svn-id: http://skia.googlecode.com/svn/trunk@2963 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-04 22:00:34 +00:00
senorblanco@chromium.org
b369bcedd9
Disable colormatrix GM test, since it's failing on win32 float release.
...
Build fix; unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@2953 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-03 22:14:41 +00:00
schenney@chromium.org
5cf448f16d
Build fix. Forgot to update gyp.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2952 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-03 21:42:10 +00:00
senorblanco@chromium.org
50bdad85db
Implement the color matrix filter in Ganesh. Also, fix and enable the color
...
matrix test slide. This was basically implemented in the same places where
the blending-based color filter was being done. The shader simply does a mat4
matrix multiply and a vec4 add.
Review URL: http://codereview.appspot.com/5489107/
git-svn-id: http://skia.googlecode.com/svn/trunk@2948 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-03 20:51:57 +00:00
mike@reedtribe.org
a69b48c29d
Add SkTableColorFilter, as a foundation for several SVG filters
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2933 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-28 20:31:00 +00:00
caryclark@google.com
5fbb4dc0a5
support vertical text and typeface-by-name on Leopard
...
M src/ports/SkFontHost_mac_coretext.cpp
M gyp/gmslides.gypi
A gm/verttext2.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@2920 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-21 20:06:30 +00:00
reed@google.com
ee068aae55
add unittest for invariants for empty paths, still need to think about
...
hairlines in those cases
git-svn-id: http://skia.googlecode.com/svn/trunk@2919 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-21 19:36:21 +00:00
reed@google.com
419f43348a
add SkUnichar_IsVariationSelector()
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2915 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-21 15:21:32 +00:00
tomhudson@google.com
ef279d36ca
New gm to test anti-aliased clipping.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2914 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-21 14:27:14 +00:00
senorblanco@chromium.org
5b2d8b750b
Disable colorfilter GM for now, since it causes Debug Fixed builds to assert.
...
Unreviewed; build fix.
git-svn-id: http://skia.googlecode.com/svn/trunk@2910 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 21:12:58 +00:00
senorblanco@chromium.org
e5ff3cefe0
Implement SkColorFilter::asColorMatrix() virtual, and override in
...
SkColorMatrixFilter. Implement missing SkColorMatrixFilter::setMatrix() and
setArray() functions (were in .h, just not implemented). Add a gm for color
matrix filters.
Review URL: http://codereview.appspot.com/5500044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2909 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 20:58:18 +00:00
senorblanco@chromium.org
ae814c7476
A software implementation of the Gaussian blur filter, using 3 box blurs. Also
...
re-enable the imageblur GM test, since the SkPicture path now works.
Review URL: http://codereview.appspot.com/5413048/
git-svn-id: http://skia.googlecode.com/svn/trunk@2905 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 20:02:19 +00:00
reed@google.com
32d25b6f5f
initial impl of SkImageFilters : virtual signature will change!
...
Do not invest too much in other subclasses until this API solidifies.
git-svn-id: http://skia.googlecode.com/svn/trunk@2903 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 16:19:00 +00:00
schenney@chromium.org
4da06ab335
Modifying SkPath to store all verbs provided by the user, and to give
...
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
djsollen@google.com
62b24b1c80
Fix android build and cleanup references to SkMMapStream
...
Review URL: http://codereview.appspot.com/5489050
git-svn-id: http://skia.googlecode.com/svn/trunk@2877 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-15 16:16:22 +00:00
caryclark@google.com
d26147adbb
add optional manual global initialization
...
M include/effects/SkAvoidXfermode.h
M include/effects/SkDiscretePathEffect.h
M include/effects/Sk1DPathEffect.h
M include/effects/Sk2DPathEffect.h
M include/effects/SkBlurDrawLooper.h
M include/effects/SkPixelXorXfermode.h
M include/effects/SkDashPathEffect.h
M include/effects/SkColorMatrixFilter.h
M include/effects/SkEmbossMaskFilter.h
M include/effects/SkLayerDrawLooper.h
M include/effects/SkGroupShape.h
M include/effects/SkBlurImageFilter.h
M include/effects/SkRectShape.h
A include/effects/SkEffects.h
M include/effects/SkCornerPathEffect.h
M include/effects/SkGradientShader.h
M include/effects/SkBlurMaskFilter.h
M include/effects/SkLayerRasterizer.h
M include/core/SkMallocPixelRef.h
M include/core/SkFlattenable.h
M include/core/SkShape.h
M include/core/SkPixelRef.h
M include/core/SkGraphics.h
M include/core/SkPathEffect.h
M include/core/SkPostConfig.h
M include/core/SkXfermode.h
M include/core/SkColorFilter.h
M include/images/SkFlipPixelRef.h
M include/images/SkImageRef_GlobalPool.h
M src/effects/SkDashPathEffect.cpp
M src/effects/SkColorMatrixFilter.cpp
M src/effects/SkBlurImageFilter.cpp
M src/effects/SkGroupShape.cpp
M src/effects/SkCornerPathEffect.cpp
M src/effects/SkGradientShader.cpp
M src/effects/SkBlurMaskFilter.cpp
M src/effects/SkAvoidXfermode.cpp
M src/effects/Sk2DPathEffect.cpp
M src/effects/SkBlurDrawLooper.cpp
M src/effects/SkPixelXorXfermode.cpp
M src/effects/SkColorFilters.cpp
M src/effects/SkLayerDrawLooper.cpp
M src/effects/SkRectShape.cpp
A src/effects/SkEffects.cpp
M src/effects/SkLayerRasterizer.cpp
M src/effects/SkDiscretePathEffect.cpp
M src/effects/Sk1DPathEffect.cpp
A src/effects/SkEffects_none.cpp
M src/core/SkPixelRef.cpp
M src/core/SkGraphics.cpp
M src/core/SkFlattenable.cpp
M src/core/SkBitmapProcShader.h
M src/core/SkPathEffect.cpp
M src/core/SkShape.cpp
M src/core/SkXfermode.cpp
M src/core/SkMallocPixelRef.cpp
M src/core/SkBitmapProcShader.cpp
M src/images/SkFlipPixelRef.cpp
M src/images/SkImageRef_GlobalPool.cpp
A src/ports/SkGlobalInitialization_chromium.cpp
M src/ports/SkImageRef_ashmem.h
M src/ports/SkImageRef_ashmem.cpp
A src/ports/SkGlobalInitialization_default.cpp
M gyp/effects.gyp
M gyp/tools.gyp
M gyp/ports.gyp
git-svn-id: http://skia.googlecode.com/svn/trunk@2876 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-15 14:16:43 +00:00
caryclark@google.com
afcb55c8cb
move ports into its own gyp file
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2874 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-14 17:12:04 +00:00
mike@reedtribe.org
e51755fc64
add first cut at arithmetic mode
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2849 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-10 19:36:56 +00:00
junov@chromium.org
b6e161937b
Adding isOpaque method to skia shader classes
...
REVIEW=http://codereview.appspot.com/5451102/
TEST=unit test ShaderOpacity
git-svn-id: http://skia.googlecode.com/svn/trunk@2840 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-09 15:48:03 +00:00
tomhudson@google.com
086e5354fe
Make GrGLShaderVar objects aware of whether they are uniform, varying, or
...
attribute varibles. Extract GLSL generation enum and utility function into
new GrGLSL header.
git-svn-id: http://skia.googlecode.com/svn/trunk@2827 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-08 14:44:10 +00:00
reed@google.com
d230e3e532
add test for isFinite
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2800 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-05 20:49:37 +00:00
djsollen@google.com
44360bcca3
Changes to the android gyp system to build without RTTI and exceptions.
...
Review URL: http://codereview.appspot.com/5437089
git-svn-id: http://skia.googlecode.com/svn/trunk@2794 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-05 13:55:55 +00:00
senorblanco@chromium.org
ef843cdcd1
When a bitmap is texture-backed, change SkBitmap::copyTo() to do a deep
...
copy of the texels in VRAM rather than a readback and re-upload. This
gives a 3-10X speedup on recursive canvas-to-canvas draws.
N.B.: This introduces a new GM test, which will need new baselines.
git-svn-id: http://skia.googlecode.com/svn/trunk@2790 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-02 19:11:17 +00:00
bsalomon@google.com
bd7c64150c
Add SkWGLExtensionInterface for dealing with WGL extensions
...
Review URL: http://codereview.appspot.com/5447059
git-svn-id: http://skia.googlecode.com/svn/trunk@2777 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-01 16:34:28 +00:00
bsalomon@google.com
06711bd972
Move SkGLCanvas.h to obsolete, delete from gyp
...
Review URL: http://codereview.appspot.com/5451065/
git-svn-id: http://skia.googlecode.com/svn/trunk@2776 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-01 15:47:23 +00:00
bsalomon@google.com
fb30951cd9
[GPU] tile when large bitmap pased drawBitmap and only a small fraction is used
...
Review URL: http://codereview.appspot.com/5450048/
git-svn-id: http://skia.googlecode.com/svn/trunk@2760 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-30 14:13:48 +00:00
reed@google.com
e805535b19
add test for shader text w/ and w/o lcd (and w/ and w/o opaque)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2753 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-28 16:31:28 +00:00
reed@google.com
37f3ae0b9f
add unittest for save/restore
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2751 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-28 16:06:04 +00:00
bsalomon@google.com
31648eb1cf
Fix warnings
...
Review URL: http://codereview.appspot.com/5433054/
git-svn-id: http://skia.googlecode.com/svn/trunk@2741 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-23 15:01:08 +00:00
bsalomon@google.com
897e66cb0b
Add windowscodecs.lib to images.gyp
...
Review URL: http://codereview.appspot.com/5422046/
git-svn-id: http://skia.googlecode.com/svn/trunk@2728 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-21 21:04:06 +00:00
reed@google.com
3d60812865
don't quickReject bitmaps if there is a looper or other possible bounds-modifier
...
add unittest for the above change
git-svn-id: http://skia.googlecode.com/svn/trunk@2722 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-21 15:16:16 +00:00
reed@google.com
9998c66930
remove all references to SkGlobals (obsolete)
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2713 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-17 22:09:47 +00:00
reed@google.com
0069aa5708
add commented line to try to add additional warnings
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2706 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-17 15:35:47 +00:00