Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62bdf2c8 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer... 

am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev

* commit 'e986817a':
  Revert "Force-use the pbuffer surface for destroy"
parents ddf7e2df e986817a

libs/hwui/renderthread/CanvasContext.cpp

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ CanvasContext::~CanvasContext() { 


void CanvasContext::destroy() {

    stopDrawing();

    setSurface(NULL);

    mEglManager.usePBufferSurface();

    freePrefetechedLayers();

    destroyHardwareResources();

    mAnimationContext->destroy();
@@ -69,6 +67,7 @@ void CanvasContext::destroy() { 
        delete mCanvas;

        mCanvas = 0;

    }

    setSurface(NULL);

}



void CanvasContext::setSurface(ANativeWindow* window) {