commit eab3f2658aa41d37c3b05d49a2ce4e3f4ed85399
author John Reck <jreck@google.com> Mon Apr 11 20:49:28 2016 +0000
committer John Reck <jreck@google.com> Mon Apr 11 20:49:28 2016 +0000
tree ca0e0aa6f9e895f7e8dc22e60e0eadb28bc51688
parent 945961f78a78eced823d5ba78505c781b079703d

Revert "Make stopped state a first-class thing"

This reverts commit 945961f78a78eced823d5ba78505c781b079703d.

Change-Id: Iebc1d49fac33380233f8785fc39bec6c30a5e714

libs/hwui/renderthread/CanvasContext.h

diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h
index 525d5ef..6d0889e 100644
--- a/libs/hwui/renderthread/CanvasContext.h
+++ b/libs/hwui/renderthread/CanvasContext.h
@@ -82,14 +82,13 @@
     void initialize(Surface* surface);
     void updateSurface(Surface* surface);
     bool pauseSurface(Surface* surface);
-    void setStopped(bool stopped);
     bool hasSurface() { return mNativeSurface.get(); }
 
     void setup(int width, int height, float lightRadius,
             uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha);
     void setLightCenter(const Vector3& lightCenter);
     void setOpaque(bool opaque);
-    bool makeCurrent();
+    void makeCurrent();
     void prepareTree(TreeInfo& info, int64_t* uiFrameInfo,
             int64_t syncQueued, RenderNode* target);
     void draw();
@@ -173,6 +172,7 @@
     friend class android::uirenderer::RenderState;
 
     void setSurface(Surface* window);
+    void requireSurface();
 
     void freePrefetechedLayers();
 
@@ -185,7 +185,6 @@
     EglManager& mEglManager;
     sp<Surface> mNativeSurface;
     EGLSurface mEglSurface = EGL_NO_SURFACE;
-    bool mStopped = false;
     bool mBufferPreserved = false;
     SwapBehavior mSwapBehavior = kSwap_default;
     struct SwapHistory {