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

Have HWUI validate the WebViewFunctors at registration

Browse Source 
Also tweak how webview's plat_support creates the functor
sruct to be thread-safe, avoids any potential race conditions
even though WebView itself is stated to be thread-hostile in
general. It's too easy to have this just be defined-safe instead.

Bug: 186814981
Test: build & boot, no crashes in real-webview apps
Change-Id: I06f02a279e248fee375ce133c5ce9a2250665ad9
This commit is contained in:
John Reck
2021-05-13 10:28:38 -04:00
parent c49b886d73
commit faa1b0ab2a
4 changed files with 68 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libs/hwui/WebViewFunctorManager.cpp
View File

@@ -221,8 +221,30 @@ WebViewFunctorManager& WebViewFunctorManager::instance() {
return sInstance;
}
static void validateCallbacks(const WebViewFunctorCallbacks& callbacks) {
// TODO: Should we do a stack peek to see if this is really webview?
LOG_ALWAYS_FATAL_IF(callbacks.onSync == nullptr, "onSync is null");
LOG_ALWAYS_FATAL_IF(callbacks.onContextDestroyed == nullptr, "onContextDestroyed is null");
LOG_ALWAYS_FATAL_IF(callbacks.onDestroyed == nullptr, "onDestroyed is null");
LOG_ALWAYS_FATAL_IF(callbacks.removeOverlays == nullptr, "removeOverlays is null");
switch (auto mode = WebViewFunctor_queryPlatformRenderMode()) {
case RenderMode::OpenGL_ES:
LOG_ALWAYS_FATAL_IF(callbacks.gles.draw == nullptr, "gles.draw is null");
break;
case RenderMode::Vulkan:
LOG_ALWAYS_FATAL_IF(callbacks.vk.initialize == nullptr, "vk.initialize is null");
LOG_ALWAYS_FATAL_IF(callbacks.vk.draw == nullptr, "vk.draw is null");
LOG_ALWAYS_FATAL_IF(callbacks.vk.postDraw == nullptr, "vk.postDraw is null");
break;
default:
LOG_ALWAYS_FATAL("unknown platform mode? %d", (int)mode);
break;
}
}
int WebViewFunctorManager::createFunctor(void* data, const WebViewFunctorCallbacks& callbacks,
RenderMode functorMode) {
validateCallbacks(callbacks);
auto object = std::make_unique<WebViewFunctor>(data, callbacks, functorMode);
int id = object->id();
auto handle = object->createHandle();