Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename DisplayListData to DisplayList

Browse Source 
Change-Id: I25f6bb88ffdf9baf7e8e4e2a294aa8c9d2a4605b
This commit is contained in:
Chris Craik
2015-10-16 10:24:55 -07:00
parent e4436e325c
commit 003cc3dec8
21 changed files with 205 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/RenderNode.java
View File

@@ -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

4
core/java/android/view/View.java
View File

@@ -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();
}
}

6
core/java/android/widget/Editor.java
View File

@@ -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();
}
}
}