Commit Graph

501 Commits

Author SHA1 Message Date
scroggo@google.com
74b7ffda68 Fixes for piping bitmaps with encoded data.
Similar goals as https://codereview.chromium.org/14437012.

Builds on patch set 1 from that issue
(https://codereview.chromium.org/14437012/#ps1).

Instead of the changes in patch set 2 from that issue, this
changes SkOrderedWriteBuffer::writeBitmap to store whether an
SkBitmapHeap was used when to store the index of the SkBitmap.
SkOrderedReadBuffer::readBitmap now uses that information to
distinguish between using the heap and unflattening.

In addition, writeBitmap now records the width/height first in
all cases. If now SkBitmapHeapReader is attached, but an
SkBitmapHeap was used to record the bitmap, reading will fail
and provide the same red SkBitmap as in the case where the
SkBitmap was encoded but could not be decoded.

Updates the PICTURE_VERSION as well.

The key differences in this CL to look at are in:
SkOrderedWriteBuffer,
SkOrderedReadBuffer,
and SkPicture.

BUG=
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8917 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-30 02:32:41 +00:00
tfarina@chromium.org
770ab362a9 Remove deprecated/obsolete Makefiles.
$ git ls-files | grep .mk

or

$ find . -name *.mk

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8717 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-17 13:36:15 +00:00
tfarina@chromium.org
7731eada5b Fix more clang errors.
Fixed -Wunused-private-field errors.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8547 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-05 21:13:14 +00:00
tfarina@chromium.org
e80c2bc80e Fix more clang tautological-constant-out-of-range-compare errors.
And one of unused-private-field:
samplecode/SampleStrokeText.cpp:109:10: error: private field 'fAA' is not used [-Werror,-Wunused-private-field]
    bool fAA;

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8445 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-29 16:53:30 +00:00
skia.committer@gmail.com
8eaddb0089 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8211 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-19 07:15:10 +00:00
robertphillips@google.com
0bd80fa01b Added toString to SkMaskFilter-derived classes
https://codereview.appspot.com/7889043/



git-svn-id: http://skia.googlecode.com/svn/trunk@8194 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-18 17:53:38 +00:00
sugoi@google.com
93c7ee34dc Removed unused parameters
I removed unused parameters wherever it was trivial to do so.
Review URL: https://codereview.chromium.org/12772003

git-svn-id: http://skia.googlecode.com/svn/trunk@8103 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-12 14:36:57 +00:00
sugoi@google.com
9c55f801a3 Fixing some warnings on Linux
There were only a few warnings left, so I fixed them and enabled the unused variable warning by removing the "-Wno-unused" flag. Only the -Wno-unused-parameter remains for now (could be removed later).
Review URL: https://codereview.chromium.org/12480002

git-svn-id: http://skia.googlecode.com/svn/trunk@8030 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-07 20:52:59 +00:00
mike@reedtribe.org
64494e99af add 'o' option to show fat-oval
git-svn-id: http://skia.googlecode.com/svn/trunk@8002 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-06 02:18:33 +00:00
bsalomon@google.com
64cc810ad1 Make SkOSWindow return the sample count and stencil bit count for its GL context.
Review URL: https://codereview.chromium.org/12437010

git-svn-id: http://skia.googlecode.com/svn/trunk@7995 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-05 20:06:05 +00:00
mike@reedtribe.org
bb963e2585 remove obsolete mac-font-cruft
git-svn-id: http://skia.googlecode.com/svn/trunk@7949 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-03 13:55:40 +00:00
reed@google.com
92abe48f24 move SampleTypeface into gm/typefacestyles
git-svn-id: http://skia.googlecode.com/svn/trunk@7867 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-26 16:57:16 +00:00
scroggo@google.com
f8d7d27313 Create SkLazyPixelRef which performs lazy decoding.
The new pixel ref behaves similarly to SkImageRef, with some key differences:
It does not depend on the images project.
It requires an SkImageCache, which handles allocation and caching of the pixel
memory.
It takes a function signature for decoding which decodes into already allocated
pixel memory rather than into an SkBitmap.

Add two implementations of SkImageCache: SkLruImageCache and SkAshmemImageCache.

Replace SkSerializationHelpers::DecodeBitmap with SkPicture::InstallPixelRefProc,
and update sites that referenced it.

SkBitmapFactory now sets the pixel ref to a new object of the new
class SkLazyPixelRef, provided it has an SkImageCache for caching.

Provide an option to do lazy decodes in render_pictures and bench_pictures.

SkPicture:
Eliminate the default parameters in the constructor.
If a proc for decoding bitmaps is installed, use it to decode any encoded
data in subpictures.
When parsing deserializing subpictures, check for success.
When serializing subpictures, pass the picture's bitmap encoder to the
subpicture's call to serialize.

Update BitmapFactoryTest to test its new behavior.

BUG=https://code.google.com/p/skia/issues/detail?id=1008
BUG=https://code.google.com/p/skia/issues/detail?id=1009

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7835 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-22 21:38:35 +00:00
mike@reedtribe.org
dd0c3a55ec fix signature for onFindClickHandler
git-svn-id: http://skia.googlecode.com/svn/trunk@7764 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-18 21:52:43 +00:00
bsalomon@google.com
9053c2e2ae Add animated line chart sample
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7307117

git-svn-id: http://skia.googlecode.com/svn/trunk@7727 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-13 21:22:13 +00:00
djsollen@google.com
efbe8e9bed Fix errors when compiling with -Wall -Werror on Android.
This CL also turns those features on by default on Android

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7645 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-07 18:58:35 +00:00
bsalomon@google.com
fec0bc3fc1 Remove legacy names no longer referenced in Chrome and WebKit.
Review URL: https://codereview.appspot.com/7311055

git-svn-id: http://skia.googlecode.com/svn/trunk@7640 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-07 14:43:04 +00:00
senorblanco@chromium.org
3cb406bb88 Implement support for origin-TopLeft render targets. Note that the default behaviour remains the same: textures default to origin-TopLeft, render targets default to origin-BottomLeft, and backend textures default to origin-BottomLeft. However, the caller can override the default by setting fOrigin in GrTextureDesc, GrBackendTextureDesc or GrBackendRenderTargetDesc.
Review URL: https://codereview.appspot.com/7230049

git-svn-id: http://skia.googlecode.com/svn/trunk@7594 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-05 19:50:46 +00:00
robertphillips@google.com
cf9faf6ce9 Reverting r7545 (render target origin change) due to layout test issues (see https://codereview.chromium.org/12210002/)
git-svn-id: http://skia.googlecode.com/svn/trunk@7571 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-05 14:05:06 +00:00
senorblanco@chromium.org
ed8659b51d Implement support for origin-TopLeft render targets in GL backend.
Review URL: https://codereview.appspot.com/7230049

git-svn-id: http://skia.googlecode.com/svn/trunk@7545 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-04 17:29:51 +00:00
bsalomon@google.com
d11c91e7aa Fix unused var warning-as-error
git-svn-id: http://skia.googlecode.com/svn/trunk@7513 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-01 15:42:59 +00:00
bsalomon@google.com
d62e88e5af Make drawIndexedInstances non-virtual and rewrite GrIODB's drawRect on top of drawIndexedInstances.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7221078

git-svn-id: http://skia.googlecode.com/svn/trunk@7508 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-02-01 14:19:27 +00:00
reed@google.com
8d3cd7a170 clone of https://codereview.appspot.com/7208043/
Review URL: https://codereview.appspot.com/7232062

git-svn-id: http://skia.googlecode.com/svn/trunk@7476 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-30 21:36:11 +00:00
mike@reedtribe.org
093455c116 add missing parameter to overridden onFindClickHandler
git-svn-id: http://skia.googlecode.com/svn/trunk@7410 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-28 02:21:27 +00:00
skia.committer@gmail.com
e16efc1882 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7406 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-26 07:06:02 +00:00
bungeman@google.com
82c2fec824 Remove ConcaveToTriangles.
git-svn-id: http://skia.googlecode.com/svn/trunk@7383 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-24 22:31:01 +00:00
reed@google.com
58c0aaaf1b fix missing-case-statement warning
git-svn-id: http://skia.googlecode.com/svn/trunk@7381 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-24 22:09:06 +00:00
reed@google.com
4bbdeac58c add optional cull-rect to patheffects, so they can do less work if their results
lie outside of the current clip-bounds (the cull rect).
Review URL: https://codereview.appspot.com/7206044

git-svn-id: http://skia.googlecode.com/svn/trunk@7378 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-24 21:03:11 +00:00
bsalomon@google.com
82502e2e39 Fix SampleApp ANGLE mode.
Review URL: https://codereview.appspot.com/7206052

git-svn-id: http://skia.googlecode.com/svn/trunk@7377 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-24 20:47:18 +00:00
robertphillips@google.com
b83b6b4f76 Added toString to SkXfermode-derived classes (for debugger)
https://codereview.appspot.com/7139058/



git-svn-id: http://skia.googlecode.com/svn/trunk@7308 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-22 14:32:09 +00:00
djsollen@google.com
388974f1dd Remove unused debugger code from SampleApp.
Review URL: https://codereview.appspot.com/7133049

git-svn-id: http://skia.googlecode.com/svn/trunk@7244 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-17 13:20:01 +00:00
robertphillips@google.com
76f9e938df Added print out of SkShader information to debugger
https://codereview.appspot.com/7105045/



git-svn-id: http://skia.googlecode.com/svn/trunk@7201 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 20:17:47 +00:00
reed@google.com
72708fa18d fix win build
git-svn-id: http://skia.googlecode.com/svn/trunk@7084 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-08 16:22:44 +00:00
reed@google.com
4d5c26de0a pass modifier keys to click events (e.g. control | shift etc.)
Review URL: https://codereview.appspot.com/7062054

git-svn-id: http://skia.googlecode.com/svn/trunk@7082 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-08 16:17:50 +00:00
reed@google.com
140d7286c5 fix warnings
Review URL: https://codereview.appspot.com/7073044

git-svn-id: http://skia.googlecode.com/svn/trunk@7064 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-07 20:25:04 +00:00
humper@google.com
0e51577a14 fix warning from scalar --> int32 conversion
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7061 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-07 19:54:40 +00:00
vandebo@chromium.org
f7b62d6ff2 Remove unused variable.
Review URL: https://codereview.appspot.com/7035062

git-svn-id: http://skia.googlecode.com/svn/trunk@7032 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-04 19:42:39 +00:00
vandebo@chromium.org
d96d17b9c1 Remove SkRefPtr
(resubmit of https://codereview.appspot.com/7030059/)
TBR=junov@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@7030 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-04 19:31:24 +00:00
jvanverth@google.com
9c81bd5540 Fix Windows warning: Changed implicit int32_t to SkScalar cast to explicit SkIntToScalar call.
git-svn-id: http://skia.googlecode.com/svn/trunk@6993 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-03 14:46:41 +00:00
skia.committer@gmail.com
2157983513 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6947 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-25 02:01:27 +00:00
mike@reedtribe.org
3af2b8def6 fix warnings:
- initializer order in PictureRenderer.h
- const in xfermode overrides



git-svn-id: http://skia.googlecode.com/svn/trunk@6946 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-24 18:26:43 +00:00
mike@reedtribe.org
102b4d57af add const to unhide virtuals in custom colorfilter
fix some braces for coding style.



git-svn-id: http://skia.googlecode.com/svn/trunk@6945 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-24 18:15:57 +00:00
mike@reedtribe.org
61490fa4d2 fix warnings related to constness in overrides of SkColorFilter
update samples for circle testing



git-svn-id: http://skia.googlecode.com/svn/trunk@6943 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-24 14:38:46 +00:00
skia.committer@gmail.com
15ed90f6ee Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6934 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-23 02:01:31 +00:00
mike@reedtribe.org
b563709308 add test for large strokes on circles
git-svn-id: http://skia.googlecode.com/svn/trunk@6932 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-22 20:53:59 +00:00
reed@google.com
30711b764b change SkMaskFilter methods to const, in preparation for making the class as
immutable and re-entrant safe.
Review URL: https://codereview.appspot.com/6944069

git-svn-id: http://skia.googlecode.com/svn/trunk@6881 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-18 19:18:39 +00:00
reed@google.com
548a1f3210 change all patheffect methods to const, in preparation for marking its
subclasses as immutable/re-entrant safe.
Review URL: https://codereview.appspot.com/6949071

git-svn-id: http://skia.googlecode.com/svn/trunk@6877 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-18 16:12:09 +00:00
reed@google.com
4c1f091b68 kill unused SkFlipPixelRef
Review URL: https://codereview.appspot.com/6949043

git-svn-id: http://skia.googlecode.com/svn/trunk@6781 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-13 16:35:37 +00:00
robertphillips@google.com
ca47aae7ec Minor cleanup
https://codereview.appspot.com/6927054/



git-svn-id: http://skia.googlecode.com/svn/trunk@6756 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-12 15:58:25 +00:00
djsollen@google.com
796763e0b2 Reapply (r6718) with fix for compiler error on linux.
git-svn-id: http://skia.googlecode.com/svn/trunk@6729 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-10 14:12:55 +00:00