From 33896588e8f62815d3ea2bfcea59332070acf988 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 12 Mar 2014 15:14:12 -0700
Subject: [PATCH] No-op isolatedZVolumen property

Change-Id: I7aa474d65a3d12efd4ffb731e07ee42f4d348183
---
 core/jni/android_view_DisplayList.cpp | 3 +--
 libs/hwui/DisplayList.cpp             | 1 -
 libs/hwui/DisplayList.h               | 5 -----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/jni/android_view_DisplayList.cpp b/core/jni/android_view_DisplayList.cpp
index 27345cf777634..96f52e703317b 100644
--- a/core/jni/android_view_DisplayList.cpp
+++ b/core/jni/android_view_DisplayList.cpp
@@ -100,8 +100,7 @@ static void android_view_DisplayList_setClipToBounds(JNIEnv* env,
 
 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,
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp
index f0384272d566a..0a52cd02ecc4e 100644
--- a/libs/hwui/DisplayList.cpp
+++ b/libs/hwui/DisplayList.cpp
@@ -57,7 +57,6 @@ RenderNode::RenderNode() :
     mRight = 0;
     mBottom = 0;
     mClipToBounds = true;
-    mIsolatedZVolume = true;
     mProjectBackwards = false;
     mProjectionReceiver = false;
     mOutline.rewind();
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index 7d0e30e550e67..b141fd47a8396 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -204,10 +204,6 @@ public:
         mClipToBounds = clipToBounds;
     }
 
-    void setIsolatedZVolume(bool shouldIsolate) {
-        mIsolatedZVolume = shouldIsolate;
-    }
-
     void setCastsShadow(bool castsShadow) {
         mCastsShadow = castsShadow;
     }
@@ -617,7 +613,6 @@ private:
 
     // Rendering properties
     bool mClipToBounds;
-    bool mIsolatedZVolume;
     bool mProjectBackwards;
     bool mProjectionReceiver;
     SkPath mOutline;