Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev

Browse Source 
* commit '37cdc191e380cca8edcc58f116b9b319bea1c140':
  Don't invalidate() on setClipBounds
This commit is contained in:
John Reck
2014-11-18 21:46:44 +00:00
committed by Android Git Automerger
parent fcd38813ef 37cdc191e3
commit 51ce9cacb6
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/view/View.java
View File

@@ -14768,27 +14768,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* this view, to which future drawing operations will be clipped. * this view, to which future drawing operations will be clipped.
*/ */
public void setClipBounds(Rect clipBounds) { public void setClipBounds(Rect clipBounds) {
if (clipBounds == mClipBounds
|| (clipBounds != null && clipBounds.equals(mClipBounds))) {
return;
}
if (clipBounds != null) { if (clipBounds != null) {
if (clipBounds.equals(mClipBounds)) {
return;
}
if (mClipBounds == null) { if (mClipBounds == null) {
invalidate();
mClipBounds = new Rect(clipBounds); mClipBounds = new Rect(clipBounds);
} else { } 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); mClipBounds.set(clipBounds);
} }
} else { } else {
if (mClipBounds != null) { mClipBounds = null;
invalidate();
mClipBounds = null;
}
} }
mRenderNode.setClipBounds(mClipBounds); mRenderNode.setClipBounds(mClipBounds);
invalidateViewProperty(false, false);
} }
/** /**