diff options
| author | Chris Craik <ccraik@google.com> | 2015-04-27 16:41:00 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-04-28 09:40:01 -0700 |
| commit | 956f340aacc7d8fc2d10f776551f13fde2d8d3ab (patch) | |
| tree | 41a92300458259a67f1e71765357e7fc341a87c0 /core/java/android/view | |
| parent | 340b198ccbd1a05e67d586c345139617d4b84ce0 (diff) | |
| download | frameworks_base-956f340aacc7d8fc2d10f776551f13fde2d8d3ab.zip frameworks_base-956f340aacc7d8fc2d10f776551f13fde2d8d3ab.tar.gz frameworks_base-956f340aacc7d8fc2d10f776551f13fde2d8d3ab.tar.bz2 | |
Remove unused flags and dirty rects
bug:17209071
Also update DisplayList->RenderNode naming in Editor
Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/DisplayListCanvas.java | 18 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 2 |
2 files changed, 4 insertions, 16 deletions
diff --git a/core/java/android/view/DisplayListCanvas.java b/core/java/android/view/DisplayListCanvas.java index eedbc70..46dd857 100644 --- a/core/java/android/view/DisplayListCanvas.java +++ b/core/java/android/view/DisplayListCanvas.java @@ -234,25 +234,13 @@ public class DisplayListCanvas extends Canvas { * Draws the specified display list onto this canvas. The display list can only * be drawn if {@link android.view.RenderNode#isValid()} returns true. * - * @param renderNode The RenderNode to replay. + * @param renderNode The RenderNode to draw. */ public void drawRenderNode(RenderNode renderNode) { - drawRenderNode(renderNode, RenderNode.FLAG_CLIP_CHILDREN); + nDrawRenderNode(mNativeCanvasWrapper, renderNode.getNativeDisplayList()); } - /** - * Draws the specified display list onto this canvas. - * - * @param renderNode The RenderNode to replay. - * @param flags Optional flags about drawing, see {@link RenderNode} for - * the possible flags. - */ - public void drawRenderNode(RenderNode renderNode, int flags) { - nDrawRenderNode(mNativeCanvasWrapper, renderNode.getNativeDisplayList(), flags); - } - - private static native void nDrawRenderNode(long renderer, long renderNode, - int flags); + private static native void nDrawRenderNode(long renderer, long renderNode); /////////////////////////////////////////////////////////////////////////// // Hardware layer diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 7da2da4..dc928a9 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -15509,7 +15509,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (!drawingWithDrawingCache) { if (drawingWithRenderNode) { mPrivateFlags &= ~PFLAG_DIRTY_MASK; - ((DisplayListCanvas) canvas).drawRenderNode(renderNode, parentFlags); + ((DisplayListCanvas) canvas).drawRenderNode(renderNode); } else { // Fast path for layouts with no backgrounds if ((mPrivateFlags & PFLAG_SKIP_DRAW) == PFLAG_SKIP_DRAW) { |