commit 93ffb86b909005bbee4993fc9053f017466311c7
author Mathias Agopian <mathias@google.com> Wed May 16 17:07:49 2012 -0700
committer Mathias Agopian <mathias@google.com> Wed May 16 17:07:49 2012 -0700
tree bf3866f600395e344dd504c913918aaf453c63be
parent e804aa4819a764e1f3929f4c578e9a44593a1467

minor refactoring in praparation of crop fix

Bug: 6498869
Change-Id: I12a6f9a9fdfd2ea1db3fbe5fc8cb443aeaedb328

services/surfaceflinger/LayerBase.h

diff --git a/services/surfaceflinger/LayerBase.h b/services/surfaceflinger/LayerBase.h
index 31f6dfd..d0b2a74 100644
--- a/services/surfaceflinger/LayerBase.h
+++ b/services/surfaceflinger/LayerBase.h
@@ -65,20 +65,22 @@
             Region      coveredRegionScreen;
             int32_t     sequence;
             
-            struct State {
+            struct Geometry {
                 uint32_t        w;
                 uint32_t        h;
-                uint32_t        requested_w;
-                uint32_t        requested_h;
+                Rect            crop;
+            };
+
+            struct State {
+                Geometry        active;
+                Geometry        requested;
                 uint32_t        z;
                 uint8_t         alpha;
                 uint8_t         flags;
                 uint8_t         reserved[2];
                 int32_t         sequence;   // changes when visible regions can change
-                uint32_t        tint;
                 Transform       transform;
                 Region          transparentRegion;
-                Rect            crop;
             };
 
     virtual void setName(const String8& name);