resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp (e648c19b) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/Bitmap.cpp

+15 −9

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ static void ToColor_SI8_Alpha(SkColor dst[], const void* src, int width,
		do {
		dst++ = SkUnPreMultiply::PMColorToColor(colors[s++]);
		} while (--width != 0);
		ctable->unlockColors(false);
		ctable->unlockColors();
		}

		static void ToColor_SI8_Raw(SkColor dst[], const void* src, int width,
		@@ -240,7 +240,7 @@ static void ToColor_SI8_Raw(SkColor dst[], const void* src, int width,
		*dst++ = SkColorSetARGB(SkGetPackedA32(c), SkGetPackedR32(c),
		SkGetPackedG32(c), SkGetPackedB32(c));
		} while (--width != 0);
		ctable->unlockColors(false);
		ctable->unlockColors();
		}

		static void ToColor_SI8_Opaque(SkColor dst[], const void* src, int width,
		@@ -253,7 +253,7 @@ static void ToColor_SI8_Opaque(SkColor dst[], const void* src, int width,
		*dst++ = SkColorSetRGB(SkGetPackedR32(c), SkGetPackedG32(c),
		SkGetPackedB32(c));
		} while (--width != 0);
		ctable->unlockColors(false);
		ctable->unlockColors();
		}

		// can return NULL
		@@ -456,10 +456,16 @@ static jboolean Bitmap_hasAlpha(JNIEnv* env, jobject, jlong bitmapHandle) {
		return !bitmap->isOpaque() ? JNI_TRUE : JNI_FALSE;
		}

		static void Bitmap_setHasAlpha(JNIEnv* env, jobject, jlong bitmapHandle,
		jboolean hasAlpha) {
		static void Bitmap_setAlphaAndPremultiplied(JNIEnv* env, jobject, jlong bitmapHandle,
		jboolean hasAlpha, jboolean isPremul) {
		SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(bitmapHandle);
		bitmap->setIsOpaque(!hasAlpha);
		if (!hasAlpha) {
		bitmap->setAlphaType(kOpaque_SkAlphaType);
		} else if (isPremul) {
		bitmap->setAlphaType(kPremul_SkAlphaType);
		} else {
		bitmap->setAlphaType(kUnpremul_SkAlphaType);
		}
		}

		static jboolean Bitmap_hasMipMap(JNIEnv* env, jobject, jlong bitmapHandle) {
		@@ -561,14 +567,14 @@ static jboolean Bitmap_writeToParcel(JNIEnv* env, jobject,
		p->writeInt32(bitmap->rowBytes());
		p->writeInt32(density);

		if (bitmap->getConfig() == SkBitmap::kIndex8_Config) {
		if (bitmap->config() == SkBitmap::kIndex8_Config) {
		SkColorTable* ctable = bitmap->getColorTable();
		if (ctable != NULL) {
		int count = ctable->count();
		p->writeInt32(count);
		memcpy(p->writeInplace(count * sizeof(SkPMColor)),
		ctable->lockColors(), count * sizeof(SkPMColor));
		ctable->unlockColors(false);
		ctable->unlockColors();
		} else {
		p->writeInt32(0); // indicate no ctable
		}
		@@ -800,7 +806,7 @@ static JNINativeMethod gBitmapMethods[] = {
		{ "nativeRowBytes", "(J)I", (void*)Bitmap_rowBytes },
		{ "nativeConfig", "(J)I", (void*)Bitmap_config },
		{ "nativeHasAlpha", "(J)Z", (void*)Bitmap_hasAlpha },
		{ "nativeSetHasAlpha", "(JZ)V", (void*)Bitmap_setHasAlpha },
		{ "nativeSetAlphaAndPremultiplied", "(JZZ)V", (void*)Bitmap_setAlphaAndPremultiplied},
		{ "nativeHasMipMap", "(J)Z", (void*)Bitmap_hasMipMap },
		{ "nativeSetHasMipMap", "(JZ)V", (void*)Bitmap_setHasMipMap },
		{ "nativeCreateFromParcel",

core/jni/android/graphics/BitmapFactory.cpp

+26 −8

Original line number	Diff line number	Diff line
		@@ -124,12 +124,18 @@ static void scaleNinePatchChunk(android::Res_png_9patch* chunk, float scale) {
		static SkPixelRef* installPixelRef(SkBitmap* bitmap, SkStreamRewindable* stream,
		int sampleSize, bool ditherImage) {

		SkImageInfo bitmapInfo;
		if (!bitmap->asImageInfo(&bitmapInfo)) {
		ALOGW("bitmap has unknown configuration so no memory has been allocated");
		return NULL;
		}

		SkImageRef* pr;
		// only use ashmem for large images, since mmaps come at a price
		if (bitmap->getSize() >= 32 * 1024) {
		pr = new SkImageRef_ashmem(stream, bitmap->config(), sampleSize);
		pr = new SkImageRef_ashmem(bitmapInfo, stream, sampleSize);
		} else {
		pr = new SkImageRef_GlobalPool(stream, bitmap->config(), sampleSize);
		pr = new SkImageRef_GlobalPool(bitmapInfo, stream, sampleSize);
		}
		pr->setDitherImage(ditherImage);
		bitmap->setPixelRef(pr)->unref();
		@@ -157,7 +163,7 @@ public:
		virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable) {
		// accounts for scale in final allocation, using eventual size and config
		const int bytesPerPixel = SkBitmap::ComputeBytesPerPixel(
		configForScaledOutput(bitmap->getConfig()));
		configForScaledOutput(bitmap->config()));
		const int requestedSize = bytesPerPixel *
		int(bitmap->width() * mScale + 0.5f) *
		int(bitmap->height() * mScale + 0.5f);
		@@ -191,8 +197,15 @@ public:
		return false;
		}

		SkImageInfo bitmapInfo;
		if (!bitmap->asImageInfo(&bitmapInfo)) {
		ALOGW("unable to reuse a bitmap as the target has an unknown bitmap configuration");
		return false;
		}

		// Create a new pixelref with the new ctable that wraps the previous pixelref
		SkPixelRef* pr = new AndroidPixelRef(static_cast<AndroidPixelRef>(mPixelRef), ctable);
		SkPixelRef* pr = new AndroidPixelRef(static_cast<AndroidPixelRef>(mPixelRef),
		bitmapInfo, bitmap->rowBytes(), ctable);

		bitmap->setPixelRef(pr)->unref();
		// since we're already allocated, we lockPixels right away
		@@ -401,8 +414,11 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding

		// TODO: avoid copying when scaled size equals decodingBitmap size
		SkBitmap::Config config = configForScaledOutput(decodingBitmap.config());
		outputBitmap->setConfig(config, scaledWidth, scaledHeight);
		outputBitmap->setIsOpaque(decodingBitmap.isOpaque());
		// FIXME: If the alphaType is kUnpremul and the image has alpha, the
		// colors may not be correct, since Skia does not yet support drawing
		// to/from unpremultiplied bitmaps.
		outputBitmap->setConfig(config, scaledWidth, scaledHeight, 0,
		decodingBitmap.alphaType());
		if (!outputBitmap->allocPixels(outputAllocator, NULL)) {
		return nullObjectReturn("allocation failed for scaled bitmap");
		}
		@@ -414,7 +430,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
		}

		SkPaint paint;
		paint.setFilterBitmap(true);
		paint.setFilterLevel(SkPaint::kLow_FilterLevel);

		SkCanvas canvas(*outputBitmap);
		canvas.scale(sx, sy);
		@@ -541,7 +557,9 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, jlong native_asset,
		} else {
		// since we know we'll be done with the asset when we return, we can
		// just use a simple wrapper
		stream = new AssetStreamAdaptor(asset);
		stream = new AssetStreamAdaptor(asset,
		AssetStreamAdaptor::kNo_OwnAsset,
		AssetStreamAdaptor::kNo_HasMemoryBase);
		}
		SkAutoUnref aur(stream);
		return doDecode(env, stream, padding, options, forcePurgeable, forcePurgeable);

core/jni/android/graphics/BitmapRegionDecoder.cpp

+4 −5

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		#include "CreateJavaOutputStreamAdaptor.h"
		#include "Utils.h"
		#include "JNIHelp.h"
		#include "SkTScopedPtr.h"

		#include <android_runtime/AndroidRuntime.h>
		#include "android_util_Binder.h"
		@@ -76,7 +75,7 @@ private:
		int fHeight;
		};

		static jobject createBitmapRegionDecoder(JNIEnv* env, SkStream* stream) {
		static jobject createBitmapRegionDecoder(JNIEnv* env, SkStreamRewindable* stream) {
		SkImageDecoder* decoder = SkImageDecoder::Factory(stream);
		int width, height;
		if (NULL == decoder) {
		@@ -108,7 +107,7 @@ static jobject nativeNewInstanceFromByteArray(JNIEnv* env, jobject, jbyteArray b
		For now we just always copy the array's data if isShareable.
		*/
		AutoJavaByteArray ar(env, byteArray);
		SkStream* stream = new SkMemoryStream(ar.ptr() + offset, length, true);
		SkStreamRewindable* stream = new SkMemoryStream(ar.ptr() + offset, length, true);

		jobject brd = createBitmapRegionDecoder(env, stream);
		SkSafeUnref(stream); // the decoder now holds a reference
		@@ -216,7 +215,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, jlong brdHandle,
		region.fRight = start_x + width;
		region.fBottom = start_y + height;
		SkBitmap* bitmap = NULL;
		SkTScopedPtr<SkBitmap> adb;
		SkAutoTDelete<SkBitmap> adb;

		if (tileBitmap != NULL) {
		// Re-use bitmap.
		@@ -247,7 +246,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, jlong brdHandle,
		}

		// detach bitmap from its autodeleter, since we want to own it now
		adb.release();
		adb.detach();

		JavaPixelAllocator* allocator = (JavaPixelAllocator*) decoder->getAllocator();
		jbyteArray buff = allocator->getStorageObjAndReset();

core/jni/android/graphics/Canvas.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -548,7 +548,7 @@ public:
		if (paint) {
		filteredPaint = *paint;
		}
		filteredPaint.setFilterBitmap(true);
		filteredPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
		canvas->drawBitmap(*bitmap, left_, top_, &filteredPaint);
		} else {
		canvas->drawBitmap(*bitmap, left_, top_, paint);
		@@ -563,7 +563,7 @@ public:
		if (paint) {
		filteredPaint = *paint;
		}
		filteredPaint.setFilterBitmap(true);
		filteredPaint.setFilterLevel(SkPaint::kLow_FilterLevel);

		canvas->drawBitmap(*bitmap, 0, 0, &filteredPaint);

		@@ -586,7 +586,7 @@ public:
		if (paint) {
		filteredPaint = *paint;
		}
		filteredPaint.setFilterBitmap(true);
		filteredPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
		canvas->drawBitmapRect(*bitmap, srcPtr, dst, &filteredPaint);
		} else {
		canvas->drawBitmapRect(*bitmap, srcPtr, dst, paint);

core/jni/android/graphics/Graphics.cpp

+37 −7

Original line number	Diff line number	Diff line
		@@ -357,6 +357,18 @@ SkRegion* GraphicsJNI::getNativeRegion(JNIEnv* env, jobject region)

		///////////////////////////////////////////////////////////////////////////////////////////

		// Assert that bitmap's SkAlphaType is consistent with isPremultiplied.
		static void assert_premultiplied(const SkBitmap& bitmap, bool isPremultiplied) {
		// kOpaque_SkAlphaType and kIgnore_SkAlphaType mean that isPremultiplied is
		// irrelevant. This just tests to ensure that the SkAlphaType is not
		// opposite of isPremultiplied.
		if (isPremultiplied) {
		SkASSERT(bitmap.alphaType() != kUnpremul_SkAlphaType);
		} else {
		SkASSERT(bitmap.alphaType() != kPremul_SkAlphaType);
		}
		}

		jobject GraphicsJNI::createBitmap(JNIEnv* env, SkBitmap* bitmap, jbyteArray buffer,
		int bitmapCreateFlags, jbyteArray ninepatch, jintArray layoutbounds, int density)
		{
		@@ -365,6 +377,10 @@ jobject GraphicsJNI::createBitmap(JNIEnv* env, SkBitmap* bitmap, jbyteArray buff
		bool isMutable = bitmapCreateFlags & kBitmapCreateFlag_Mutable;
		bool isPremultiplied = bitmapCreateFlags & kBitmapCreateFlag_Premultiplied;

		// The caller needs to have already set the alpha type properly, so the
		// native SkBitmap stays in sync with the Java Bitmap.
		assert_premultiplied(*bitmap, isPremultiplied);

		jobject obj = env->NewObject(gBitmap_class, gBitmap_constructorMethodID,
		reinterpret_cast<jlong>(bitmap), buffer,
		bitmap->width(), bitmap->height(), density, isMutable, isPremultiplied,
		@@ -382,6 +398,10 @@ jobject GraphicsJNI::createBitmap(JNIEnv* env, SkBitmap* bitmap, int bitmapCreat
		void GraphicsJNI::reinitBitmap(JNIEnv* env, jobject javaBitmap, SkBitmap* bitmap,
		bool isPremultiplied)
		{
		// The caller needs to have already set the alpha type properly, so the
		// native SkBitmap stays in sync with the Java Bitmap.
		assert_premultiplied(*bitmap, isPremultiplied);

		env->CallVoidMethod(javaBitmap, gBitmap_reinitMethodID,
		bitmap->width(), bitmap->height(), isPremultiplied);
		}
		@@ -424,8 +444,9 @@ static JNIEnv* vm2env(JavaVM* vm)

		///////////////////////////////////////////////////////////////////////////////

		AndroidPixelRef::AndroidPixelRef(JNIEnv* env, void* storage, size_t size, jbyteArray storageObj,
		SkColorTable* ctable) : SkMallocPixelRef(storage, size, ctable, (storageObj == NULL)),
		AndroidPixelRef::AndroidPixelRef(JNIEnv* env, const SkImageInfo& info, void* storage,
		size_t rowBytes, jbyteArray storageObj, SkColorTable* ctable) :
		SkMallocPixelRef(info, storage, rowBytes, ctable, (storageObj == NULL)),
		fWrappedPixelRef(NULL) {
		SkASSERT(storage);
		SkASSERT(env);
		@@ -440,11 +461,11 @@ AndroidPixelRef::AndroidPixelRef(JNIEnv* env, void* storage, size_t size, jbyteA

		// If storageObj is NULL, the memory was NOT allocated on the Java heap
		fOnJavaHeap = (storageObj != NULL);

		}

		AndroidPixelRef::AndroidPixelRef(AndroidPixelRef& wrappedPixelRef, SkColorTable* ctable) :
		SkMallocPixelRef(wrappedPixelRef.getAddr(), wrappedPixelRef.getSize(), ctable, false),
		AndroidPixelRef::AndroidPixelRef(AndroidPixelRef& wrappedPixelRef, const SkImageInfo& info,
		size_t rowBytes, SkColorTable* ctable) :
		SkMallocPixelRef(info, wrappedPixelRef.getAddr(), rowBytes, ctable, false),
		fWrappedPixelRef(wrappedPixelRef.fWrappedPixelRef ?
		wrappedPixelRef.fWrappedPixelRef : &wrappedPixelRef)
		{
		@@ -548,6 +569,14 @@ jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,
		"bitmap size exceeds 32bits");
		return NULL;
		}

		SkImageInfo bitmapInfo;
		if (!bitmap->asImageInfo(&bitmapInfo)) {
		jniThrowException(env, "java/lang/IllegalArgumentException",
		"unknown bitmap configuration");
		return NULL;
		}

		size_t size = size64.get32();
		jbyteArray arrayObj = (jbyteArray) env->CallObjectMethod(gVMRuntime,
		gVMRuntime_newNonMovableArray,
		@@ -561,7 +590,8 @@ jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,
		return NULL;
		}
		SkASSERT(addr);
		SkPixelRef* pr = new AndroidPixelRef(env, (void*) addr, size, arrayObj, ctable);
		SkPixelRef* pr = new AndroidPixelRef(env, bitmapInfo, (void*) addr,
		bitmap->rowBytes(), arrayObj, ctable);
		bitmap->setPixelRef(pr)->unref();
		// since we're already allocated, we lockPixels right away
		// HeapAllocator behaves this way too