SF: Move DisplaySurface into CompositionEngine
The CompositionEngine now provides the interface for a DisplaySurface.
For the moment SurfaceFlinger still provides implementations, but those
may be moved into CompositionEngine too.
Test: atest libsurfaceflinger_unittest libcompositionengine_test
Bug: 121291683
Change-Id: I446e57952d59abc137b3b23203b2e093f6262ef3
diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h
index 55b6106..c606659 100644
--- a/services/surfaceflinger/DisplayDevice.h
+++ b/services/surfaceflinger/DisplayDevice.h
@@ -44,7 +44,6 @@
namespace android {
-class DisplaySurface;
class Fence;
class HWComposer;
class IGraphicBufferProducer;
@@ -57,6 +56,7 @@
namespace compositionengine {
class Display;
+class DisplaySurface;
} // namespace compositionengine
class DisplayDevice : public LightRefBase<DisplayDevice> {
@@ -212,7 +212,7 @@
sp<ANativeWindow> mNativeWindow;
// Current buffer that this display can render to.
sp<GraphicBuffer> mGraphicBuffer;
- sp<DisplaySurface> mDisplaySurface;
+ sp<compositionengine::DisplaySurface> mDisplaySurface;
// File descriptor indicating that mGraphicBuffer is ready for display, i.e.
// that drawing to the buffer is now complete.
base::unique_fd mBufferReady;
@@ -315,7 +315,7 @@
bool isVirtual{false};
bool isSecure{false};
sp<ANativeWindow> nativeWindow;
- sp<DisplaySurface> displaySurface;
+ sp<compositionengine::DisplaySurface> displaySurface;
int displayInstallOrientation{DisplayState::eOrientationDefault};
bool hasWideColorGamut{false};
HdrCapabilities hdrCapabilities;