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

Add API to WebView functor to support overlays

Browse Source 
This CL adds api that exposes SurfaceControl to allow webview to
submit ASurfaceTransaction synchronously with hwui draw.

Test: just new API stubs, nothing to test.
Change-Id: I3a70ad12d04e5a1655887faf3782426a9131a999
This commit is contained in:
Vasiliy Telezhnikov
2020-11-12 18:14:58 -05:00
parent 2902a86853
commit 6b237640fa
6 changed files with 249 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
libs/hwui/WebViewFunctorManager.cpp
View File

@@ -26,6 +26,35 @@
namespace android::uirenderer {
namespace {
class ScopedCurrentFunctor {
public:
ScopedCurrentFunctor(WebViewFunctor* functor) {
ALOG_ASSERT(!sCurrentFunctor);
ALOG_ASSERT(functor);
sCurrentFunctor = functor;
}
~ScopedCurrentFunctor() {
ALOG_ASSERT(sCurrentFunctor);
sCurrentFunctor = nullptr;
}
static ASurfaceControl* getSurfaceControl() {
ALOG_ASSERT(sCurrentFunctor);
return sCurrentFunctor->getSurfaceControl();
}
static void mergeTransaction(ASurfaceTransaction* transaction) {
ALOG_ASSERT(sCurrentFunctor);
sCurrentFunctor->mergeTransaction(transaction);
}
private:
static WebViewFunctor* sCurrentFunctor;
};
WebViewFunctor* ScopedCurrentFunctor::sCurrentFunctor = nullptr;
} // namespace
RenderMode WebViewFunctor_queryPlatformRenderMode() {
auto pipelineType = Properties::getRenderPipelineType();
switch (pipelineType) {
@@ -83,7 +112,15 @@ void WebViewFunctor::drawGl(const DrawGlInfo& drawInfo) {
if (!mHasContext) {
mHasContext = true;
}
mCallbacks.gles.draw(mFunctor, mData, drawInfo);
ScopedCurrentFunctor currentFunctor(this);
WebViewOverlayData overlayParams = {
// TODO:
.overlaysMode = OverlaysMode::Disabled,
.getSurfaceControl = currentFunctor.getSurfaceControl,
.mergeTransaction = currentFunctor.mergeTransaction,
};
mCallbacks.gles.draw(mFunctor, mData, drawInfo, overlayParams);
}
void WebViewFunctor::initVk(const VkFunctorInitParams& params) {
@@ -98,7 +135,15 @@ void WebViewFunctor::initVk(const VkFunctorInitParams& params) {
void WebViewFunctor::drawVk(const VkFunctorDrawParams& params) {
ATRACE_NAME("WebViewFunctor::drawVk");
mCallbacks.vk.draw(mFunctor, mData, params);
ScopedCurrentFunctor currentFunctor(this);
WebViewOverlayData overlayParams = {
// TODO
.overlaysMode = OverlaysMode::Disabled,
.getSurfaceControl = currentFunctor.getSurfaceControl,
.mergeTransaction = currentFunctor.mergeTransaction,
};
mCallbacks.vk.draw(mFunctor, mData, params, overlayParams);
}
void WebViewFunctor::postDrawVk() {
@@ -118,6 +163,20 @@ void WebViewFunctor::destroyContext() {
}
}
void WebViewFunctor::removeOverlays() {
ScopedCurrentFunctor currentFunctor(this);
mCallbacks.removeOverlays(mFunctor, mData, currentFunctor.mergeTransaction);
}
ASurfaceControl* WebViewFunctor::getSurfaceControl() {
// TODO
return nullptr;
}
void WebViewFunctor::mergeTransaction(ASurfaceTransaction* transaction) {
// TODO
}
WebViewFunctorManager& WebViewFunctorManager::instance() {
static WebViewFunctorManager sInstance;
return sInstance;