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

Commit abacc76d authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Revert "Delete RenderProxy off of the cleaner thread"" into sc-dev am: e947e2e2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15111834

Change-Id: Ibc9fd1729a781215c66b056f60cad192d2f72375
parents 5e43026a e947e2e2

libs/hwui/jni/android_graphics_HardwareRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static jlong android_view_ThreadedRenderer_createProxy(JNIEnv* env, jobject claz 
static void android_view_ThreadedRenderer_deleteProxy(JNIEnv* env, jobject clazz,

        jlong proxyPtr) {

    RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);

    RenderProxy::asyncDelete(proxy);

    delete proxy;

}



static jboolean android_view_ThreadedRenderer_loadSystemProperties(JNIEnv* env, jobject clazz,

libs/hwui/renderthread/RenderProxy.cpp

+0 −12
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "renderthread/CanvasContext.h"

#include "renderthread/RenderTask.h"

#include "renderthread/RenderThread.h"

#include "thread/CommonPool.h"

#include "utils/Macros.h"

#include "utils/TimeUtils.h"
@@ -43,17 +42,6 @@ RenderProxy::RenderProxy(bool translucent, RenderNode* rootRenderNode, 
    mDrawFrameTask.setContext(&mRenderThread, mContext, rootRenderNode);

}



void RenderProxy::asyncDelete(RenderProxy* proxy) {

    if (!proxy) return;



    if (proxy->mContext) {

        // Use the common pool because ~RenderProxy blocks on calling into RenderThread

        CommonPool::post([proxy]() { delete proxy; });

    } else {

        delete proxy;

    }

}



RenderProxy::~RenderProxy() {

    destroyContext();

}

libs/hwui/renderthread/RenderProxy.h

+2 −6
Original line number Diff line number Diff line
@@ -62,14 +62,10 @@ enum { 
 * references RenderProxy fields. This is safe as RenderProxy cannot

 * be deleted if it is blocked inside a call.

 */

class RenderProxy final {

class RenderProxy {

public:

    RenderProxy(bool opaque, RenderNode* rootNode, IContextFactory* contextFactory);

    ~RenderProxy();



    // Schedules a delete of the RenderProxy at a later date. Avoids blocking the current thread

    // on destruction which ~RenderProxy does by default.

    static void asyncDelete(RenderProxy*);

    virtual ~RenderProxy();



    // Won't take effect until next EGLSurface creation

    void setSwapBehavior(SwapBehavior swapBehavior);