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

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

Merge "Add GL_CHECKPOINT before invoking webview" into sc-dev am: afd7bc60 

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

Change-Id: I74e1f4f5ddd935fc5032089745ed5af3a20f56bb
parents 6b0fe28b afd7bc60

libs/hwui/pipeline/skia/GLFunctorDrawable.cpp

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "SkClipStack.h"

#include "SkRect.h"

#include "SkM44.h"

#include "utils/GLUtils.h"



namespace android {

namespace uirenderer {
@@ -170,6 +171,8 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { 
        setScissor(info.height, clipRegion.getBounds());

    }



    // WebView may swallow GL errors, so catch them here

    GL_CHECKPOINT(LOW);

    mWebViewHandle->drawGl(info);



    if (clearStencilAfterFunctor) {