SurfaceFlinger cleanup
mostly refactored SurfaceFlinger.h, but also removed dead code.
cleaned-up a few includes as well.
Change-Id: Ib15f4ffe567912b61ee98aa076c6a283b72811b5
diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
index e161c44..4141181 100644
--- a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
+++ b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
@@ -14,25 +14,15 @@
* limitations under the License.
*/
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <utils/Log.h>
+#include <stdint.h>
+#include <sys/types.h>
#include "DisplayHardware/DisplayHardwareBase.h"
-#include "SurfaceFlinger.h"
// ----------------------------------------------------------------------------
namespace android {
-DisplayHardwareBase::DisplayHardwareBase(const sp<SurfaceFlinger>& flinger,
- uint32_t displayIndex)
-{
+DisplayHardwareBase::DisplayHardwareBase(uint32_t displayIndex) {
mScreenAcquired = true;
}
diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h
index 6857481..e6eb2b5 100644
--- a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h
+++ b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h
@@ -18,25 +18,14 @@
#define ANDROID_DISPLAY_HARDWARE_BASE_H
#include <stdint.h>
-#include <utils/RefBase.h>
-#include <utils/StrongPointer.h>
-#include <utils/threads.h>
namespace android {
-class SurfaceFlinger;
-
-class DisplayHardwareBase
-{
+class DisplayHardwareBase {
public:
- DisplayHardwareBase(
- const sp<SurfaceFlinger>& flinger,
- uint32_t displayIndex);
-
+ DisplayHardwareBase(uint32_t displayIndex);
~DisplayHardwareBase();
- void startSleepManagement() const;
-
// console management
void releaseScreen() const;
void acquireScreen() const;
@@ -44,21 +33,8 @@
bool canDraw() const;
-
private:
- class DisplayEventThread : public Thread {
- wp<SurfaceFlinger> mFlinger;
- status_t waitForFbSleep();
- status_t waitForFbWake();
- public:
- DisplayEventThread(const sp<SurfaceFlinger>& flinger);
- virtual ~DisplayEventThread();
- virtual bool threadLoop();
- status_t initCheck() const;
- };
-
- sp<DisplayEventThread> mDisplayEventThread;
- mutable int mScreenAcquired;
+ mutable int mScreenAcquired;
};
}; // namespace android
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 122be5e..6d0631d 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -31,6 +31,8 @@
#include <utils/Trace.h>
#include <utils/Vector.h>
+#include <ui/GraphicBuffer.h>
+
#include <hardware/hardware.h>
#include <hardware/hwcomposer.h>
@@ -39,6 +41,7 @@
#include <EGL/egl.h>
+#include "Layer.h" // needed only for debugging
#include "LayerBase.h"
#include "HWComposer.h"
#include "SurfaceFlinger.h"
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h
index 5cde7fb..c2fff4f 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.h
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.h
@@ -24,7 +24,11 @@
#include <hardware/hwcomposer_defs.h>
+#include <utils/Condition.h>
+#include <utils/Mutex.h>
#include <utils/StrongPointer.h>
+#include <utils/Thread.h>
+#include <utils/Timers.h>
#include <utils/Vector.h>
extern "C" int clock_nanosleep(clockid_t clock_id, int flags,
@@ -38,10 +42,10 @@
namespace android {
// ---------------------------------------------------------------------------
+class GraphicBuffer;
+class LayerBase;
class String8;
class SurfaceFlinger;
-class LayerBase;
-class GraphicBuffer;
class HWComposer
{