From 6501e9944df131b3b7e293007084735dfa217f24 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 16 Jul 2012 15:38:18 -0700 Subject: [PATCH] Remove freeze(), unfreeze() and setFreezeTint(). This is all dead code. Change-Id: I646673aac793a6ec45021c370a2450f0ea4fbcce --- include/gui/ISurfaceComposer.h | 2 -- include/gui/Surface.h | 3 --- include/gui/SurfaceComposerClient.h | 3 --- include/private/gui/LayerState.h | 3 +-- libs/gui/Surface.cpp | 18 ----------------- libs/gui/SurfaceComposerClient.cpp | 30 ----------------------------- 6 files changed, 1 insertion(+), 58 deletions(-) diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 4f32146cc..e12d1634c 100644 --- a/include/gui/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h @@ -66,13 +66,11 @@ public: eMatrixChanged = 0x00000010, eTransparentRegionChanged = 0x00000020, eVisibilityChanged = 0x00000040, - eFreezeTintChanged = 0x00000080, eCropChanged = 0x00000100, }; enum { eLayerHidden = 0x01, - eLayerFrozen = 0x02, eLayerDither = 0x04, eLayerFilter = 0x08, eLayerBlurFreeze = 0x10 diff --git a/include/gui/Surface.h b/include/gui/Surface.h index 50bdf710f..7b8873aaf 100644 --- a/include/gui/Surface.h +++ b/include/gui/Surface.h @@ -65,13 +65,10 @@ public: status_t setSize(uint32_t w, uint32_t h); status_t hide(); status_t show(int32_t layer = -1); - status_t freeze(); - status_t unfreeze(); status_t setFlags(uint32_t flags, uint32_t mask); status_t setTransparentRegionHint(const Region& transparent); status_t setAlpha(float alpha=1.0f); status_t setMatrix(float dsdx, float dtdx, float dsdy, float dtdy); - status_t setFreezeTint(uint32_t tint); status_t setCrop(const Rect& crop); static status_t writeSurfaceToParcel( diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h index c1c34f779..9f3ef35b4 100644 --- a/include/gui/SurfaceComposerClient.h +++ b/include/gui/SurfaceComposerClient.h @@ -111,13 +111,10 @@ public: status_t hide(SurfaceID id); status_t show(SurfaceID id, int32_t layer = -1); - status_t freeze(SurfaceID id); - status_t unfreeze(SurfaceID id); status_t setFlags(SurfaceID id, uint32_t flags, uint32_t mask); status_t setTransparentRegionHint(SurfaceID id, const Region& transparent); status_t setLayer(SurfaceID id, int32_t layer); status_t setAlpha(SurfaceID id, float alpha=1.0f); - status_t setFreezeTint(SurfaceID id, uint32_t tint); status_t setMatrix(SurfaceID id, float dsdx, float dtdx, float dsdy, float dtdy); status_t setPosition(SurfaceID id, float x, float y); status_t setSize(SurfaceID id, uint32_t w, uint32_t h); diff --git a/include/private/gui/LayerState.h b/include/private/gui/LayerState.h index 9151c1192..239dd87e5 100644 --- a/include/private/gui/LayerState.h +++ b/include/private/gui/LayerState.h @@ -36,7 +36,7 @@ struct layer_state_t { layer_state_t() : surface(0), what(0), x(0), y(0), z(0), w(0), h(0), - alpha(0), tint(0), flags(0), mask(0), + alpha(0), flags(0), mask(0), reserved(0) { matrix.dsdx = matrix.dtdy = 1.0f; @@ -61,7 +61,6 @@ struct layer_state_t { uint32_t w; uint32_t h; float alpha; - uint32_t tint; uint8_t flags; uint8_t mask; uint8_t reserved; diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index d7590f013..b9cbfa6d6 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -122,18 +122,6 @@ status_t SurfaceControl::show(int32_t layer) { const sp& client(mClient); return client->show(mToken, layer); } -status_t SurfaceControl::freeze() { - status_t err = validate(); - if (err < 0) return err; - const sp& client(mClient); - return client->freeze(mToken); -} -status_t SurfaceControl::unfreeze() { - status_t err = validate(); - if (err < 0) return err; - const sp& client(mClient); - return client->unfreeze(mToken); -} status_t SurfaceControl::setFlags(uint32_t flags, uint32_t mask) { status_t err = validate(); if (err < 0) return err; @@ -158,12 +146,6 @@ status_t SurfaceControl::setMatrix(float dsdx, float dtdx, float dsdy, float dtd const sp& client(mClient); return client->setMatrix(mToken, dsdx, dtdx, dsdy, dtdy); } -status_t SurfaceControl::setFreezeTint(uint32_t tint) { - status_t err = validate(); - if (err < 0) return err; - const sp& client(mClient); - return client->setFreezeTint(mToken, tint); -} status_t SurfaceControl::setCrop(const Rect& crop) { status_t err = validate(); if (err < 0) return err; diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 8c953f760..b1bd78bc7 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -121,9 +121,6 @@ public: float alpha); status_t setMatrix(const sp& client, SurfaceID id, float dsdx, float dtdx, float dsdy, float dtdy); - status_t setFreezeTint( - const sp& client, SurfaceID id, - uint32_t tint); status_t setOrientation(int orientation); status_t setCrop(const sp& client, SurfaceID id, const Rect& crop); @@ -271,17 +268,6 @@ status_t Composer::setMatrix(const sp& client, return NO_ERROR; } -status_t Composer::setFreezeTint(const sp& client, - SurfaceID id, uint32_t tint) { - Mutex::Autolock _l(mLock); - layer_state_t* s = getLayerStateLocked(client, id); - if (!s) - return BAD_INDEX; - s->what |= ISurfaceComposer::eFreezeTintChanged; - s->tint = tint; - return NO_ERROR; -} - status_t Composer::setOrientation(int orientation) { Mutex::Autolock _l(mLock); mOrientation = orientation; @@ -415,10 +401,6 @@ status_t SurfaceComposerClient::setCrop(SurfaceID id, const Rect& crop) { return getComposer().setCrop(this, id, crop); } -status_t SurfaceComposerClient::setFreezeTint(SurfaceID id, uint32_t tint) { - return getComposer().setFreezeTint(this, id, tint); -} - status_t SurfaceComposerClient::setPosition(SurfaceID id, float x, float y) { return getComposer().setPosition(this, id, x, y); } @@ -443,18 +425,6 @@ status_t SurfaceComposerClient::show(SurfaceID id, int32_t) { ISurfaceComposer::eLayerHidden); } -status_t SurfaceComposerClient::freeze(SurfaceID id) { - return getComposer().setFlags(this, id, - ISurfaceComposer::eLayerFrozen, - ISurfaceComposer::eLayerFrozen); -} - -status_t SurfaceComposerClient::unfreeze(SurfaceID id) { - return getComposer().setFlags(this, id, - 0, - ISurfaceComposer::eLayerFrozen); -} - status_t SurfaceComposerClient::setFlags(SurfaceID id, uint32_t flags, uint32_t mask) { return getComposer().setFlags(this, id, flags, mask);