diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-18 13:57:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 13:57:15 -0700 |
| commit | 8e13ce52f3bb12bb53e37affde3eec9bdaabae5c (patch) | |
| tree | 19a43bae074f4ab27935c54ff6102bef605fa309 /services/surfaceflinger/LayerBase.h | |
| parent | 34df5ccca4c31d131eccc96c2ebf5cc698edfe21 (diff) | |
| parent | 26bcc7b44238ea54105ef5a6020fa5c37bb33f03 (diff) | |
| download | frameworks_base-8e13ce52f3bb12bb53e37affde3eec9bdaabae5c.zip frameworks_base-8e13ce52f3bb12bb53e37affde3eec9bdaabae5c.tar.gz frameworks_base-8e13ce52f3bb12bb53e37affde3eec9bdaabae5c.tar.bz2 | |
am 26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread
Merge commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03' into gingerbread-plus-aosp
* commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03':
revert hwcomposer HAL changes. DO NOT MERGE.
Diffstat (limited to 'services/surfaceflinger/LayerBase.h')
| -rw-r--r-- | services/surfaceflinger/LayerBase.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/services/surfaceflinger/LayerBase.h b/services/surfaceflinger/LayerBase.h index dd1cd05..22bf857 100644 --- a/services/surfaceflinger/LayerBase.h +++ b/services/surfaceflinger/LayerBase.h @@ -35,8 +35,6 @@ #include <pixelflinger/pixelflinger.h> -#include <hardware/hwcomposer.h> - #include "Transform.h" namespace android { @@ -110,10 +108,6 @@ public: virtual const char* getTypeId() const { return "LayerBase"; } - virtual void setGeometry(hwc_layer_t* hwcl); - - virtual void setPerFrameData(hwc_layer_t* hwcl); - /** * draw - performs some global clipping optimizations * and calls onDraw(). |