Merge "switch over to SkVertices object, and stop using deprecated methods." (a4f867d7) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapFactory.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -209,8 +209,7 @@ public:
		}

		mBitmap->reconfigure(info, bitmap->rowBytes(), ctable);
		mBitmap->ref();
		bitmap->setPixelRef(mBitmap)->unref();
		bitmap->setPixelRef(sk_ref_sp(mBitmap), 0, 0);

		// since we're already allocated, we lockPixels right away
		// HeapAllocator behaves this way too

core/jni/android/graphics/Graphics.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -516,8 +516,7 @@ bool RecyclingClippingPixelAllocator::allocPixelRef(SkBitmap* bitmap, SkColorTab
		// skbug.com/4538: We also need to make sure that the rowBytes on the pixel ref
		// match the rowBytes on the bitmap.
		bitmap->setInfo(bitmap->info(), rowBytes);
		mRecycledBitmap->ref();
		bitmap->setPixelRef(mRecycledBitmap)->unref();
		bitmap->setPixelRef(sk_ref_sp(mRecycledBitmap), 0, 0);

		// Make sure that the recycled bitmap has the correct alpha type.
		mRecycledBitmap->setAlphaType(bitmap->alphaType());

core/jni/android_graphics_Canvas.cpp

+13 −7

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include "SkDrawFilter.h"
		#include "SkGraphics.h"
		#include "SkRegion.h"
		#include "SkVertices.h"

		namespace android {

		@@ -311,15 +312,15 @@ static void drawPath(JNIEnv* env, jobject, jlong canvasHandle, jlong pathHandle,
		}

		static void drawVertices(JNIEnv* env, jobject, jlong canvasHandle,
		jint modeHandle, jint vertexCount,
		jint modeHandle, jint floatCount,
		jfloatArray jverts, jint vertIndex,
		jfloatArray jtexs, jint texIndex,
		jintArray jcolors, jint colorIndex,
		jshortArray jindices, jint indexIndex,
		jint indexCount, jlong paintHandle) {
		AutoJavaFloatArray vertA(env, jverts, vertIndex + vertexCount);
		AutoJavaFloatArray texA(env, jtexs, texIndex + vertexCount);
		AutoJavaIntArray colorA(env, jcolors, colorIndex + vertexCount);
		AutoJavaFloatArray vertA(env, jverts, vertIndex + floatCount);
		AutoJavaFloatArray texA(env, jtexs, texIndex + floatCount);
		AutoJavaIntArray colorA(env, jcolors, colorIndex + floatCount);
		AutoJavaShortArray indexA(env, jindices, indexIndex + indexCount);

		const float* verts = vertA.ptr() + vertIndex;
		@@ -334,10 +335,15 @@ static void drawVertices(JNIEnv* env, jobject, jlong canvasHandle,
		indices = (const uint16_t*)(indexA.ptr() + indexIndex);
		}

		SkCanvas::VertexMode mode = static_cast<SkCanvas::VertexMode>(modeHandle);
		int vertexCount = floatCount >> 1; // 2 floats per SkPoint
		SkVertices::VertexMode mode = static_cast<SkVertices::VertexMode>(modeHandle);
		const Paint* paint = reinterpret_cast<Paint*>(paintHandle);
		get_canvas(canvasHandle)->drawVertices(mode, vertexCount, verts, texs, colors,
		indices, indexCount, *paint);
		get_canvas(canvasHandle)->drawVertices(SkVertices::MakeCopy(mode, vertexCount,
		reinterpret_cast<const SkPoint*>(verts),
		reinterpret_cast<const SkPoint*>(texs),
		reinterpret_cast<const SkColor*>(colors),
		indexCount, indices).get(),
		SkBlendMode::kModulate, *paint);
		}

		static void drawNinePatch(JNIEnv* env, jobject, jlong canvasHandle, jlong bitmapHandle,

libs/hwui/RecordingCanvas.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -168,9 +168,7 @@ public:
		virtual void drawArc(float left, float top, float right, float bottom,
		float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint) override;
		virtual void drawPath(const SkPath& path, const SkPaint& paint) override;
		virtual void drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,
		const float* verts, const float* tex, const int* colors,
		const uint16_t* indices, int indexCount, const SkPaint& paint) override
		virtual void drawVertices(const SkVertices*, SkBlendMode, const SkPaint& paint) override
		{ /* RecordingCanvas does not support drawVertices(); ignore */ }

		virtual void drawVectorDrawable(VectorDrawableRoot* tree) override;

libs/hwui/SkiaCanvas.cpp

+3 −12

Original line number	Diff line number	Diff line
		@@ -515,17 +515,8 @@ void SkiaCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
		mCanvas->drawPath(path, paint);
		}

		void SkiaCanvas::drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,
		const float* verts, const float* texs, const int* colors,
		const uint16_t* indices, int indexCount, const SkPaint& paint) {
		#ifndef SK_SCALAR_IS_FLOAT
		SkDEBUGFAIL("SkScalar must be a float for these conversions to be valid");
		#endif
		const int ptCount = vertexCount >> 1;
		mCanvas->drawVertices(SkVertices::MakeCopy(vertexMode, ptCount, (SkPoint*)verts,
		(SkPoint)texs, (SkColor)colors,
		indexCount, indices),
		SkBlendMode::kModulate, paint);
		void SkiaCanvas::drawVertices(const SkVertices* vertices, SkBlendMode mode, const SkPaint& paint) {
		mCanvas->drawVertices(vertices, mode, paint);
		}

		// ----------------------------------------------------------------------------
		@@ -566,7 +557,7 @@ void SkiaCanvas::drawBitmapMesh(Bitmap& hwuiBitmap, int meshWidth, int meshHeigh
		if (colors) {
		flags \|= SkVertices::kHasColors_BuilderFlag;
		}
		SkVertices::Builder builder(SkCanvas::kTriangles_VertexMode, ptCount, indexCount, flags);
		SkVertices::Builder builder(SkVertices::kTriangles_VertexMode, ptCount, indexCount, flags);
		memcpy(builder.positions(), vertices, ptCount * sizeof(SkPoint));
		if (colors) {
		memcpy(builder.colors(), colors, ptCount * sizeof(SkColor));