diff options
| author | John Reck <jreck@google.com> | 2020-06-25 17:14:13 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2020-06-26 13:49:05 -0700 |
| commit | aa4c982294ba93266136bf10bbab67bc3f2ae273 (patch) | |
| tree | d4205bbc5876f95500c35786c636730fe3201bea /libs/hwui/pipeline/skia/GLFunctorDrawable.cpp | |
| parent | cf9d4f5451cc4a7e0be3e998638109168851d9fb (diff) | |
Remove legacy callDrawGlFunction2 from HWUI
Bug: 151439970
Test: CtsUiRenderingTestCases passes
Change-Id: I1c29df17bb6e8b078467edf73cb3547db6948cdd
Diffstat (limited to 'libs/hwui/pipeline/skia/GLFunctorDrawable.cpp')
| -rw-r--r-- | libs/hwui/pipeline/skia/GLFunctorDrawable.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp b/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp index e7ebfb06fd4a..f502fc34f7b7 100644 --- a/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp +++ b/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp @@ -18,7 +18,6 @@ #include <GrContext.h> #include <private/hwui/DrawGlInfo.h> #include "FunctorDrawable.h" -#include "GlFunctorLifecycleListener.h" #include "GrBackendSurface.h" #include "GrRenderTarget.h" #include "GrRenderTargetContext.h" @@ -32,14 +31,6 @@ namespace android { namespace uirenderer { namespace skiapipeline { -GLFunctorDrawable::~GLFunctorDrawable() { - if (auto lp = std::get_if<LegacyFunctor>(&mAnyFunctor)) { - if (lp->listener) { - lp->listener->onGlFunctorReleased(lp->functor); - } - } -} - static void setScissor(int viewportHeight, const SkIRect& clip) { SkASSERT(!clip.isEmpty()); // transform to Y-flipped GL space, and prevent negatives @@ -195,11 +186,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { setScissor(info.height, clipRegion.getBounds()); } - if (mAnyFunctor.index() == 0) { - std::get<0>(mAnyFunctor).handle->drawGl(info); - } else { - (*(std::get<1>(mAnyFunctor).functor))(DrawGlInfo::kModeDraw, &info); - } + mWebViewHandle->drawGl(info); if (clearStencilAfterFunctor) { // clear stencil buffer as it may be used by Skia |