am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when... (2cfb873c) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20Canvas.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -154,7 +154,6 @@ class GLES20Canvas extends HardwareCanvas {
	static native void nSetTextureLayerTransform(int layerId, int matrix);		static native void nSetTextureLayerTransform(int layerId, int matrix);
	static native void nDestroyLayer(int layerId);		static native void nDestroyLayer(int layerId);
	static native void nDestroyLayerDeferred(int layerId);		static native void nDestroyLayerDeferred(int layerId);
	static native void nFlushLayer(int layerId);
	static native boolean nCopyLayer(int layerId, int bitmap);		static native boolean nCopyLayer(int layerId, int bitmap);

	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -61,13 +61,6 @@ abstract class GLES20Layer extends HardwareLayer {
	mLayer = 0;		mLayer = 0;
	}		}

	@Override
	void flush() {
	if (mLayer != 0) {
	GLES20Canvas.nFlushLayer(mLayer);
	}
	}

	static class Finalizer {		static class Finalizer {
	private int mLayerId;		private int mLayerId;

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -115,11 +115,6 @@ abstract class HardwareLayer {
	*/		*/
	abstract void destroy();		abstract void destroy();

	/**
	* Flush the render queue associated with this layer.
	*/
	abstract void flush();

	/**		/**
	* This must be invoked before drawing onto this layer.		* This must be invoked before drawing onto this layer.
	* @param currentCanvas		* @param currentCanvas

+2 −17

Original line number	Original line	Diff line number	Diff line
	@@ -10147,12 +10147,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
	}		}
	}		}

	void flushLayer() {
	if (mLayerType == LAYER_TYPE_HARDWARE && mHardwareLayer != null) {
	mHardwareLayer.flush();
	}
	}

	/**		/**
	* <p>Returns a hardware layer that can be used to draw this view again		* <p>Returns a hardware layer that can be used to draw this view again
	* without executing its draw method.</p>		* without executing its draw method.</p>
	@@ -10165,9 +10159,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
	return null;		return null;
	}		}

	if (!mAttachInfo.mHardwareRenderer.validate()) return null;


	final int width = mRight - mLeft;		final int width = mRight - mLeft;
	final int height = mBottom - mTop;		final int height = mBottom - mTop;

	@@ -10241,14 +10232,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
	*/		*/
	boolean destroyLayer() {		boolean destroyLayer() {
	if (mHardwareLayer != null) {		if (mHardwareLayer != null) {
	AttachInfo info = mAttachInfo;
	if (info != null && info.mHardwareRenderer != null &&
	info.mHardwareRenderer.isEnabled()) {
	if (!info.mHardwareRenderer.validate()) {
	mHardwareLayer.destroy();		mHardwareLayer.destroy();
	mHardwareLayer = null;		mHardwareLayer = null;
	}
	}
	return true;		return true;
	}		}
	return false;		return false;

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2958,16 +2958,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	mDrawLayers = enabled;		mDrawLayers = enabled;
	invalidate(true);		invalidate(true);

	AttachInfo info = mAttachInfo;
	if (info != null && info.mHardwareRenderer != null &&
	info.mHardwareRenderer.isEnabled()) {
	if (!info.mHardwareRenderer.validate()) {
	enabled = false;
	}
	} else {
	enabled = false;
	}

	// We need to invalidate any child with a layer. For instance,		// We need to invalidate any child with a layer. For instance,
	// if a child is backed by a hardware layer and we disable layers		// if a child is backed by a hardware layer and we disable layers
	// the child is marked as not dirty (flags cleared the last time		// the child is marked as not dirty (flags cleared the last time
	@@ -2978,7 +2968,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	for (int i = 0; i < mChildrenCount; i++) {		for (int i = 0; i < mChildrenCount; i++) {
	View child = mChildren[i];		View child = mChildren[i];
	if (child.mLayerType != LAYER_TYPE_NONE) {		if (child.mLayerType != LAYER_TYPE_NONE) {
	if (!enabled) child.flushLayer();
	child.invalidate(true);		child.invalidate(true);
	}		}
	}		}