Merge "Switch Java calls to enableZ and disableZ; remove isRecordingFor" (d50178ea) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/graphics/perftests/CanvasPerfTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,11 +54,11 @@ public class CanvasPerfTest {
		canvas = node.start(200, 200);
		int save = canvas.save();
		canvas.clipRect(1, 1, 199, 199);
		canvas.insertReorderBarrier();
		canvas.enableZ();
		for (int i = 0; i < 5; i++) {
		canvas.drawRenderNode(child);
		}
		canvas.insertInorderBarrier();
		canvas.disableZ();
		canvas.restoreToCount(save);
		node.end(canvas);
		}

core/java/android/view/GhostView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,9 +54,9 @@ public class GhostView extends View {
		mView.mRecreateDisplayList = true;
		RenderNode renderNode = mView.updateDisplayListIfDirty();
		if (renderNode.hasDisplayList()) {
		dlCanvas.insertReorderBarrier(); // enable shadow for this rendernode
		dlCanvas.enableZ(); // enable shadow for this rendernode
		dlCanvas.drawRenderNode(renderNode);
		dlCanvas.insertInorderBarrier(); // re-disable reordering/shadows
		dlCanvas.disableZ(); // re-disable reordering/shadows
		}
		}
		}

core/java/android/view/ViewGroup.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -4130,13 +4130,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager

		@Override
		protected void dispatchDraw(Canvas canvas) {
		boolean usingRenderNodeProperties = canvas.isRecordingFor(mRenderNode);
		final int childrenCount = mChildrenCount;
		final View[] children = mChildren;
		int flags = mGroupFlags;

		if ((flags & FLAG_RUN_ANIMATION) != 0 && canAnimate()) {
		final boolean buildCache = !isHardwareAccelerated();
		for (int i = 0; i < childrenCount; i++) {
		final View child = children[i];
		if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE) {
		@@ -4177,12 +4175,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		boolean more = false;
		final long drawingTime = getDrawingTime();

		if (usingRenderNodeProperties) canvas.insertReorderBarrier();
		canvas.enableZ();
		final int transientCount = mTransientIndices == null ? 0 : mTransientIndices.size();
		int transientIndex = transientCount != 0 ? 0 : -1;
		// Only use the preordered list if not HW accelerated, since the HW pipeline will do the
		// draw reordering internally
		final ArrayList<View> preorderedList = usingRenderNodeProperties
		final ArrayList<View> preorderedList = isHardwareAccelerated()
		? null : buildOrderedChildList();
		final boolean customOrder = preorderedList == null
		&& isChildrenDrawingOrderEnabled();
		@@ -4229,7 +4227,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		more \|= drawChild(canvas, child, drawingTime);
		}
		}
		if (usingRenderNodeProperties) canvas.insertInorderBarrier();
		canvas.disableZ();

		if (isShowingLayoutBounds()) {
		onDebugDraw(canvas);

core/java/android/view/ViewOverlay.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -249,11 +249,11 @@ public class ViewOverlay {
		* This means that we need to insert reorder barriers manually though, so that children
		* of the OverlayViewGroup can cast shadows and Z reorder with each other.
		*/
		canvas.insertReorderBarrier();
		canvas.enableZ();

		super.dispatchDraw(canvas);

		canvas.insertInorderBarrier();
		canvas.disableZ();
		final int numDrawables = (mDrawables == null) ? 0 : mDrawables.size();
		for (int i = 0; i < numDrawables; ++i) {
		mDrawables.get(i).draw(canvas);

graphics/java/android/graphics/Canvas.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -58,9 +58,6 @@ public class Canvas extends BaseCanvas {
		return mNativeCanvasWrapper;
		}

		/** @hide */
		public boolean isRecordingFor(Object o) { return false; }

		// may be null
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 117521088)
		private Bitmap mBitmap;
		@@ -189,22 +186,6 @@ public class Canvas extends BaseCanvas {
		mBitmap = bitmap;
		}

		/**
		* @deprecated use {@link #enableZ()} instead
		* @hide */
		@Deprecated
		public void insertReorderBarrier() {
		enableZ();
		}

		/**
		* @deprecated use {@link #disableZ()} instead
		* @hide */
		@Deprecated
		public void insertInorderBarrier() {
		disableZ();
		}

		/**
		* <p>Enables Z support which defaults to disabled. This allows for RenderNodes drawn with
		* {@link #drawRenderNode(RenderNode)} to be re-arranged based off of their