From e85ce990fe7bfa33d6b7d8bfd23b7336096466b9 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Mon, 9 May 2016 19:05:22 -0700 Subject: [PATCH] Don't stage content drawn bounds It's certainly not needed for two up, so remove the staging aspect. Freeform resizing is currently broken because of another bug so this can't be tested, but because we are not "shipping" it in any case fixing the 2-up bug is more important, but it shouldn't break freeform anyways. Bug: 28618501 Change-Id: I6f285a714281fde50fd7328a3f8999cfa8dfb2c5 --- core/java/android/view/ThreadedRenderer.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index 9c6e6b7ee77c4..1cd2fb0ee96bf 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -352,11 +352,6 @@ public final class ThreadedRenderer { private Choreographer mChoreographer; private boolean mRootNodeNeedsUpdate; - // In case of multi threaded render nodes, these bounds indicate the content bounds against - // which the backdrop needs to be cropped against. - private final Rect mCurrentContentBounds = new Rect(); - private final Rect mStagedContentBounds = new Rect(); - private boolean mEnabled; private boolean mRequested = true; @@ -736,7 +731,7 @@ public final class ThreadedRenderer { * @param bottom The bottom side of the protected bounds. */ public void setContentDrawBounds(int left, int top, int right, int bottom) { - mStagedContentBounds.set(left, top, right, bottom); + nSetContentDrawBounds(mNativeProxy, left, top, right, bottom); } /** @@ -784,14 +779,6 @@ public final class ThreadedRenderer { choreographer.mFrameInfo.markDrawStart(); updateRootDisplayList(view, callbacks); - // The main content view was updating the content bounds and we transfer them to the - // renderer. - if (!mCurrentContentBounds.equals(mStagedContentBounds)) { - mCurrentContentBounds.set(mStagedContentBounds); - nSetContentDrawBounds(mNativeProxy, mCurrentContentBounds.left, - mCurrentContentBounds.top, mCurrentContentBounds.right, - mCurrentContentBounds.bottom); - } attachInfo.mIgnoreDirtyState = false;