Merge "<blink/> is not an acceptable default behavior. Bug #5156334" (3a5f2e6f) · Commits · e / os / android_frameworks_base

core/java/android/view/HardwareRenderer.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -199,8 +199,10 @@ public abstract class HardwareRenderer {
		* @param attachInfo AttachInfo tied to the specified view.
		* @param callbacks Callbacks invoked when drawing happens.
		* @param dirty The dirty rectangle to update, can be null.
		*
		* @return true if the dirty rect was ignored, false otherwise
		*/
		abstract void draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks,
		abstract boolean draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks,
		Rect dirty);

		/**
		@@ -757,7 +759,7 @@ public abstract class HardwareRenderer {
		}

		@Override
		void draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks,
		boolean draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks,
		Rect dirty) {
		if (canDraw()) {
		if (!hasDirtyRegions()) {
		@@ -825,8 +827,12 @@ public abstract class HardwareRenderer {

		sEgl.eglSwapBuffers(sEglDisplay, mEglSurface);
		checkEglErrors();

		return dirty == null;
		}
		}

		return false;
		}

		/**

+3 −1

Original line number	Diff line number	Diff line
		@@ -1798,7 +1798,9 @@ public final class ViewRootImpl extends Handler implements ViewParent,
		currentDirty = null;
		}

		mAttachInfo.mHardwareRenderer.draw(mView, mAttachInfo, this, currentDirty);
		if (mAttachInfo.mHardwareRenderer.draw(mView, mAttachInfo, this, currentDirty)) {
		mPreviousDirty.set(0, 0, mWidth, mHeight);
		}
		}

		if (animating) {