Merge "Prevent infinite loop when trimming the path cache" into jb-mr2-dev (8be3bc4a) · Commits · e / os / android_frameworks_base

libs/hwui/PathCache.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -55,6 +55,8 @@ void PathCache::PathProcessor::onProcess(const sp<Task<SkBitmap*> >& task) {
		PathCache::drawPath(t->path, t->paint, *bitmap, left, top, offset, width, height);
		t->setResult(bitmap);
		} else {
		texture->width = 0;
		texture->height = 0;
		t->setResult(NULL);
		}
		}
		@@ -136,8 +138,7 @@ PathTexture* PathCache::get(SkPath* path, SkPaint* paint) {
		addTexture(entry, bitmap, texture);
		texture->clearTask();
		} else {
		ALOGW("Path too large to be rendered into a texture (%dx%d)",
		texture->width, texture->height);
		ALOGW("Path too large to be rendered into a texture");
		texture->clearTask();
		texture = NULL;
		mCache.remove(entry);

+3 −1

Original line number	Diff line number	Diff line
		@@ -717,7 +717,9 @@ void ShapeCache<Entry>::removeTexture(PathTexture* texture) {
		ALOGD("Shape %s deleted, size = %d", mName, size);
		}

		if (texture->id) {
		glDeleteTextures(1, &texture->id);
		}
		delete texture;
		}
		}