diff options
| author | 2009-09-29 22:32:36 -0700 | |
|---|---|---|
| committer | 2009-09-29 22:32:36 -0700 | |
| commit | ba6be54876a19444f0b214b4b3b0749df227b013 (patch) | |
| tree | e761d15078db22d62c6e18e02a2c3bc540361790 | |
| parent | 85ec55f8f5581fca2fc680d7775abc03f9a3be3e (diff) | |
remove unused code
| -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 7692d0f716..28ef27c107 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 233737db15..b3b838e376 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 4ee176c92a..e468b237f5 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)); - } } } |