aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix issue with SkPaint references being out of date.Chet Haase2010-12-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | The mechanism used for determining whether an SkPaint object is the same as a cached version was broken. The problem was that Skia would blow away the generationID in some situations (assignment and reset), making that ID completely invalid. This would cause the displayList rendering code to sometimes make the wrong decision, thinking that an out of date object was actually still valid. Change-Id: I5e11eb9ac41e5d87d528b99e3781a4d348f76490
* | Changes to support bitmaps allocated in the Java heap.Patrick Dubroy2010-12-143-2/+20
|/ | | Change-Id: Ib083409abc4110dafa32b5ee4bfa01c0caeb907b
* Allow bitmap reuse with PNG decodingChet Haase2010-12-101-2/+5
| | | | Change-Id: I8ba53eb6d4b99ce6352358b666d30b7668aa834f
* Add ability to reuse bitmaps for new contentChet Haase2010-12-091-3/+3
| | | | Change-Id: Ie4919c18c0b71bc1d4b3976afd7657a8fb0fc0ef
* Add fPreferQualityOverSpeed to SkImageDecoder.Wei-Ta Chen2010-12-061-0/+15
| | | | | | | | Currently the field only affects JPEG decode, in that when it is set to true, we choose a more accurate, but slightly slower, IDCT method. Bug: 3238925 Change-Id: I7da20de7281243dc3e246b328517df10039cd290
* Skia: Merge upstream patch series that refactors SkCanvas to avoid subclassing.tedbo2010-11-113-71/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change merges upstream Skia revisions r604,r605,r618, and r623. The patch series refactors SkCanvas so that backends don't need to override it. The r623 patch was upstreamed explicitly so that this series can be made into a clean patch for Android to avoid merge conflicts in the future. The log messages from the original commits are as follows: * r604: http://code.google.com/p/skia/source/detail?r=604 Refactor SkCanvas so that backends don't need to override it. Methods or classes that should go away are marked deprecated. The only thing I know of that breaks backward compatibility is SkCanvas((SkDevice*)NULL), but that is fairly unlikely to occur in the wild because that constructor had a default value of NULL. * r605: http://code.google.com/p/skia/source/detail?r=605 Fix a memory leak in the new Canvas/Device workflow. The previous change made it difficult to inherit from SkCanvas without leaking memory. By making SkDeviceFactory not reference counted, the right thing happens more naturally, just NewCanvas : public SkCanvas(new NewDeviceFactory()) {...} * r618: http://code.google.com/p/skia/source/detail?r=618 Move the device capability method to SkDevice. These are not the capabilities of the factory, but of the device. Additionally, it is more often needed when you have a device then when you have a factory, which caused creating of a new factory. * r623: http://code.google.com/p/skia/source/detail?r=623 Remove include of SkGLDevice.h from SkGLCanvas.h The '#include "SkGLDevice.h"' from include/core/SkDevice.h requires internal Skia code to be added to the include search paths when using the deprecated API. This change adds back SkGLCanvas.cpp to avoid exposing SkGLDevice.h to the public API. The change also includes an explicit virtual destructor on SkDeviceFactory to silence a -Wnon-virtual-dtor warning and allow for -Werror. Change-Id: I3442e2801c1d8d8c9cb2a20259f15bc870c393dc
* Added generation ID to SkPaint to easily detect changed object.Chet Haase2010-10-251-0/+3
| | | | | | | | This new ID is used by display list objects to detect when the SkPaint object's properties have changed and the display list needs to copy the paint into a new object to avoid reusing an obsolete copy of it. Change-Id: I1fb7034bea63eca247b72b939cb20f0fcece067a
* Expose SkPictureFlatRomain Guy2010-09-261-0/+209
| | | | Change-Id: Ib6c873b7e7e42a3680a3d9110dae1fc369dfa393
* am 2626a123: am c408f5a2: Merge "Rename SkLargeBitmap to ↵Wei-Ta Chen2010-09-221-5/+5
|\ | | | | | | | | | | | | | | | | SkBitmapRegionDecoder (the previous renaming was reverted)." into gingerbread Merge commit '2626a12394e8b284ff7d88e0ec0e99beaa31b795' * commit '2626a12394e8b284ff7d88e0ec0e99beaa31b795': Rename SkLargeBitmap to SkBitmapRegionDecoder (the previous renaming was reverted).
| * Merge "Rename SkLargeBitmap to SkBitmapRegionDecoder (the previous renaming ↵Wei-Ta Chen2010-09-221-5/+5
| |\ | | | | | | | | | was reverted)." into gingerbread
| | * Rename SkLargeBitmap to SkBitmapRegionDecoder (the previous renaming was ↵Wei-Ta Chen2010-09-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | reverted). The change is identical to https://android-git.corp.google.com/g/#change,64714 . Change-Id: If0136fcc96bcdab323607b701e2ef69ddf42f63d
* | | am 2ff9c8dd: am 58971879: Add the tile-based decoding capability to the PNG ↵Joseph Wen2010-09-191-1/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | decoder. Merge commit '2ff9c8dd5defefc240f1b871a6927cb4352c0077' * commit '2ff9c8dd5defefc240f1b871a6927cb4352c0077': Add the tile-based decoding capability to the PNG decoder.
| * | Add the tile-based decoding capability to the PNG decoder.Joseph Wen2010-09-201-1/+20
| |/ | | | | | | Change-Id: Ie506dbf914cca9ad8a55747657abbe2a245ef217
* | am 3a1cc970: Fix bug in SkImageDecoderJoseph Wen2010-09-103-5/+12
|\ \ | |/ | | | | | | | | | | Merge commit '3a1cc9700bf928ed3b1e05c7edc543124440c54c' * commit '3a1cc9700bf928ed3b1e05c7edc543124440c54c': Fix bug in SkImageDecoder
| * Fix bug in SkImageDecoderJoseph Wen2010-09-103-5/+12
| | | | | | | | Change-Id: I6d214e4d8cce49f7e12eeb924493161dadd5aa26
| * Revert "Rename SkLargeBitmap to SkBitmapRegionDecoder."Wei-Ta Chen2010-09-081-5/+5
| | | | | | | | This reverts commit 2d8e78250676546c549082dc988e7262ab1bb154.
* | Expose Xfermode's mode in the SkXfermode class.Romain Guy2010-09-091-0/+2
| | | | | | | | Change-Id: Ibdb7620348ee7af585a58ad43b26d3d6f47c403c
* | Revert "Rename SkLargeBitmap to SkBitmapRegionDecoder."Wei-Ta Chen2010-09-081-5/+5
| | | | | | | | This reverts commit 2d8e78250676546c549082dc988e7262ab1bb154.
* | am 2d8e7825: Rename SkLargeBitmap to SkBitmapRegionDecoder.Wei-Ta Chen2010-09-071-5/+5
|\ \ | |/ | | | | | | | | | | Merge commit '2d8e78250676546c549082dc988e7262ab1bb154' * commit '2d8e78250676546c549082dc988e7262ab1bb154': Rename SkLargeBitmap to SkBitmapRegionDecoder.
| * Rename SkLargeBitmap to SkBitmapRegionDecoder.Wei-Ta Chen2010-09-061-5/+5
| | | | | | | | Change-Id: I093aea3d5e3e89c75b5086ede2b8bb30d8ceed95
| * DO NOT MERGE. Add an API to correctly copy the isOpaque flage of an ImageRef ↵Romain Guy2010-08-191-0/+6
| | | | | | | | | | | | to Bitmap. Change-Id: I64904bf4d77a0d84f92d31024f48a2e3e0514f73
* | Ensure the OpenGL renderer is not given gamma corrected fonts.Romain Guy2010-08-271-1/+1
| | | | | | | | Change-Id: Ie58f75c2bb2b09fc2e1e96ad94ad7c907d067bd4
* | Add an API to correctly copy the isOpaque flage of an ImageRef to Bitmap.Romain Guy2010-08-191-0/+6
| | | | | | | | Change-Id: I4aef8381bb6f722c0630ddc15a32a0ef07041613
* | am ae3c9823: Fix master sim breakJoseph Wen2010-08-171-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit 'ae3c9823f39f96243d0f69d90363dc43e1540c09' * commit 'ae3c9823f39f96243d0f69d90363dc43e1540c09': Fix master sim break
| * Fix master sim breakJoseph Wen2010-08-171-2/+2
| | | | | | | | Change-Id: If1fd071cad08b23bc44c4ca29bcc71a9c68696b9
* | am 97fa2e45: Do JPEG tile-based decoding.Joseph Wen2010-08-163-2/+87
|\ \ | |/ | | | | | | | | | | Merge commit '97fa2e455b2040c99c5b6f3e3d2ad6c9b4062081' * commit '97fa2e455b2040c99c5b6f3e3d2ad6c9b4062081': Do JPEG tile-based decoding.
| * Do JPEG tile-based decoding.Joseph Wen2010-08-163-2/+87
| | | | | | | | Change-Id: I795129d55a0a7da90b4d604a902066868933d2a9
* | Add Overlay blending mode for Android.Romain Guy2010-08-101-0/+1
| | | | | | | | Change-Id: Ia17cec1fd8a25a45f8826948a8c76e024decef65
* | Add a generation id to SkPath.Romain Guy2010-08-051-0/+3
| | | | | | | | | | | | This can be used to know whether a path was modified. Change-Id: I3a839357de4305d29cb608eacbada371682a5578
* | Expose two APIs to be able to retrieve glyphs from font cache.Romain Guy2010-07-201-0/+3
| | | | | | | | Change-Id: I4e033c009bef6f00b0cd2a8233f63351adc11df4
* | am d66241cf: am 4701b5d2: merge from open-source masterThe Android Open Source Project2010-05-121-0/+10
|\ \ | |/
| * merge from open-source masterThe Android Open Source Project2010-05-121-0/+10
| |\ | | | | | | | | | Change-Id: Ic7024b390883841714ac6fb5f6a11f87a9f707a6
| | * Added GetUnitsPerEM method to SkFontHostPeter Eliasson2010-05-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | GetUnitsPerEM can be used as convenience method to find out the number of font units per EM square without having to fetch the head table. Change-Id: I6f09b86a13e020ff74156571782f4bc822b7c1f3
* | | am 74054d95: am ff1f6696: merge from open-source masterThe Android Open Source Project2010-05-103-0/+19
|\ \ \ | |/ /
| * | merge from open-source masterThe Android Open Source Project2010-05-103-0/+19
| |\ \ | | |/ | | | | | | Change-Id: I064902aa9745342ccfe868331ccc000767e92fc0
| | * Added drawPosTextOnPath method.Andreas Borglin2010-04-263-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | The drawPosTextOnPath method allows for text positioned on a straight line to be drawn along a path. This method can be used by layout engines to implement the Canvas::drawTextOnPath method for complex scripts. Change-Id: I2f9c22b8c97eeacb61cd6de7429ba875a1e7ade9
| | * am 07a66af1: Do not mergeMike Reed2010-01-202-0/+130
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '07a66af19347d1f2d0d4610158a48a7cd34477fc' into eclair-plus-aosp * commit '07a66af19347d1f2d0d4610158a48a7cd34477fc': Do not merge
| | | * Do not mergeMike Reed2010-01-202-0/+130
| | | | | | | | | | | | | | | | port stretchy from master
| | * | am 9521ac9c: add table maskfilterMike Reed2009-10-301-0/+76
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit '9521ac9c669ee93f2e8ebfb4549ec64b57fe3559' into eclair-plus-aosp * commit '9521ac9c669ee93f2e8ebfb4549ec64b57fe3559': add table maskfilter
| | * | am 47f26218: add setDither api, so we can retain this setting when we ↵Mike Reed2009-09-241-0/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (re)decode the bitmap Merge commit '47f2621859e1e6fa9a5ed53e7ca66bc395999242' into eclair-plus-aosp * commit '47f2621859e1e6fa9a5ed53e7ca66bc395999242': add setDither api, so we can retain this setting when we (re)decode the bitmap
| | * \ \ am d0195f84: refresh from skia, with blitrow_d32 bottlenecks for neon ↵Mike Reed2009-09-241-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optimizations Merge commit 'd0195f840fa964da51f7a1192b432954794e660c' into eclair-plus-aosp * commit 'd0195f840fa964da51f7a1192b432954794e660c': refresh from skia, with blitrow_d32 bottlenecks for neon optimizations
| | * \ \ \ am 924f59d3: refresh from skia/trunk - two-point-radial gradients, needed ↵Mike Reed2009-09-221-1/+29
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for <canvas> and svg Merge commit '924f59d3627a697f2b0df3299915e814e160f981' into eclair-plus-aosp * commit '924f59d3627a697f2b0df3299915e814e160f981': refresh from skia/trunk - two-point-radial gradients, needed for <canvas> and svg
| | * \ \ \ \ am cf40b36a: Merge change 24882 into eclairMike Reed2009-09-141-0/+90
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cf40b36a8dbdf473010b780c4e01ee37693d0116' into eclair-plus-aosp * commit 'cf40b36a8dbdf473010b780c4e01ee37693d0116': add SkSize.h
| | * \ \ \ \ \ am fa8e93c3: update dox for fill_and_strokeMike Reed2009-09-141-3/+8
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fa8e93c3b0674603d1b6692f326cc1207f1e9a72' into eclair-plus-aosp * commit 'fa8e93c3b0674603d1b6692f326cc1207f1e9a72': update dox for fill_and_stroke
| | * \ \ \ \ \ \ am 57382d68: add decoding bitmaps to bench tool refresh misc. skia filesMike Reed2009-09-021-0/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '57382d688c1d6928b1d9bbbaf27188d54dd9e002' into eclair-plus-aosp * commit '57382d688c1d6928b1d9bbbaf27188d54dd9e002': add decoding bitmaps to bench tool
| | * \ \ \ \ \ \ \ merge from open-source masterJean-Baptiste Queru2009-09-011-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixes for skia to build for armv4tFredrik Markström2009-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are no longer supporting the armv4 architecture (see 9336 and 9378) but instead armv4t we should test on __ARM_ARCH_4T__ instead of __ARM_ARCH_4T__ https://review.source.android.com/Gerrit#change,9336 https://review.source.android.com/Gerrit#change,9378
* | | | | | | | | | | refresh from trunkMike Reed2010-04-144-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0175ec7482f8cf85d25165da360a5352979fd7a0
* | | | | | | | | | | am a41d49cf: fix dither->4444 to keep alpha >= colorMike Reed2010-04-061-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | fix dither->4444 to keep alpha >= colorMike Reed2010-04-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib92980c1aab25e4dc037ea9119643dc04f3618f3