Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into... (c932760f) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20Canvas.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -515,22 +515,22 @@ class GLES20Canvas extends HardwareCanvas {

		@Override
		public boolean quickReject(float left, float top, float right, float bottom, EdgeType type) {
		return nQuickReject(mRenderer, left, top, right, bottom);
		return nQuickReject(mRenderer, left, top, right, bottom, type.nativeInt);
		}

		private static native boolean nQuickReject(int renderer, float left, float top,
		float right, float bottom);
		float right, float bottom, int edge);

		@Override
		public boolean quickReject(Path path, EdgeType type) {
		path.computeBounds(mPathBounds, true);
		return nQuickReject(mRenderer, mPathBounds.left, mPathBounds.top,
		mPathBounds.right, mPathBounds.bottom);
		mPathBounds.right, mPathBounds.bottom, type.nativeInt);
		}

		@Override
		public boolean quickReject(RectF rect, EdgeType type) {
		return nQuickReject(mRenderer, rect.left, rect.top, rect.right, rect.bottom);
		return nQuickReject(mRenderer, rect.left, rect.top, rect.right, rect.bottom, type.nativeInt);
		}

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

core/java/android/view/Surface.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,7 @@ public class Surface implements Parcelable {
		private int mNativeSurfaceControl; // SurfaceControl*
		private int mGenerationId; // incremented each time mNativeSurface changes
		private final Canvas mCanvas = new CompatibleCanvas();
		private int mCanvasSaveCount; // Canvas save count at time of lockCanvas()

		// The Translator for density compatibility mode. This is used for scaling
		// the canvas to perform the appropriate density transformation.

core/jni/Android.mk

+1 −2

Original line number	Diff line number	Diff line
		@@ -160,8 +160,7 @@ LOCAL_C_INCLUDES += \
		external/skia/include/effects \
		external/skia/include/images \
		external/skia/include/ports \
		external/skia/src/core \
		external/skia/src/images \
		external/skia/src/ports \
		external/skia/include/utils \
		external/sqlite/dist \
		external/sqlite/android \

core/jni/android/graphics/BitmapFactory.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,
		}

		SkAutoTDelete<SkImageDecoder> add(decoder);
		SkAutoTDelete<SkBitmap> adb(!useExistingBitmap ? bitmap : NULL);
		SkAutoTDelete<SkBitmap> adb(bitmap, !useExistingBitmap);

		decoder->setPeeker(&peeker);
		if (!isPurgeable) {

core/jni/android/graphics/Canvas.cpp

+25 −23

Original line number	Diff line number	Diff line
		@@ -93,6 +93,14 @@ public:
		return canvas->getDevice()->accessBitmap(false).height();
		}

		static void setBitmap(JNIEnv* env, jobject, SkCanvas* canvas, SkBitmap* bitmap) {
		if (bitmap) {
		canvas->setBitmapDevice(*bitmap);
		} else {
		canvas->setDevice(NULL);
		}
		}

		static int saveAll(JNIEnv* env, jobject jcanvas) {
		NPE_CHECK_RETURN_ZERO(env, jcanvas);
		return GraphicsJNI::getNativeCanvas(env, jcanvas)->save();
		@@ -270,25 +278,25 @@ public:
		canvas->setDrawFilter(filter);
		}

		static jboolean quickReject__RectF(JNIEnv* env, jobject, SkCanvas* canvas,
		jobject rect) {
		static jboolean quickReject__RectFI(JNIEnv* env, jobject, SkCanvas* canvas,
		jobject rect, int edgetype) {
		SkRect rect_;
		GraphicsJNI::jrectf_to_rect(env, rect, &rect_);
		return canvas->quickReject(rect_);
		return canvas->quickReject(rect_, (SkCanvas::EdgeType)edgetype);
		}

		static jboolean quickReject__Path(JNIEnv* env, jobject, SkCanvas* canvas,
		SkPath* path) {
		return canvas->quickReject(*path);
		static jboolean quickReject__PathI(JNIEnv* env, jobject, SkCanvas* canvas,
		SkPath* path, int edgetype) {
		return canvas->quickReject(*path, (SkCanvas::EdgeType)edgetype);
		}

		static jboolean quickReject__FFFF(JNIEnv* env, jobject, SkCanvas* canvas,
		static jboolean quickReject__FFFFI(JNIEnv* env, jobject, SkCanvas* canvas,
		jfloat left, jfloat top, jfloat right,
		jfloat bottom) {
		jfloat bottom, int edgetype) {
		SkRect r;
		r.set(SkFloatToScalar(left), SkFloatToScalar(top),
		SkFloatToScalar(right), SkFloatToScalar(bottom));
		return canvas->quickReject(r);
		return canvas->quickReject(r, (SkCanvas::EdgeType)edgetype);
		}

		static void drawRGB(JNIEnv* env, jobject, SkCanvas* canvas,
		@@ -922,19 +930,12 @@ static void doDrawTextDecorations(SkCanvas* canvas, jfloat x, jfloat y, jfloat l
		jobject bounds) {
		SkRect r;
		SkIRect ir;
		bool result = canvas->getClipBounds(&r);
		bool result = canvas->getClipBounds(&r, SkCanvas::kBW_EdgeType);

		if (!result) {
		r.setEmpty();
		} else {
		// ensure the clip is not larger than the canvas
		SkRect canvasRect;
		SkISize deviceSize = canvas->getDeviceSize();
		canvasRect.iset(0, 0, deviceSize.fWidth, deviceSize.fHeight);
		r.intersect(canvasRect);
		}
		r.round(&ir);

		(void)GraphicsJNI::irect_to_jrect(ir, env, bounds);
		return result;
		}
		@@ -951,6 +952,7 @@ static JNINativeMethod gCanvasMethods[] = {
		{"isOpaque","()Z", (void*) SkCanvasGlue::isOpaque},
		{"getWidth","()I", (void*) SkCanvasGlue::getWidth},
		{"getHeight","()I", (void*) SkCanvasGlue::getHeight},
		{"native_setBitmap","(II)V", (void*) SkCanvasGlue::setBitmap},
		{"save","()I", (void*) SkCanvasGlue::saveAll},
		{"save","(I)I", (void*) SkCanvasGlue::save},
		{"native_saveLayer","(ILandroid/graphics/RectF;II)I",
		@@ -982,10 +984,10 @@ static JNINativeMethod gCanvasMethods[] = {
		{"native_getClipBounds","(ILandroid/graphics/Rect;)Z",
		(void*) SkCanvasGlue::getClipBounds},
		{"native_getCTM", "(II)V", (void*)SkCanvasGlue::getCTM},
		{"native_quickReject","(ILandroid/graphics/RectF;)Z",
		(void*) SkCanvasGlue::quickReject__RectF},
		{"native_quickReject","(II)Z", (void*) SkCanvasGlue::quickReject__Path},
		{"native_quickReject","(IFFFF)Z", (void*)SkCanvasGlue::quickReject__FFFF},
		{"native_quickReject","(ILandroid/graphics/RectF;I)Z",
		(void*) SkCanvasGlue::quickReject__RectFI},
		{"native_quickReject","(III)Z", (void*) SkCanvasGlue::quickReject__PathI},
		{"native_quickReject","(IFFFFI)Z", (void*)SkCanvasGlue::quickReject__FFFFI},
		{"native_drawRGB","(IIII)V", (void*) SkCanvasGlue::drawRGB},
		{"native_drawARGB","(IIIII)V", (void*) SkCanvasGlue::drawARGB},
		{"native_drawColor","(II)V", (void*) SkCanvasGlue::drawColor__I},