Commit Graph

994 Commits

Author SHA1 Message Date
bsalomon@google.com
bbba784dfb Fix ninja/angle build with new gyp rev.
git-svn-id: http://skia.googlecode.com/svn/trunk@9463 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-06 18:34:13 +00:00
bungeman@google.com
f51e125b94 Update gyp from 1563 to 1643 (take two).
Re-land 9445 (reverted 9448), but add back the libs no longer provided by gyp.


git-svn-id: http://skia.googlecode.com/svn/trunk@9450 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 18:35:22 +00:00
reed@google.com
5a64902ee9 call through to the device from SkDraw
BUG=
R=robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9449 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 18:00:30 +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
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
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
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
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
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
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
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
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
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
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
bungeman@google.com
6cab1a4b6a Change SkStream.
https://codereview.chromium.org/15298009/


git-svn-id: http://skia.googlecode.com/svn/trunk@9312 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-29 13:43:31 +00:00
scroggo@google.com
ccd7afb6fb Reland 'Add path utils, plus a test for it.'
Build SkPathJoin and SkBasename on windows also.

Previous CL did not build on Windows because the two functions were
accidentally placed inside an ifdef that did not include windows.
Move the functions to the top of the file, and add a comment by the
endif for clarity.

Previously reviewed at https://codereview.chromium.org/15747004/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9295 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-28 16:45:07 +00:00
reed@google.com
f2de1e286b add new gm for bicubic filtering
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9291 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-28 15:29:25 +00:00
commit-bot@chromium.org
912e68ec46 Fix degenerate and near-degenerate hairlines on the gpu
R=robertphillips@google.com, bsalomon@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9279 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-24 18:51:55 +00:00
scroggo@google.com
dbbcaa8983 Revert "Add path utils, plus a test for it."
This reverts commit d172374b46cae0bd5d7c024b9848f5bdafcc6a16.

This CL broke on Windows.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9278 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-24 18:28:57 +00:00
scroggo@google.com
1bee037044 Add path utils, plus a test for it.
SkOSFile:
Added class SkOSPath with functions for
modifying strings representing path names.

OSPathTest.cpp:
Test of the new utilities.

factory.cpp:
Use SkPathJoin.

gmmain and gm_expectations:
Use SkOSPath::SkPathJoin instead of a local version.

skimage_main.cpp:
Use the new location of SkPathJoin and SkBasename.

R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9277 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-24 18:12:17 +00:00
reed@google.com
3d3a860d0b Add flag to gradients to interpolate colors in premul space. Experimental API to encapsulate the shared parameters for all gradients into a struct.
BUG=
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9273 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-24 14:58:44 +00:00
commit-bot@chromium.org
8b79028d27 Move SkDrawLooper implementation to its own file.
It previously lived in SkPaint.cpp.

BUG=
R=reed@google.com, tomhudson@chromium.org, jbroman@chromium.org

Author: jbroman@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9272 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-24 14:57:53 +00:00
reed@google.com
4c69a064b4 clone of https://codereview.chromium.org/15316014/ with teaks
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9264 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-23 20:11:56 +00:00
reed@google.com
3597b73bc6 expand SkLua to handle creation of its own State
add lua sample

BUG=
R=robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9247 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-22 20:12:50 +00:00
reed@google.com
74ce6f046c add dumpops.lua as a sample scraper that just dumps the arguments
add SkLua.h for common utilities

BUG=
R=rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9242 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-22 15:13:18 +00:00
reed@google.com
8c6411a603 reenable lerpmode in gms, now that I think we fixed the global-initialization
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9234 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-22 13:21:32 +00:00
commit-bot@chromium.org
8f838259ab Add methods to SkLayerDrawLooper to allow adding layers on top
as well as on the bottom.

This is more convenient for some callers who generate layers
from a data structure in bottom-to-top, rather than top-to-bottom,
order.

BUG=242529
R=tomhudson@chromium.org

Author: jbroman@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9233 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-22 12:35:50 +00:00
reed@google.com
e96cf0848d disable lerpmode gm until we fix serialization
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9230 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-21 21:52:03 +00:00
reed@google.com
b83cb9bf89 add SkLerpXfermode
BUG=
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9229 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-21 21:33:11 +00:00
djsollen@google.com
bfae9d373c Add a fontConfig interface for android.
The contents of this CL are based on the SkFontHost_android.cpp found
in the android repository.

BUG=
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9219 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-21 16:53:50 +00:00
commit-bot@chromium.org
1f6aed0b1c Move SkImage::encode to SkImage_Codec.cpp.
Chrome depends on SkImage.cpp, but does not include SkImageDecoder,
so having SkImage::encode in SkImage.cpp breaks chromium. Temporarily
fix the problem by moving the implementation into SkImage_Codec.cpp.

The larger fix will be to solve
https://code.google.com/p/skia/issues/detail?id=1275

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9204 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-20 23:57:38 +00:00
scroggo@google.com
73e4d5710b Add a comment to the top of images.gyp.
Tells vi to color it properly.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9203 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-20 22:15:32 +00:00
commit-bot@chromium.org
05403dfe24 Remove the fno-rtti excluders now that fno-rtti is only passed to c++ files.
R=djsollen@google.com

Author: bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9165 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-16 14:53:28 +00:00
reed@google.com
1ef08bb532 use define to work-around localeconf() missingness in android
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9157 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-15 20:55:49 +00:00
reed@google.com
a774adf3a1 lua not building on android ??? disabling for now
git-svn-id: http://skia.googlecode.com/svn/trunk@9156 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-15 20:16:20 +00:00
reed@google.com
9bf99c31a9 fix typo in dependency line (don't name file, just dir)
git-svn-id: http://skia.googlecode.com/svn/trunk@9153 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-15 20:07:22 +00:00
reed@google.com
e52d2911a1 add direct_dependencies for picture_utils, and add cflags_cc for android's gypi
Review URL: https://codereview.chromium.org/14620020

git-svn-id: http://skia.googlecode.com/svn/trunk@9152 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-15 20:01:07 +00:00
reed@google.com
04df4732b7 disable lua_pictures tool from make for now
git-svn-id: http://skia.googlecode.com/svn/trunk@9150 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-15 19:42:16 +00:00
reed@google.com
dff7e11c20 add SkLuaCanvas
add lua 5.2 to third_party

BUG=
R=bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9149 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-15 19:34:20 +00:00
robertphillips@google.com
dd3f365482 Add GM to track thin rectangle rendering
https://codereview.chromium.org/15012024/



git-svn-id: http://skia.googlecode.com/svn/trunk@9120 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-14 16:37:31 +00:00
reed@google.com
381bb43efb add separate impl file for SkFontMgr_fontconfig, so we don't polute
SkFontHost_fontconfig, which should be sharable w/ android. Eventaully
we will remove that FontHost file completely, and just use the SkFontMgr.

R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9114 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-13 19:43:59 +00:00
robertphillips@google.com
1d2f631594 add bench for blurred rectori case
https://codereview.chromium.org/14690014/



git-svn-id: http://skia.googlecode.com/svn/trunk@9108 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-13 14:10:31 +00:00
commit-bot@chromium.org
c7a20e4093 API modifications needed to upstream Android font changes.
Committed: http://code.google.com/p/skia/source/detail?r=9083

R=reed@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9107 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-13 14:09:13 +00:00
robertphillips@google.com
e55491d846 Reverting 9083 & 9084 due to Android failures
git-svn-id: http://skia.googlecode.com/svn/trunk@9085 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-09 22:47:33 +00:00
commit-bot@chromium.org
14451703f1 API modifications needed to upstream Android font changes.
R=reed@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9083 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-09 20:54:20 +00:00
robertphillips@google.com
6670ab9e63 Added game-like bench marks
https://codereview.chromium.org/14772019/



git-svn-id: http://skia.googlecode.com/svn/trunk@9078 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-09 19:03:48 +00:00
scroggo@google.com
6843bdb706 Write/compare against expectations in skimage tool.
skimage:
Add two new modes: one to write expectations to a json file, and
another to compare results against expectations.
Use SkPATH_SEPARATOR instead of '/'.

gm_expectations:
Split into a static library so it can be used by skimage.
Make functions non static and move function definitions into source
file.
Capitalize static member functions to follow the coding style
guidelines.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9069 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-08 19:14:23 +00:00
epoger@google.com
0a117be391 Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gyp
R=rmistry@google.com

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



git-svn-id: http://skia.googlecode.com/svn/trunk@9064 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-08 16:04:02 +00:00