Merge "Rename DisplayListData to DisplayList" (78327393) · Commits · e / os / android_frameworks_base

core/java/android/view/RenderNode.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -198,8 +198,8 @@ public class RenderNode {
		* @see #isValid()
		*/
		public void end(DisplayListCanvas canvas) {
		long renderNodeData = canvas.finishRecording();
		nSetDisplayListData(mNativeRenderNode, renderNodeData);
		long displayList = canvas.finishRecording();
		nSetDisplayList(mNativeRenderNode, displayList);
		canvas.recycle();
		mValid = true;
		}
		@@ -209,10 +209,10 @@ public class RenderNode {
		* during destruction of hardware resources, to ensure that we do not hold onto
		* obsolete resources after related resources are gone.
		*/
		public void destroyDisplayListData() {
		public void discardDisplayList() {
		if (!mValid) return;

		nSetDisplayListData(mNativeRenderNode, 0);
		nSetDisplayList(mNativeRenderNode, 0);
		mValid = false;
		}

		@@ -781,7 +781,7 @@ public class RenderNode {

		private static native long nCreate(String name);
		private static native void nDestroyRenderNode(long renderNode);
		private static native void nSetDisplayListData(long renderNode, long newData);
		private static native void nSetDisplayList(long renderNode, long newData);

		// Matrix

+2 −2

Original line number	Diff line number	Diff line
		@@ -15385,11 +15385,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		private void resetDisplayList() {
		if (mRenderNode.isValid()) {
		mRenderNode.destroyDisplayListData();
		mRenderNode.discardDisplayList();
		}

		if (mBackgroundRenderNode != null && mBackgroundRenderNode.isValid()) {
		mBackgroundRenderNode.destroyDisplayListData();
		mBackgroundRenderNode.discardDisplayList();
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -392,7 +392,7 @@ public class Editor {

		mTextView.removeCallbacks(mShowFloatingToolbar);

		destroyDisplayListsData();
		discardTextDisplayLists();

		if (mSpellChecker != null) {
		mSpellChecker.closeSession();
		@@ -408,13 +408,13 @@ public class Editor {
		mTemporaryDetach = false;
		}

		private void destroyDisplayListsData() {
		private void discardTextDisplayLists() {
		if (mTextRenderNodes != null) {
		for (int i = 0; i < mTextRenderNodes.length; i++) {
		RenderNode displayList = mTextRenderNodes[i] != null
		? mTextRenderNodes[i].renderNode : null;
		if (displayList != null && displayList.isValid()) {
		displayList.destroyDisplayListData();
		displayList.discardDisplayList();
		}
		}
		}

+8 −8

Original line number	Diff line number	Diff line
		@@ -71,10 +71,10 @@ static void android_view_RenderNode_destroyRenderNode(JNIEnv* env,
		renderNode->decStrong(0);
		}

		static void android_view_RenderNode_setDisplayListData(JNIEnv* env,
		jobject clazz, jlong renderNodePtr, jlong newDataPtr) {
		static void android_view_RenderNode_setDisplayList(JNIEnv* env,
		jobject clazz, jlong renderNodePtr, jlong displayListPtr) {
		RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr);
		DisplayListData* newData = reinterpret_cast<DisplayListData*>(newDataPtr);
		DisplayList* newData = reinterpret_cast<DisplayList*>(displayListPtr);
		renderNode->setStagingDisplayList(newData);
		}

		@@ -470,7 +470,7 @@ const char* const kClassPathName = "android/view/RenderNode";
		static const JNINativeMethod gMethods[] = {
		{ "nCreate", "(Ljava/lang/String;)J", (void*) android_view_RenderNode_create },
		{ "nDestroyRenderNode", "(J)V", (void*) android_view_RenderNode_destroyRenderNode },
		{ "nSetDisplayListData", "(JJ)V", (void*) android_view_RenderNode_setDisplayListData },
		{ "nSetDisplayList", "(JJ)V", (void*) android_view_RenderNode_setDisplayList },
		{ "nOutput", "(J)V", (void*) android_view_RenderNode_output },
		{ "nGetDebugSize", "(J)I", (void*) android_view_RenderNode_getDebugSize },

+4 −4

Original line number	Diff line number	Diff line
		@@ -32,16 +32,16 @@
		namespace android {
		namespace uirenderer {

		DisplayListData::DisplayListData()
		DisplayList::DisplayList()
		: projectionReceiveIndex(-1)
		, hasDrawOps(false) {
		}

		DisplayListData::~DisplayListData() {
		DisplayList::~DisplayList() {
		cleanupResources();
		}

		void DisplayListData::cleanupResources() {
		void DisplayList::cleanupResources() {
		if (CC_UNLIKELY(patchResources.size())) {
		ResourceCache& resourceCache = ResourceCache::getInstance();
		resourceCache.lock();
		@@ -67,7 +67,7 @@ void DisplayListData::cleanupResources() {
		regions.clear();
		}

		size_t DisplayListData::addChild(NodeOpType* op) {
		size_t DisplayList::addChild(NodeOpType* op) {
		mReferenceHolders.push_back(op->renderNode);
		size_t index = mChildren.size();
		mChildren.push_back(op);