merge from android tree:
authordjsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 23 Feb 2011 20:46:31 +0000 (20:46 +0000)
committerdjsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 23 Feb 2011 20:46:31 +0000 (20:46 +0000)
commit57f4969724a1dd88c8d9ae35a863e6cf621181d5
treecb1c377ea38c512e380b21d8d767c4497142f5a8
parent819c921b0445fa9f45f18d4a560603cd9fde6ba4
merge from android tree:
- optional parameters added to descriptorProc and allocPixels
- clip options to image decoders
- check for xfermode in blitter_a8
- UNROLL loops in blitrow

reviewed by reed@google.com

git-svn-id: http://skia.googlecode.com/svn/trunk@841 2bbb7eff-a529-9590-31e7-b0007b416f81
26 files changed:
include/core/SkBitmap.h
include/core/SkPaint.h
include/core/SkPixelRef.h
include/core/SkStream.h
include/core/SkTemplates.h
include/images/SkImageRef.h
include/images/SkJpegUtility.h
src/core/SkBitmap.cpp
src/core/SkBlitRow_D32.cpp
src/core/SkBlitter_A8.cpp
src/core/SkPaint.cpp
src/core/SkPixelRef.cpp
src/core/SkStream.cpp
src/images/SkFlipPixelRef.cpp
src/images/SkImageDecoder_Factory.cpp
src/images/SkImageDecoder_libgif.cpp
src/images/SkImageDecoder_libjpeg.cpp
src/images/SkImageRef.cpp
src/images/SkImageRef_GlobalPool.cpp
src/images/SkJpegUtility.cpp
src/images/SkMovie_gif.cpp
src/images/SkScaledBitmapSampler.cpp
src/images/SkScaledBitmapSampler.h
src/ports/SkImageRef_ashmem.cpp
src/ports/SkImageRef_ashmem.h
src/utils/SkNinePatch.cpp