AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,124 Commits 1 Branch 0 Tags 544 MiB
efb1d77ad2
Commit Graph

5124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
borenet@google.com
efb1d77ad2 Build Skia as a static library 
- Roll GYP so that we get non-thin archives on Linux
- Add merge_static_libs.py
- Add skia_core_lib target which builds core, ports, opts*, and utils
- Replace dependencies on core/ports/opts/utils with skia_core_libs
- Rename exportable libraries with "skia_"
Review URL: https://codereview.appspot.com/6619049

git-svn-id: http://skia.googlecode.com/svn/trunk@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 19:45:51 +00:00
djsollen@google.com
6293820c96 Disable transitions for the Android SampleApp. 
Review URL: https://codereview.appspot.com/6642063

git-svn-id: http://skia.googlecode.com/svn/trunk@5887 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 18:29:31 +00:00
edisonn@google.com
8f338a3eeb Fix build break. a cpp file was not included in the checkin list. will send to code review and check it in too 
git-svn-id: http://skia.googlecode.com/svn/trunk@5885 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 16:42:26 +00:00
bsalomon@google.com
36d6edac9f Draw hairline text as path. 
R=reed@google.com
Review URL: https://codereview.appspot.com/6632060

git-svn-id: http://skia.googlecode.com/svn/trunk@5884 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 16:12:14 +00:00
bsalomon@google.com
a6926b1f03 Reland r5861 but leave setMatrixClip virtual on SkDevice (IOW this is a partial revert of r5871 which reverted r5861). 
Unreviewed
Review URL: https://codereview.appspot.com/6631062

git-svn-id: http://skia.googlecode.com/svn/trunk@5881 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 15:25:50 +00:00
edisonn@google.com
2a827e81b3 Add an SKP to PDF rendered. test_pdfs.py will be hooked up in buildbot testing later. 
Review URL: https://codereview.appspot.com/6610056

git-svn-id: http://skia.googlecode.com/svn/trunk@5880 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 15:20:34 +00:00
reed@google.com
1b6c73d67a add ability to skip 565 test in gm (until I can fix an assert in debug build) 
git-svn-id: http://skia.googlecode.com/svn/trunk@5879 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 15:17:24 +00:00
edisonn@google.com
c2c4981d02 Refactor test_pictures so we can add test_pdfs without code duplication. 
Review URL: https://codereview.appspot.com/6611050

git-svn-id: http://skia.googlecode.com/svn/trunk@5878 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 15:08:12 +00:00
bsalomon@google.com
41fe45b955 Add a new GM: shadertext2. 
It tests a bitmap shader with various combinations of matrices and shader matrices. The text is drawn filled and stroked.
Review URL: https://codereview.appspot.com/6639052

git-svn-id: http://skia.googlecode.com/svn/trunk@5877 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 13:35:23 +00:00
skia.committer@gmail.com
439cb51451 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@5872 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 02:01:30 +00:00
robertphillips@google.com
3fffb2ee9f Reverting r5861 (remove gainfocus and setMatixClip) due to Chrome compilation issues 
git-svn-id: http://skia.googlecode.com/svn/trunk@5871 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-09 22:30:18 +00:00
scroggo@google.com
5cd3656ed3 Make SkPictures valid regardless of SK_SUPPORT_HINTING_SCALE_FACTOR. 
When the build flag is not set, read/write dummy values
so that the creator of an SKP file need not have the same
support/lack of support of the feature as the reader.

Will separately update the checked in skps to the new version when checking in.

BUG=http://code.google.com/p/skia/issues/detail?id=922

Review URL: https://codereview.appspot.com/6642057

git-svn-id: http://skia.googlecode.com/svn/trunk@5869 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-09 20:02:20 +00:00
reed@google.com
cc0c8e6084 correctly handle negative values in fixed_clamp() 
Review URL: https://codereview.appspot.com/6633049

git-svn-id: http://skia.googlecode.com/svn/trunk@5867 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-09 19:45:59 +00:00
djsollen@google.com
bae1712d2e Disable automatic font fallback of SkFontHost_android when building for WebKit 
The internal font fallback mechanism prevents WebKit from getting
the properties of the actually used font. Disable the internal fallback
mechanism when building for WebKit and add SkGetFallbackFamilyNameForChar()
to let the upper level know the fallback font for individial characters.

This commits a change that was submitted for review by...
wangxianzhu1 @ https://codereview.appspot.com/6572059/

BUG=913 (http://code.google.com/p/skia/issues/detail?id=913)

Review URL: https://codereview.appspot.com/6640048

git-svn-id: http://skia.googlecode.com/svn/trunk@5866 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-09 19:26:59 +00:00
robertphillips@google.com
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
bsalomon@google.com
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
caryclark@google.com
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
caryclark@google.com
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
skia.committer@gmail.com
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
bsalomon@google.com
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
bsalomon@google.com
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
robertphillips@google.com
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
bsalomon@google.com
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
bsalomon@google.com
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
tfarina@chromium.org
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
bungeman@google.com
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
skia.committer@gmail.com
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
bsalomon@google.com
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
bsalomon@google.com
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
bungeman@google.com
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
bsalomon@google.com
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
senorblanco@chromium.org
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
robertphillips@google.com
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
djsollen@google.com
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
bsalomon@google.com
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
djsollen@google.com
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
bensong@google.com
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
bsalomon@google.com
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
skia.committer@gmail.com
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
bungeman@google.com
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
scroggo@google.com
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
scroggo@google.com
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
scroggo@google.com
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
bsalomon@google.com
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
senorblanco@chromium.org
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
robertphillips@google.com
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
bsalomon@google.com
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
senorblanco@chromium.org
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
epoger@google.com
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
bsalomon@google.com
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