commit b49f446c98096c4790a11d9b5bc83a4e585278c9
author Chris Craik <ccraik@google.com> Thu Mar 20 12:44:20 2014 -0700
committer Chris Craik <ccraik@google.com> Mon Mar 24 11:37:06 2014 -0700
tree 04be3e4844f1f39df2b9f598d5e50d6e969e1080
parent ac6e97a5a69738a1d32794fc76ca639201639501

Rework Outline API, remove isolatedZVolume remnants

Change-Id: I30c2fe832dcb98fa6329b1a595b3d3aafbdcad6b

libs/hwui/RenderProperties.h

diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h
index 6e3b8ae..57fa4ba 100644
--- a/libs/hwui/RenderProperties.h
+++ b/libs/hwui/RenderProperties.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef RENDERNODEPROPERTIES_H_
-#define RENDERNODEPROPERTIES_H_
+#ifndef RENDERNODEPROPERTIES_H
+#define RENDERNODEPROPERTIES_H
 
 #include <stddef.h>
 #include <cutils/compiler.h>
@@ -22,7 +22,9 @@
 
 #include <SkCamera.h>
 #include <SkMatrix.h>
-#include <SkPath.h>
+
+#include "Rect.h"
+#include "Outline.h"
 
 #define TRANSLATION 0x0001
 #define ROTATION    0x0002
@@ -64,18 +66,6 @@
         return mProjectionReceiver;
     }
 
-    void setOutline(const SkPath* outline) {
-        if (!outline) {
-            mOutline.reset();
-        } else {
-            mOutline = *outline;
-        }
-    }
-
-    void setClipToOutline(bool clipToOutline) {
-        mClipToOutline = clipToOutline;
-    }
-
     void setStaticMatrix(SkMatrix* matrix) {
         delete mStaticMatrix;
         mStaticMatrix = new SkMatrix(*matrix);
@@ -375,14 +365,18 @@
         mCaching = caching;
     }
 
-    int getWidth() {
+    int getWidth() const {
         return mWidth;
     }
 
-    int getHeight() {
+    int getHeight() const {
         return mHeight;
     }
 
+    Outline& outline() {
+        return mOutline;
+    }
+
 private:
     void onTranslationUpdate() {
         mMatrixDirty = true;
@@ -396,11 +390,10 @@
     void updateMatrix();
 
     // Rendering properties
+    Outline mOutline;
     bool mClipToBounds;
     bool mProjectBackwards;
     bool mProjectionReceiver;
-    SkPath mOutline;
-    bool mClipToOutline;
     float mAlpha;
     bool mHasOverlappingRendering;
     float mTranslationX, mTranslationY, mTranslationZ;
@@ -436,4 +429,4 @@
 } /* namespace uirenderer */
 } /* namespace android */
 
-#endif /* RENDERNODEPROPERTIES_H_ */
+#endif /* RENDERNODEPROPERTIES_H */