diff options
| author | Mathias Agopian <mathias@google.com> | 2009-09-29 22:32:36 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-09-29 22:32:36 -0700 |
| commit | 8851617aea7d2cd61fd8a8585bd4414a14d71653 (patch) | |
| tree | e8bdb24d6c02169891ff6001646acb5a3314b7a2 /libs/surfaceflinger | |
| parent | 45094a34f014fa79e78eea8ee2091021bf1de209 (diff) | |
| download | frameworks_base-8851617aea7d2cd61fd8a8585bd4414a14d71653.zip frameworks_base-8851617aea7d2cd61fd8a8585bd4414a14d71653.tar.gz frameworks_base-8851617aea7d2cd61fd8a8585bd4414a14d71653.tar.bz2 | |
remove unused code
Diffstat (limited to 'libs/surfaceflinger')
| -rw-r--r-- | libs/surfaceflinger/LayerBase.cpp | 10 | ||||
| -rw-r--r-- | libs/surfaceflinger/LayerBase.h | 3 | ||||
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.cpp | 6 |
3 files changed, 3 insertions, 16 deletions
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp index 7692d0f..28ef27c 100644 --- a/libs/surfaceflinger/LayerBase.cpp +++ b/libs/surfaceflinger/LayerBase.cpp @@ -95,14 +95,8 @@ void LayerBase::initStates(uint32_t w, uint32_t h, uint32_t flags) mDrawingState = mCurrentState; } -void LayerBase::commitTransaction(bool skipSize) { - const uint32_t w = mDrawingState.w; - const uint32_t h = mDrawingState.h; +void LayerBase::commitTransaction() { mDrawingState = mCurrentState; - if (skipSize) { - mDrawingState.w = w; - mDrawingState.h = h; - } } void LayerBase::forceVisibilityTransaction() { // this can be called without SurfaceFlinger.mStateLock, but if we @@ -217,7 +211,7 @@ uint32_t LayerBase::doTransaction(uint32_t flags) } // Commit the transaction - commitTransaction(flags & eRestartTransaction); + commitTransaction(); return flags; } diff --git a/libs/surfaceflinger/LayerBase.h b/libs/surfaceflinger/LayerBase.h index 233737d..b3b838e 100644 --- a/libs/surfaceflinger/LayerBase.h +++ b/libs/surfaceflinger/LayerBase.h @@ -107,7 +107,7 @@ public: bool setTransparentRegionHint(const Region& opaque); bool setFlags(uint8_t flags, uint8_t mask); - void commitTransaction(bool skipSize); + void commitTransaction(); bool requestTransaction(); void forceVisibilityTransaction(); @@ -211,7 +211,6 @@ public: enum { // flags for doTransaction() eVisibleRegion = 0x00000002, - eRestartTransaction = 0x00000008 }; diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp index 4ee176c..e468b23 100644 --- a/libs/surfaceflinger/SurfaceFlinger.cpp +++ b/libs/surfaceflinger/SurfaceFlinger.cpp @@ -594,12 +594,6 @@ void SurfaceFlinger::handleTransactionLocked( const uint32_t flags = layer->doTransaction(0); if (flags & Layer::eVisibleRegion) mVisibleRegionsDirty = true; - - if (flags & Layer::eRestartTransaction) { - // restart the transaction, but back-off a little - layer->setTransactionFlags(eTransactionNeeded); - setTransactionFlags(eTraversalNeeded, ms2ns(8)); - } } } |
