Deep copy SkPath parameter to PathCache task (906d47fd) · Commits · e / os / android_frameworks_base

libs/hwui/PathCache.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ void PathCache::PathProcessor::onProcess(const sp<Task<SkBitmap*> >& task) {

		float left, top, offset;
		uint32_t width, height;
		PathCache::computePathBounds(t->path, &t->paint, left, top, offset, width, height);
		PathCache::computePathBounds(&t->path, &t->paint, left, top, offset, width, height);

		PathTexture* texture = t->texture;
		texture->left = left;
		@@ -349,7 +349,7 @@ void PathCache::PathProcessor::onProcess(const sp<Task<SkBitmap*> >& task) {

		if (width <= mMaxTextureSize && height <= mMaxTextureSize) {
		SkBitmap* bitmap = new SkBitmap();
		drawPath(t->path, &t->paint, *bitmap, left, top, offset, width, height);
		drawPath(&t->path, &t->paint, *bitmap, left, top, offset, width, height);
		t->setResult(bitmap);
		} else {
		texture->width = 0;

+6 −3

Original line number	Diff line number	Diff line
		@@ -272,14 +272,17 @@ private:
		class PathTask: public Task<SkBitmap*> {
		public:
		PathTask(const SkPath* path, const SkPaint* paint, PathTexture* texture):
		path(path), paint(*paint), texture(texture) {
		path(path), paint(paint), texture(texture) {
		}

		~PathTask() {
		delete future()->get();
		}

		const SkPath* path;
		// copied, since input path not refcounted / guaranteed to survive for duration of task
		// TODO: avoid deep copy with refcounting
		const SkPath path;

		// copied, since input paint may not be immutable
		const SkPaint paint;
		PathTexture* texture;