Update reordering method names, and make 3d reordering API public

IsContainedVolume -> hasIsolatedZVolume conveys that this affects Z
ordering of views

ProjectToContainedBackground -> ProjectBackwards, since it ended up
using its own projection target, separate from the 3d volume bit

Change-Id: Ia2cde838cc4da134366fe6ff623290fbd65e50c3

2 files changed, 10 insertions, 10 deletions

diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp
index ee24a17..66a526a 100644
--- a/libs/hwui/DisplayList.cpp
+++ b/libs/hwui/DisplayList.cpp
@@ -238,8 +238,8 @@ void DisplayList::init() {
     mRight = 0;
     mBottom = 0;
     mClipToBounds = true;
-    mIsContainedVolume = true;
-    mProjectToContainedVolume = false;
+    mIsolatedZVolume = true;
+    mProjectBackwards = false;
     mAlpha = 1;
     mHasOverlappingRendering = true;
     mTranslationX = 0;
@@ -542,7 +542,7 @@ void DisplayList::computeOrderingImpl(
         applyViewPropertyTransforms(totalTransform);
         totalTransform.mapPoint3d(pivot);
         compositedChildrenOf3dRoot->add(ZDrawDisplayListOpPair(pivot.z, opState));
-    } else if (mProjectToContainedVolume) {
+    } else if (mProjectBackwards) {
         // composited projectee, flag for out of order draw, save matrix, and store in proj surface
         opState->mSkipInOrderDraw = true;
         opState->mTransformFromCompositingAncestor.load(localTransformFromProjectionSurface);
@@ -552,7 +552,7 @@ void DisplayList::computeOrderingImpl(
         opState->mSkipInOrderDraw = false;
     }
 
-    if (mIsContainedVolume) {
+    if (mIsolatedZVolume) {
         // create a new 3d space for descendents by collecting them
         compositedChildrenOf3dRoot = &m3dNodes;
         transformFrom3dRoot = &mat4::identity();
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index 6e6e596..6d9a8c1 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -190,12 +190,12 @@ public:
         mClipToBounds = clipToBounds;
     }
 
-    void setIsContainedVolume(bool isContainedVolume) {
-        mIsContainedVolume = isContainedVolume;
+    void setIsolatedZVolume(bool shouldIsolate) {
+        mIsolatedZVolume = shouldIsolate;
     }
 
-    void setProjectToContainedVolume(bool shouldProject) {
-        mProjectToContainedVolume = shouldProject;
+    void setProjectBackwards(bool shouldProject) {
+        mProjectBackwards = shouldProject;
     }
 
     void setStaticMatrix(SkMatrix* matrix) {
@@ -590,8 +590,8 @@ private:
 
     // Rendering properties
     bool mClipToBounds;
-    bool mIsContainedVolume;
-    bool mProjectToContainedVolume;
+    bool mIsolatedZVolume;
+    bool mProjectBackwards;
     float mAlpha;
     bool mHasOverlappingRendering;
     float mTranslationX, mTranslationY, mTranslationZ;