Merge "Don't clip when drawing a layer" (b4c1dc1c) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -12722,12 +12722,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		final HardwareCanvas canvas = displayList.start();
		int width = mRight - mLeft;
		int height = mBottom - mTop;
		int layerType = getLayerType();

		try {
		canvas.setViewport(width, height);
		// The dirty rect should always be null for a display list
		canvas.onPreDraw(null);
		int layerType = getLayerType();
		if (!isLayer && layerType != LAYER_TYPE_NONE) {
		if (layerType == LAYER_TYPE_HARDWARE) {
		final HardwareLayer layer = getHardwareLayer();
		@@ -13462,8 +13462,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		transformToApply = parent.mChildTransformation;
		} else {
		if ((mPrivateFlags3 & PFLAG3_VIEW_IS_ANIMATING_TRANSFORM) == PFLAG3_VIEW_IS_ANIMATING_TRANSFORM &&
		mDisplayList != null) {
		if ((mPrivateFlags3 & PFLAG3_VIEW_IS_ANIMATING_TRANSFORM) ==
		PFLAG3_VIEW_IS_ANIMATING_TRANSFORM && mDisplayList != null) {
		// No longer animating: clear out old animation matrix
		mDisplayList.setAnimationMatrix(null);
		mPrivateFlags3 &= ~PFLAG3_VIEW_IS_ANIMATING_TRANSFORM;
		@@ -13660,7 +13660,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		if ((flags & ViewGroup.FLAG_CLIP_CHILDREN) == ViewGroup.FLAG_CLIP_CHILDREN &&
		!useDisplayListProperties) {
		!useDisplayListProperties && layerType == LAYER_TYPE_NONE) {
		if (offsetForScroll) {
		canvas.clipRect(sx, sy, sx + (mRight - mLeft), sy + (mBottom - mTop));
		} else {

+2 −2

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ void DisplayList::outputViewProperties(uint32_t level) {
		mMultipliedAlpha, flags);
		}
		}
		if (mClipChildren) {
		if (mClipChildren && !mCaching) {
		ALOGD("%sClipRect %.2f, %.2f, %.2f, %.2f", level 2, "", 0.0f, 0.0f,
		(float) mRight - mLeft, (float) mBottom - mTop);
		}
		@@ -391,7 +391,7 @@ void DisplayList::setViewProperties(OpenGLRenderer& renderer, uint32_t level) {
		mMultipliedAlpha, flags);
		}
		}
		if (mClipChildren) {
		if (mClipChildren && !mCaching) {
		renderer.clipRect(0, 0, mRight - mLeft, mBottom - mTop,
		SkRegion::kIntersect_Op);
		}