Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev (4277d8f3) · Commits · e / os / android_frameworks_base

libs/hwui/hwui/Bitmap.cpp

+14 −4

Original line number	Diff line number	Diff line
		@@ -484,7 +484,13 @@ void Bitmap::setAlphaType(SkAlphaType alphaType) {
		void Bitmap::getSkBitmap(SkBitmap* outBitmap) {
		outBitmap->setHasHardwareMipMap(mHasHardwareMipMap);
		if (isHardware()) {
		if (uirenderer::Properties::isSkiaEnabled()) {
		// TODO: add color correctness for Skia pipeline - pass null color space for now
		outBitmap->allocPixels(SkImageInfo::Make(info().width(), info().height(),
		info().colorType(), info().alphaType(), nullptr));
		} else {
		outBitmap->allocPixels(info());
		}
		uirenderer::renderthread::RenderProxy::copyGraphicBufferInto(graphicBuffer(), outBitmap);
		return;
		}
		@@ -493,10 +499,14 @@ void Bitmap::getSkBitmap(SkBitmap* outBitmap) {
		}

		void Bitmap::getSkBitmapForShaders(SkBitmap* outBitmap) {
		if (isHardware() && uirenderer::Properties::isSkiaEnabled()) {
		getSkBitmap(outBitmap);
		} else {
		outBitmap->setInfo(info(), rowBytes());
		outBitmap->setPixelRef(this);
		outBitmap->setHasHardwareMipMap(mHasHardwareMipMap);
		}
		}

		void Bitmap::getBounds(SkRect* bounds) const {
		SkASSERT(bounds);