commit dd08224e4d75689c42bf452d44617f84072649a1
author Bo Hu <bohu@google.com> Sun Dec 02 05:22:41 2018 +0000
committer Bo Hu <bohu@google.com> Mon Dec 03 13:59:49 2018 +0000
tree 94773feef4bc1b01cb56cbe50642cfd4d0898c01
parent 298c49e4f08644f4478380a4e75d63207e2c671c

Revert "Make HWUI's surface Reliable^TM"

This reverts commit 650bd9a7b35139354916d2522b59cc57eb5fddc3.

Reason for revert: broken emulator b/120342364

Exempt-From-Owner-Approval:

Change-Id: If05d9d87325e1d836375d7dc79ff66ef057d228d

libs/hwui/renderthread/IRenderPipeline.h

diff --git a/libs/hwui/renderthread/IRenderPipeline.h b/libs/hwui/renderthread/IRenderPipeline.h
index 42e17b273..4972554 100644
--- a/libs/hwui/renderthread/IRenderPipeline.h
+++ b/libs/hwui/renderthread/IRenderPipeline.h
@@ -28,10 +28,10 @@
 
 class GrContext;
 
-struct ANativeWindow;
-
 namespace android {
 
+class Surface;
+
 namespace uirenderer {
 
 class DeferredLayerUpdater;
@@ -67,7 +67,7 @@
     virtual bool swapBuffers(const Frame& frame, bool drew, const SkRect& screenDirty,
                              FrameInfo* currentFrameInfo, bool* requireSwap) = 0;
     virtual DeferredLayerUpdater* createTextureLayer() = 0;
-    virtual bool setSurface(ANativeWindow* window, SwapBehavior swapBehavior, ColorMode colorMode) = 0;
+    virtual bool setSurface(Surface* window, SwapBehavior swapBehavior, ColorMode colorMode) = 0;
     virtual void onStop() = 0;
     virtual bool isSurfaceReady() = 0;
     virtual bool isContextReady() = 0;