diff options
| author | Daniel Norman <danielnorman@google.com> | 2020-08-31 12:05:49 -0700 |
|---|---|---|
| committer | Bill Peckham <bpeckham@google.com> | 2020-09-09 10:21:03 -0700 |
| commit | 8abdf0e95a5d15a310b6df69d33a4510a0b44b4a (patch) | |
| tree | f0c990be5370711e157b2e9e5ae746cb1af915b9 /libs/hwui/pipeline/skia/VkFunctorDrawable.cpp | |
| parent | 93e6c963c3228074d0e0dd5f3f8d057d9bd11e05 (diff) | |
| parent | 6997558ebbaa0c3e5708246807239f11e70ad35d (diff) | |
Merge SP1A.200727.001
Change-Id: Ibb86a528ed692cde325705779c7fa57e4b4de682
Diffstat (limited to 'libs/hwui/pipeline/skia/VkFunctorDrawable.cpp')
| -rw-r--r-- | libs/hwui/pipeline/skia/VkFunctorDrawable.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libs/hwui/pipeline/skia/VkFunctorDrawable.cpp b/libs/hwui/pipeline/skia/VkFunctorDrawable.cpp index 68f111752a4c..50b45e6eb7ec 100644 --- a/libs/hwui/pipeline/skia/VkFunctorDrawable.cpp +++ b/libs/hwui/pipeline/skia/VkFunctorDrawable.cpp @@ -20,7 +20,7 @@ #include <GrBackendDrawableInfo.h> #include <SkAndroidFrameworkUtils.h> #include <SkImage.h> -#include "include/private/SkM44.h" +#include <SkM44.h> #include <utils/Color.h> #include <utils/Trace.h> #include <utils/TraceUtils.h> @@ -121,12 +121,7 @@ std::unique_ptr<FunctorDrawable::GpuDrawHandler> VkFunctorDrawable::onSnapGpuDra return nullptr; } std::unique_ptr<VkFunctorDrawHandler> draw; - if (mAnyFunctor.index() == 0) { - return std::make_unique<VkFunctorDrawHandler>(std::get<0>(mAnyFunctor).handle, matrix, clip, - image_info); - } else { - LOG_ALWAYS_FATAL("Not implemented"); - } + return std::make_unique<VkFunctorDrawHandler>(mWebViewHandle, matrix, clip, image_info); } } // namespace skiapipeline |