commit 9c5158f7a2f3bff0ccfc8e071143aac7b5c95049
author Huihong Luo <huisinro@google.com> Fri Jul 23 12:35:59 2021 -0700
committer Huihong Luo <huisinro@google.com> Fri Jul 23 12:35:59 2021 -0700
tree 8eadd537766dbb4c57d2ca5226a86e1787fffb1b
parent 77e32b89152ef01d403498b5cfa11065fc0e5e65

Remove Webview Overlays on destroy

When WebViewFunctor is destroyed, overlays needs to be removed.
Bug: 194393522
Test: toggle fullscreen during video playing, and run "adb shell dumpsys
SurfaceFlinger | grep Webview", it should only show onlyi one surface
control

Change-Id: I40d0e503c4f5b25c59886820485e7734716ac859

libs/hwui/WebViewFunctorManager.cpp

diff --git a/libs/hwui/WebViewFunctorManager.cpp b/libs/hwui/WebViewFunctorManager.cpp
index df41011..5aad821 100644
--- a/libs/hwui/WebViewFunctorManager.cpp
+++ b/libs/hwui/WebViewFunctorManager.cpp
@@ -100,6 +100,9 @@
     destroyContext();
 
     ATRACE_NAME("WebViewFunctor::onDestroy");
+    if (mSurfaceControl) {
+        removeOverlays();
+    }
     mCallbacks.onDestroyed(mFunctor, mData);
 }