commit b7b9ca670df2266a06a1902056482d1cc19635e3
author John Reck <jreck@google.com> Wed Mar 12 22:21:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 12 22:21:38 2014 +0000
tree 4759cbcc0452d814cc634bc0eab4c58a633250ec
parent 4224e836428391f77adaa14180ad558d12851208
parent 33896588e8f62815d3ea2bfcea59332070acf988

Merge "No-op isolatedZVolumen property"

core/jni/android_view_DisplayList.cpp

diff --git a/core/jni/android_view_DisplayList.cpp b/core/jni/android_view_DisplayList.cpp
index 27345cf..96f52e7 100644
--- a/core/jni/android_view_DisplayList.cpp
+++ b/core/jni/android_view_DisplayList.cpp
@@ -100,8 +100,7 @@
 
 static void android_view_DisplayList_setIsolatedZVolume(JNIEnv* env,
         jobject clazz, jlong displayListPtr, jboolean shouldIsolate) {
-    RenderNode* displayList = reinterpret_cast<RenderNode*>(displayListPtr);
-    displayList->setIsolatedZVolume(shouldIsolate);
+    // No-op, TODO: Remove Java usage of this method
 }
 
 static void android_view_DisplayList_setProjectBackwards(JNIEnv* env,

libs/hwui/DisplayList.cpp

diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp
index f038427..0a52cd0 100644
--- a/libs/hwui/DisplayList.cpp
+++ b/libs/hwui/DisplayList.cpp
@@ -57,7 +57,6 @@
     mRight = 0;
     mBottom = 0;
     mClipToBounds = true;
-    mIsolatedZVolume = true;
     mProjectBackwards = false;
     mProjectionReceiver = false;
     mOutline.rewind();

libs/hwui/DisplayList.h

diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index 7d0e30e..b141fd4 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -204,10 +204,6 @@
         mClipToBounds = clipToBounds;
     }
 
-    void setIsolatedZVolume(bool shouldIsolate) {
-        mIsolatedZVolume = shouldIsolate;
-    }
-
     void setCastsShadow(bool castsShadow) {
         mCastsShadow = castsShadow;
     }
@@ -617,7 +613,6 @@
 
     // Rendering properties
     bool mClipToBounds;
-    bool mIsolatedZVolume;
     bool mProjectBackwards;
     bool mProjectionReceiver;
     SkPath mOutline;