From d8552d796cbcb9a89711fc8f97b34838da5cbdb7 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Sat, 4 Aug 2012 21:39:11 -0700
Subject: [PATCH] DisplayDevice only needs ANativeWindow not
 SurfaceTextureClient

Change-Id: Ib5be5af8bede435c8d5d9fabf586d28d0e74c2cb
---
 services/surfaceflinger/DisplayDevice.cpp | 2 +-
 services/surfaceflinger/DisplayDevice.h   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 18119f692..822b2b56f 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -108,7 +108,7 @@ DisplayDevice::DisplayDevice()
 DisplayDevice::DisplayDevice(
         const sp<SurfaceFlinger>& flinger,
         int display,
-        const sp<SurfaceTextureClient>& surface,
+        const sp<ANativeWindow>& surface,
         EGLConfig config)
     : mFlinger(flinger),
       mId(display),
diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h
index d7aa6fb68..4afca58f7 100644
--- a/services/surfaceflinger/DisplayDevice.h
+++ b/services/surfaceflinger/DisplayDevice.h
@@ -30,13 +30,14 @@
 
 #include "Transform.h"
 
+struct ANativeWindow;
+
 namespace android {
 
 class DisplayInfo;
 class FramebufferSurface;
 class LayerBase;
 class SurfaceFlinger;
-class SurfaceTextureClient;
 
 class DisplayDevice
 {
@@ -63,7 +64,7 @@ public:
     DisplayDevice(
             const sp<SurfaceFlinger>& flinger,
             int dpy,
-            const sp<SurfaceTextureClient>& surface,
+            const sp<ANativeWindow>& surface,
             EGLConfig config);
 
     ~DisplayDevice();
@@ -136,7 +137,7 @@ private:
     int32_t mId;
 
     // ANativeWindow this display is rendering into
-    sp<SurfaceTextureClient> mNativeWindow;
+    sp<ANativeWindow> mNativeWindow;
 
     // set if mNativeWindow is a FramebufferSurface
     sp<FramebufferSurface> mFramebufferSurface;