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

Commit 80061531 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix for WebView not drawing in a layer" into rvc-dev am: 70a24c32 am:... 

Merge "Fix for WebView not drawing in a layer" into rvc-dev am: 70a24c32 am: 22647c3f am: f1669896

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

Change-Id: I06bea09582922afb1db0607de223614f7d08dd87
parents f8df6534 f1669896

libs/hwui/pipeline/skia/GLFunctorDrawable.cpp

+9 −18
Original line number Diff line number Diff line
@@ -48,29 +48,20 @@ static void setScissor(int viewportHeight, const SkIRect& clip) { 
    glScissor(clip.fLeft, y, clip.width(), height);

}



static bool GetFboDetails(SkCanvas* canvas, GLuint* outFboID, SkISize* outFboSize) {

static void GetFboDetails(SkCanvas* canvas, GLuint* outFboID, SkISize* outFboSize) {

    GrRenderTargetContext* renderTargetContext =

            canvas->internal_private_accessTopLayerRenderTargetContext();

    if (!renderTargetContext) {

        ALOGW("Unable to extract renderTarget info from canvas; aborting GLFunctor draw");

        return false;

    }

    LOG_ALWAYS_FATAL_IF(!renderTargetContext, "Failed to retrieve GrRenderTargetContext");



    GrRenderTarget* renderTarget = renderTargetContext->accessRenderTarget();

    if (!renderTarget) {

        ALOGW("Unable to extract renderTarget info from canvas; aborting GLFunctor draw");

        return false;

    }

    LOG_ALWAYS_FATAL_IF(!renderTarget, "accessRenderTarget failed");



    GrGLFramebufferInfo fboInfo;

    if (!renderTarget->getBackendRenderTarget().getGLFramebufferInfo(&fboInfo)) {

        ALOGW("Unable to extract renderTarget info from canvas; aborting GLFunctor draw");

        return false;

    }

    LOG_ALWAYS_FATAL_IF(!renderTarget->getBackendRenderTarget().getGLFramebufferInfo(&fboInfo),

        "getGLFrameBufferInfo failed");



    *outFboID = fboInfo.fFBOID;

    *outFboSize = SkISize::Make(renderTargetContext->width(), renderTargetContext->height());

    return true;

}



void GLFunctorDrawable::onDraw(SkCanvas* canvas) {
@@ -85,11 +76,12 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { 
        return;

    }



    // flush will create a GrRenderTarget if not already present.

    canvas->flush();



    GLuint fboID = 0;

    SkISize fboSize;

    if (!GetFboDetails(canvas, &fboID, &fboSize)) {

        return;

    }

    GetFboDetails(canvas, &fboID, &fboSize);



    SkIRect surfaceBounds = canvas->internal_private_getTopLayerBounds();

    SkIRect clipBounds = canvas->getDeviceClipBounds();
@@ -143,7 +135,6 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { 


    // ensure that the framebuffer that the webview will render into is bound before we clear

    // the stencil and/or draw the functor.

    canvas->flush();

    glViewport(0, 0, info.width, info.height);

    glBindFramebuffer(GL_FRAMEBUFFER, fboID);