summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/LayerBase.h
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-08-10 18:09:09 -0700
committerMathias Agopian <mathias@google.com>2010-08-11 16:05:05 -0700
commit1efba9a61716356014f4c452fd9e099c5ebe9bd0 (patch)
tree92f59d2d9146a58da50cbfe1f1e76221ef44d5c3 /services/surfaceflinger/LayerBase.h
parentff1d4102882ae9641a61fc4a3937866521bb72dc (diff)
downloadframeworks_base-1efba9a61716356014f4c452fd9e099c5ebe9bd0.zip
frameworks_base-1efba9a61716356014f4c452fd9e099c5ebe9bd0.tar.gz
frameworks_base-1efba9a61716356014f4c452fd9e099c5ebe9bd0.tar.bz2
get rid of our LayerVector implementation
we now use SortedVector<> with a special compare implementation. Change-Id: I910459cf3b3c8993b55ad0786a8c348369262de5
Diffstat (limited to 'services/surfaceflinger/LayerBase.h')
-rw-r--r--services/surfaceflinger/LayerBase.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/services/surfaceflinger/LayerBase.h b/services/surfaceflinger/LayerBase.h
index 4288cf7..22bf857 100644
--- a/services/surfaceflinger/LayerBase.h
+++ b/services/surfaceflinger/LayerBase.h
@@ -53,6 +53,8 @@ class Texture;
class LayerBase : public RefBase
{
+ static int32_t sSequence;
+
public:
LayerBase(SurfaceFlinger* flinger, DisplayID display);
@@ -61,6 +63,7 @@ public:
Region visibleRegionScreen;
Region transparentRegionScreen;
Region coveredRegionScreen;
+ int32_t sequence;
struct State {
uint32_t w;
@@ -210,12 +213,6 @@ public:
inline const State& currentState() const { return mCurrentState; }
inline State& currentState() { return mCurrentState; }
- static int compareCurrentStateZ(
- sp<LayerBase> const * layerA,
- sp<LayerBase> const * layerB) {
- return layerA[0]->currentState().z - layerB[0]->currentState().z;
- }
-
int32_t getOrientation() const { return mOrientation; }
int tx() const { return mLeft; }
int ty() const { return mTop; }