Commit Graph

7590 Commits

Author SHA1 Message Date
caryclark@google.com
4b66f367b4 path ops work in progress
do not check in

Review URL: https://codereview.chromium.org/14865019

git-svn-id: http://skia.googlecode.com/svn/trunk@9433 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 18:14:11 +00:00
caryclark@google.com
cffbcc3b96 path ops -- rewrite angle sort
This is a major change resulting from a minor
tweak. In the old code, the intersection point
of two curves was shared between them, but the
intersection points and end points of sorted edges was
computed directly from the intersection T value.

In this CL, both intersection points and sorted points
are the same, and intermediate control points are computed
to preserve their slope.

The sort itself has been completely rewritten to be more
robust and remove 'magic' checks, conditions that empirically
worked but couldn't be rationalized.

This CL was triggered by errors generated computing the clips
of SKP files. At this point, all 73M standard tests work and
at least the first troublesome SKPs work.

Review URL: https://codereview.chromium.org/15338003

git-svn-id: http://skia.googlecode.com/svn/trunk@9432 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 17:59:42 +00:00
epoger@google.com
4075fd4851 gm_json.py: add ability to load JSON file from a string, not just a local file
This will make it easier to read JSON files from new sources (HTTP, etc.)

R=scroggo@google.com

Review URL: https://codereview.chromium.org/15934018

git-svn-id: http://skia.googlecode.com/svn/trunk@9431 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 17:50:36 +00:00
bungeman@google.com
a9133bbcc6 Fix hinting menu in SampleApp.
git-svn-id: http://skia.googlecode.com/svn/trunk@9430 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 17:49:20 +00:00
reed@google.com
ed43dffbf1 add size limit for using glyphcache. above that, draw using paths
BUG=
R=bungeman@google.com

Review URL: https://codereview.chromium.org/16336024

git-svn-id: http://skia.googlecode.com/svn/trunk@9429 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 16:56:27 +00:00
epoger@google.com
db29a310f7 rebaseline.py : add self-tests
R=senorblanco@chromium.org

Review URL: https://codereview.chromium.org/15660014

git-svn-id: http://skia.googlecode.com/svn/trunk@9426 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 14:58:47 +00:00
skia.committer@gmail.com
11f2b44450 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9423 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 07:00:53 +00:00
bungeman@google.com
055aa52b2d Fix signed/unsigned comparison warning as error from r9421.
git-svn-id: http://skia.googlecode.com/svn/trunk@9422 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 21:35:03 +00:00
bungeman@google.com
96aabc8508 Fix hinting and add subpixel to SampleApp.
This change allows users of SampleApp to cycle through all of the hinting modes
(using the 'h' key) and also toggle subpixel positioning on the paint (using
the 's' key). Because 'up' and 'down' have replaced its functionality,
'scale', the exising user of 's', is removed.


git-svn-id: http://skia.googlecode.com/svn/trunk@9421 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 21:26:34 +00:00
commit-bot@chromium.org
1ebc67465d Testing the Commit Queue (SkipBuildbotRuns)
R=borenet@google.com

Author: rmistry@google.com

Review URL: https://chromiumcodereview.appspot.com/16305018

git-svn-id: http://skia.googlecode.com/svn/trunk@9420 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 20:41:50 +00:00
commit-bot@chromium.org
1308f6e6dd Remove assertion in debug GL impl that stencil buffers are deleted after FBOs to which they are bound.
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/15894024

git-svn-id: http://skia.googlecode.com/svn/trunk@9419 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 20:09:08 +00:00
commit-bot@chromium.org
e904b45696 Fix leak of effect in SkXfermodeImageFilter::filterImageGPU()
R=senorblanco@chromium.org

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/16305016

git-svn-id: http://skia.googlecode.com/svn/trunk@9418 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 19:40:17 +00:00
commit-bot@chromium.org
7495f59d39 Don't crash if device creation fails in bench.
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/16256011

git-svn-id: http://skia.googlecode.com/svn/trunk@9417 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 19:31:07 +00:00
reed@google.com
37ab298bd8 reenable colortype gm
git-svn-id: http://skia.googlecode.com/svn/trunk@9413 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 17:49:37 +00:00
reed@google.com
13e1540f8c if we can't load Times, use default font
git-svn-id: http://skia.googlecode.com/svn/trunk@9412 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 17:45:29 +00:00
robertphillips@google.com
59ce1377b1 Fix Win7 warning-as-error complaint
git-svn-id: http://skia.googlecode.com/svn/trunk@9411 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 17:29:58 +00:00
bungeman@google.com
78aa76c02e Follow on to r9408, implement sk_fileno in SkOSFile_none.cpp.
git-svn-id: http://skia.googlecode.com/svn/trunk@9410 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 17:20:21 +00:00
robertphillips@google.com
4157085470 Added megalooper GM
https://codereview.chromium.org/16004011/



git-svn-id: http://skia.googlecode.com/svn/trunk@9409 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 17:13:25 +00:00
bungeman@google.com
11c9a55afd Add SkData::NewFromFD.
Chromium needs a SkStream backed by a file descriptor.
Skia already has the code and can do the work, this change exposes the
functionality in Skia in a clean way.

https://codereview.chromium.org/15941025/


git-svn-id: http://skia.googlecode.com/svn/trunk@9408 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 17:10:35 +00:00
robertphillips@google.com
135ece137b Added comment to SkDrawLooper fix
(SkipBuildbotRuns)



git-svn-id: http://skia.googlecode.com/svn/trunk@9406 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 16:58:58 +00:00
reed@google.com
c117cbae61 add bench for sk_memset16/32
BUG=

Review URL: https://codereview.chromium.org/16336009

git-svn-id: http://skia.googlecode.com/svn/trunk@9405 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 16:54:10 +00:00
djsollen@google.com
0274f93104 update android_gdb_exe to work with skia shared lib
R=borenet@google.com

Review URL: https://codereview.chromium.org/16140013

git-svn-id: http://skia.googlecode.com/svn/trunk@9404 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 16:02:22 +00:00
djsollen@google.com
f553d27947 fix gm on android
R=borenet@google.com

Review URL: https://codereview.chromium.org/15927011

git-svn-id: http://skia.googlecode.com/svn/trunk@9403 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 15:56:44 +00:00
djsollen@google.com
ecde97ef48 yet another build fix for skia_launcher
R=borenet@google.com

Review URL: https://codereview.chromium.org/15969009

git-svn-id: http://skia.googlecode.com/svn/trunk@9402 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 14:51:14 +00:00
djsollen@google.com
2897931e87 Fix broken include path for directwrite backend
R=borenet@google.com

Review URL: https://codereview.chromium.org/16325006

git-svn-id: http://skia.googlecode.com/svn/trunk@9400 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 14:44:52 +00:00
djsollen@google.com
e69a54b0bc fix broken skia_launcher app
R=borenet@google.com

Review URL: https://codereview.chromium.org/15995008

git-svn-id: http://skia.googlecode.com/svn/trunk@9399 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 14:02:15 +00:00
borenet@google.com
cf89b6fc30 Whitespace change to trigger rebuilds
Review URL: https://codereview.chromium.org/16329005

git-svn-id: http://skia.googlecode.com/svn/trunk@9397 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 13:06:42 +00:00
djsollen@google.com
52f0297aaf Prepare skia for shared library build on android
This reapplies revision 9378 after the buildbot has been updated.

R=borenet@google.com, djsollen@google.com

Review URL: https://codereview.chromium.org/15855006

git-svn-id: http://skia.googlecode.com/svn/trunk@9395 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 12:10:19 +00:00
robertphillips@google.com
2dd76d7668 Hamfisted fix to drawLooper w/ 0 stages bug
https://codereview.chromium.org/16305002/



git-svn-id: http://skia.googlecode.com/svn/trunk@9393 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-02 16:47:06 +00:00
robertphillips@google.com
ef7d98e960 Disable colortype GM due to crash
git-svn-id: http://skia.googlecode.com/svn/trunk@9392 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-02 15:01:06 +00:00
robertphillips@google.com
76e153847d N7 performance trigger rebaselines after skp update
(SkipBuildbotRuns)



git-svn-id: http://skia.googlecode.com/svn/trunk@9390 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-02 13:37:32 +00:00
skia.committer@gmail.com
26da7f00ae Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9387 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-01 07:01:39 +00:00
reed@google.com
e1613d8284 fix another int -- float warning
git-svn-id: http://skia.googlecode.com/svn/trunk@9384 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 21:13:36 +00:00
reed@google.com
42e2cf71d5 skip_picture in colortype gm for now
git-svn-id: http://skia.googlecode.com/svn/trunk@9383 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 21:09:06 +00:00
reed@google.com
1b6a04ff84 use SkIntToScalar to fix warning
git-svn-id: http://skia.googlecode.com/svn/trunk@9382 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 21:06:03 +00:00
reed@google.com
7edec14039 start a wrapper for color fonts
BUG=
R=bungeman@google.com

Review URL: https://codereview.chromium.org/14890016

git-svn-id: http://skia.googlecode.com/svn/trunk@9381 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 20:17:57 +00:00
djsollen@google.com
a96627fd24 prepare skia for shared library build on android
R=borenet@google.com, djsollen@google.com

Committed: https://code.google.com/p/skia/source/detail?r=9378

Review URL: https://codereview.chromium.org/15855006

git-svn-id: http://skia.googlecode.com/svn/trunk@9379 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 20:09:47 +00:00
djsollen@google.com
cf5348f5aa prepare skia for shared library build on android
R=borenet@google.com, djsollen@google.com

Review URL: https://codereview.chromium.org/15855006

git-svn-id: http://skia.googlecode.com/svn/trunk@9378 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 20:02:56 +00:00
reed@google.com
e2aad27c5f sort the glyphID arrays
add head/tail code

git-svn-id: http://skia.googlecode.com/svn/trunk@9376 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 19:46:02 +00:00
edisonn@google.com
a20e42c08b Remove SK_API, from SkTSet. the template is not public.
Review URL: https://codereview.chromium.org/15792016

git-svn-id: http://skia.googlecode.com/svn/trunk@9374 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 18:04:20 +00:00
senorblanco@chromium.org
86fc266eda Implement SkXfermode image filter. This required changing the signature of SkXfermode::asNewEffectOrCoeffs(), to add an optional background texture.
For the raster path, we do a straightforward 2-pass method: draw background, then composite the foreground over it.

For the GPU path, if the xfermode can be expressed as an effect, we build an effect with the background texture incorporated, then do a single-pass draw fetching both foreground and background textures, and compositing to the result. If the xfermode is expressed as src/dst coefficients, we do a 2-pass draw as in the raster path and use fixed-function blending.

R=bsalomon@google.com, reed@google.com

Review URL: https://codereview.chromium.org/16125008

git-svn-id: http://skia.googlecode.com/svn/trunk@9373 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 17:49:12 +00:00
rmistry@google.com
70fdc12837 All SKP files in Google Storage have been updated. (AddDashboardAnnotation)
git-svn-id: http://skia.googlecode.com/svn/trunk@9371 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 17:41:03 +00:00
reed@google.com
277c3f8765 bump picture version since SkPath has changed (conics)
enable conics in SkPath

git-svn-id: http://skia.googlecode.com/svn/trunk@9370 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 15:17:50 +00:00
scroggo@google.com
2d76d933ff Read and write pixel offset when serializing bitmaps.
Remove ifdef's preventing a change to read and write offsets.
This fixes a bug where the SKP will draw the wrong portion
of bitmaps.

In addition, read the offset from the stream whether the
bitmap decoder succeeds or not, so that a failure to decode
still advances the stream to the correct spot.

Set the offset to 0 before calling SkPicture::EncodeBitmap,
so that if the function does not set it, we will not
modify the offset.

REQUIRES A CHANGE TO THE PICTURE VERSION. Does not change
PICTURE_VERSION itself, since other CLs are also requiring
a change.

BUG=https://code.google.com/p/skia/issues/detail?id=1301
R=djsollen@google.com

Review URL: https://codereview.chromium.org/15713015

git-svn-id: http://skia.googlecode.com/svn/trunk@9368 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 14:39:54 +00:00
scroggo@google.com
d5936923ad Fix iOS build.
Review URL: https://codereview.chromium.org/15647010

git-svn-id: http://skia.googlecode.com/svn/trunk@9367 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 14:27:55 +00:00
scroggo@google.com
85322368ce Fix build.
Remove CreateDefaultDecoder call, since the function was removed.

Review URL: https://codereview.chromium.org/16256003

git-svn-id: http://skia.googlecode.com/svn/trunk@9365 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 14:06:16 +00:00
scroggo@google.com
7def5e1630 Separate core and images project.
SkImage calls functions on SkImageDecoder and SkImageEncoder. This
is desired behavior, and it is also desired to include SkImage as
a part of core. In order to keep core from depending on images,
update SkImageDecoder_empty.cpp to implement all of SkImageDecoder
and SkImageEncoder. This file will be built by chrome (in
https://codereview.chromium.org/15960015).

Move force_linking from SkImageDecoder.cpp to its own file. It must
be called to force linking with the image decoders if desired. Call
the function in tools that need it:
sk_image
render_pictures
render_pdfs
sk_hello
filter
bench_pictures
debugger

SkImageDecoder:
Derive from SkNoncopyable, instead of duplicating its
hiding of constructors.

skhello:
Return rather than trying to write a null SkData to the stream.

Revert "Hamfistedly removed core dependence on images"
(commit 0f05f682a90bc125323677abf3476e1027d174f5) and
"Move SkImage::encode to SkImage_Codec.cpp."
(commit 83e47a954d0bf65439f3d9c0c93213063dd70da3.)
These two commits were temporary fixes that this change
cleans up.

SkSnapshot.cpp:
Check for a NULL encoder returned by SkImageEncoder::Create.

BUG=https://code.google.com/p/skia/issues/detail?id=1275
R=djsollen@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/15806010

git-svn-id: http://skia.googlecode.com/svn/trunk@9364 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 14:00:10 +00:00
robertphillips@google.com
f865be3786 Add atlasing option to GameBench bench
https://codereview.chromium.org/15660012/



git-svn-id: http://skia.googlecode.com/svn/trunk@9363 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 13:27:02 +00:00
humper@google.com
6dce11368a fix warnings on MacOS 10.6
git-svn-id: http://skia.googlecode.com/svn/trunk@9362 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 12:58:29 +00:00
humper@google.com
04db31641b More general GM for testing bitmap filtering, including checkerboards, images, and text.
Review URL: https://codereview.chromium.org/15755019

git-svn-id: http://skia.googlecode.com/svn/trunk@9361 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 12:50:39 +00:00