am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev (51ce9cac) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+6 −12

Original line number	Diff line number	Diff line
		@@ -14768,27 +14768,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* this view, to which future drawing operations will be clipped.
		*/
		public void setClipBounds(Rect clipBounds) {
		if (clipBounds != null) {
		if (clipBounds.equals(mClipBounds)) {
		if (clipBounds == mClipBounds
		\|\| (clipBounds != null && clipBounds.equals(mClipBounds))) {
		return;
		}
		if (clipBounds != null) {
		if (mClipBounds == null) {
		invalidate();
		mClipBounds = new Rect(clipBounds);
		} else {
		invalidate(Math.min(mClipBounds.left, clipBounds.left),
		Math.min(mClipBounds.top, clipBounds.top),
		Math.max(mClipBounds.right, clipBounds.right),
		Math.max(mClipBounds.bottom, clipBounds.bottom));
		mClipBounds.set(clipBounds);
		}
		} else {
		if (mClipBounds != null) {
		invalidate();
		mClipBounds = null;
		}
		}
		mRenderNode.setClipBounds(mClipBounds);
		invalidateViewProperty(false, false);
		}

		/**