aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 9f49e0e2: ignore from gingerbread-plus-aospJean-Baptiste Queru2011-03-310-0/+0
|\
| * ignore from gingerbread-plus-aospJean-Baptiste Queru2011-03-310-0/+0
| |\
| | * Adding skia header changes as needed for webkit MR1 to compileRussell Brenner2011-03-312-0/+47
| | * Add SkTypeface::isFixedWidth()Russell Brenner2011-03-311-2/+7
* | | Fix Path generation id tracking.Romain Guy2011-03-182-3/+14
* | | Skia Merge (revision 950)Derek Sollenberger2011-03-1778-1624/+3067
* | | Build the golden master tests for skia.Derek Sollenberger2011-03-172-3/+13
* | | Merge "Skia Merge (revision 922)"Derek Sollenberger2011-03-15301-23100/+31023
|\ \ \
| * | | Skia Merge (revision 922)Derek Sollenberger2011-03-14301-23100/+31023
* | | | external/skia: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-3/+0
| |/ / |/| |
* | | Enables logging error messages when a JPEG image cannot get decoded.Wei-Ta Chen2011-03-111-1/+1
|/ /
* | Fix 3510563: memory leak in BitmapRegionDecoder.Chih-Chung Chang2011-03-081-1/+6
* | Skia Merge (revision 842)Derek Sollenberger2011-02-2425-142/+567
* | Merge "Skia Merge (revision 808)"Derek Sollenberger2011-02-24237-6674/+19447
|\ \
| * | Skia Merge (revision 808)Derek Sollenberger2011-02-23237-6674/+19447
* | | Merge "Correctly apply camera's location."Romain Guy2011-02-231-2/+5
|\ \ \
| * | | Correctly apply camera's location.Romain Guy2011-02-231-2/+5
* | | | Merge "Add the ability to control the camera's location."Romain Guy2011-02-232-0/+9
|\ \ \ \ | |/ / /
| * | | Add the ability to control the camera's location.Romain Guy2011-02-232-0/+9
| |/ /
* | | Check for pixels allocation failureEric Hassold2011-02-232-4/+29
|/ /
* | am 4e4d0834: Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ \
| * \ Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\ \
| | * \ Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| | |\ \
| | | * \ am b4f070ed: (-s ours) Do not merge.Wei-Ta Chen2011-01-260-0/+0
| | | |\ \ | | |/ / /
* | | | | am 67a98d67: am 9221e808: Implement SkRegion::toString().Joe Onorato2011-01-192-0/+32
|\ \ \ \ \ | |/ / / /
| * | | | am 9221e808: Implement SkRegion::toString().Joe Onorato2011-01-192-0/+32
| |\ \ \ \ | | |/ / /
| | * | | Implement SkRegion::toString().Joe Onorato2011-01-192-0/+32
* | | | | am 9f6d5271: am b450292f: Unroll skia ARGB8888 blitter loops.Jeff Brown2011-01-131-0/+51
|\ \ \ \ \ | |/ / / /
| * | | | am b450292f: Unroll skia ARGB8888 blitter loops.Jeff Brown2011-01-131-0/+51
| |\ \ \ \ | | |/ / /
| | * | | Unroll skia ARGB8888 blitter loops.Jeff Brown2011-01-131-0/+51
* | | | | am 43c424fd: (-s ours) am 8c4d7a6d: (-s ours) am b4f070ed: Do not merge.Wei-Ta Chen2011-01-130-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 8c4d7a6d: (-s ours) am b4f070ed: Do not merge.Wei-Ta Chen2011-01-130-0/+0
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | am b4f070ed: Do not merge.Wei-Ta Chen2011-01-135-47/+70
| | |\ \ | | | |/
| | | * Do not merge.Wei-Ta Chen2011-01-115-47/+70
* | | | Add support for WebP format in SkiaEric Hassold2011-01-055-4/+663
|/ / /
* | | Merge "Add optional data argument to SkPixelRef::globalRef()"Patrick Dubroy2010-12-152-2/+2
|\ \ \
| * | | Add optional data argument to SkPixelRef::globalRef()Patrick Dubroy2010-12-152-2/+2
* | | | Merge "Fix issue with SkPaint references being out of date."Chet Haase2010-12-152-3/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix issue with SkPaint references being out of date.Chet Haase2010-12-152-3/+8
* | | | Changes to support bitmaps allocated in the Java heap.Patrick Dubroy2010-12-145-5/+30
|/ / /
* | | Allow bitmap reuse with PNG decodingChet Haase2010-12-103-13/+44
* | | Fix pixel ref counting bug in image decode.Bryan Mawhinney2010-12-101-10/+8
* | | Add ability to reuse bitmaps for new contentChet Haase2010-12-093-21/+52
* | | Merge "Fix text corruption issue with OpenGL renderer. Bug #3213785"Romain Guy2010-12-071-7/+10
|\ \ \
| * | | Fix text corruption issue with OpenGL renderer.Romain Guy2010-12-071-7/+10
* | | | Add fPreferQualityOverSpeed to SkImageDecoder.Wei-Ta Chen2010-12-062-3/+27
|/ / /
* | | am 7c7e5653: Merge from open-source masterJean-Baptiste Queru2010-12-020-0/+0
|\ \ \ | |/ /
| * | Merge from open-source masterJean-Baptiste Queru2010-12-022-4/+4
| |\ \
| | * \ Merge "Fix compilation errors:"Jean-Baptiste Queru2010-12-012-4/+4
| | |\ \
| | | * | Fix compilation errors:Rene Bolldorf2010-08-172-4/+4