Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add GL_CHECKPOINT before invoking webview" into sc-dev

Browse Source
This commit is contained in:
John Reck
2021-04-15 18:19:19 +00:00
committed by Android (Google) Code Review
parent 97a0080178 7e18b475d3
commit afd7bc6081
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/pipeline/skia/GLFunctorDrawable.cpp
View File

@@ -24,6 +24,7 @@
#include "SkClipStack.h" #include "SkClipStack.h"
#include "SkRect.h" #include "SkRect.h"
#include "SkM44.h" #include "SkM44.h"
#include "utils/GLUtils.h"
namespace android { namespace android {
namespace uirenderer { namespace uirenderer {
@@ -170,6 +171,8 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) {
setScissor(info.height, clipRegion.getBounds()); setScissor(info.height, clipRegion.getBounds());
} }
// WebView may swallow GL errors, so catch them here
GL_CHECKPOINT(LOW);
mWebViewHandle->drawGl(info); mWebViewHandle->drawGl(info);
if (clearStencilAfterFunctor) { if (clearStencilAfterFunctor) {