Merge "Perform early intersect to avoid unnecessary draws" (1ea55cf3) · Commits · e / os / android_frameworks_base

core/java/android/view/HardwareRenderer.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -910,8 +910,6 @@ public abstract class HardwareRenderer {
		if (canDraw()) {
		if (!hasDirtyRegions()) {
		dirty = null;
		} else if (dirty != null) {
		dirty.intersect(0, 0, mWidth, mHeight);
		}
		attachInfo.mIgnoreDirtyState = true;
		attachInfo.mDrawingTime = SystemClock.uptimeMillis();

core/java/android/view/ViewRootImpl.java

+26 −16

Original line number	Diff line number	Diff line
		@@ -771,14 +771,24 @@ public final class ViewRootImpl implements ViewParent,
		return mLayoutRequested;
		}

		void invalidate() {
		mDirty.set(0, 0, mWidth, mHeight);
		scheduleTraversals();
		}

		public void invalidateChild(View child, Rect dirty) {
		invalidateChildInParent(null, dirty);
		}

		public ViewParent invalidateChildInParent(int[] location, Rect dirty) {
		checkThread();
		if (DEBUG_DRAW) Log.v(TAG, "Invalidate child: " + dirty);

		if (dirty == null) {
		// Fast invalidation for GL-enabled applications; GL must redraw everything
		invalidate();
		return;
		return null;
		}

		if (mCurScrollY != 0 \|\| mTranslator != null) {
		mTempRect.set(dirty);
		dirty = mTempRect;
		@@ -792,19 +802,24 @@ public final class ViewRootImpl implements ViewParent,
		dirty.inset(-1, -1);
		}
		}
		if (!mDirty.isEmpty() && !mDirty.contains(dirty)) {

		final Rect localDirty = mDirty;
		if (!localDirty.isEmpty() && !localDirty.contains(dirty)) {
		mAttachInfo.mSetIgnoreDirtyState = true;
		mAttachInfo.mIgnoreDirtyState = true;
		}
		mDirty.union(dirty);

		// Add the new dirty rect to the current one
		localDirty.union(dirty.left, dirty.top, dirty.right, dirty.bottom);
		// Intersect with the bounds of the window to skip
		// updates that lie outside of the visible region
		localDirty.intersect(0, 0, mWidth, mHeight);

		if (!mWillDrawSoon) {
		scheduleTraversals();
		}
		}

		void invalidate() {
		mDirty.set(0, 0, mWidth, mHeight);
		scheduleTraversals();
		return null;
		}

		void setStopped(boolean stopped) {
		@@ -820,11 +835,6 @@ public final class ViewRootImpl implements ViewParent,
		return null;
		}

		public ViewParent invalidateChildInParent(final int[] location, final Rect dirty) {
		invalidateChild(null, dirty);
		return null;
		}

		public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) {
		if (child != mView) {
		throw new RuntimeException("child is not mine, honest!");

graphics/java/android/graphics/Rect.java

+13 −30

Original line number	Diff line number	Diff line
		@@ -352,8 +352,7 @@ public final class Rect implements Parcelable {
		// check for empty first
		return this.left < this.right && this.top < this.bottom
		// now check for containment
		&& left <= r.left && top <= r.top
		&& right >= r.right && bottom >= r.bottom;
		&& left <= r.left && top <= r.top && right >= r.right && bottom >= r.bottom;
		}

		/**
		@@ -375,20 +374,11 @@ public final class Rect implements Parcelable {
		* return false and do not change this rectangle.
		*/
		public boolean intersect(int left, int top, int right, int bottom) {
		if (this.left < right && left < this.right
		&& this.top < bottom && top < this.bottom) {
		if (this.left < left) {
		this.left = left;
		}
		if (this.top < top) {
		this.top = top;
		}
		if (this.right > right) {
		this.right = right;
		}
		if (this.bottom > bottom) {
		this.bottom = bottom;
		}
		if (this.left < right && left < this.right && this.top < bottom && top < this.bottom) {
		if (this.left < left) this.left = left;
		if (this.top < top) this.top = top;
		if (this.right > right) this.right = right;
		if (this.bottom > bottom) this.bottom = bottom;
		return true;
		}
		return false;
		@@ -422,8 +412,7 @@ public final class Rect implements Parcelable {
		* false and do not change this rectangle.
		*/
		public boolean setIntersect(Rect a, Rect b) {
		if (a.left < b.right && b.left < a.right
		&& a.top < b.bottom && b.top < a.bottom) {
		if (a.left < b.right && b.left < a.right && a.top < b.bottom && b.top < a.bottom) {
		left = Math.max(a.left, b.left);
		top = Math.max(a.top, b.top);
		right = Math.min(a.right, b.right);
		@@ -448,8 +437,7 @@ public final class Rect implements Parcelable {
		* no event is this rectangle modified.
		*/
		public boolean intersects(int left, int top, int right, int bottom) {
		return this.left < right && left < this.right
		&& this.top < bottom && top < this.bottom;
		return this.left < right && left < this.right && this.top < bottom && top < this.bottom;
		}

		/**
		@@ -463,8 +451,7 @@ public final class Rect implements Parcelable {
		* either of the rectangles modified.
		*/
		public static boolean intersects(Rect a, Rect b) {
		return a.left < b.right && b.left < a.right
		&& a.top < b.bottom && b.top < a.bottom;
		return a.left < b.right && b.left < a.right && a.top < b.bottom && b.top < a.bottom;
		}

		/**
		@@ -480,14 +467,10 @@ public final class Rect implements Parcelable {
		public void union(int left, int top, int right, int bottom) {
		if ((left < right) && (top < bottom)) {
		if ((this.left < this.right) && (this.top < this.bottom)) {
		if (this.left > left)
		this.left = left;
		if (this.top > top)
		this.top = top;
		if (this.right < right)
		this.right = right;
		if (this.bottom < bottom)
		this.bottom = bottom;
		if (this.left > left) this.left = left;
		if (this.top > top) this.top = top;
		if (this.right < right) this.right = right;
		if (this.bottom < bottom) this.bottom = bottom;
		} else {
		this.left = left;
		this.top = top;