Merge pull request #7 from t-34400/feature/optimize-webview-performance

Optimize WebView Performance

Author: t-34400

Plugins/Android/WebViewManager.java

@@ -43,6 +43,9 @@ public interface WebViewUrlChangeListener {
     public final int webViewHeight;
     public final int outputWidth;
     public final int outputHeight;
+    public final long intervalMSec;
+
+    private final WebViewBitmapListener bitmapListener;
 
     private ImageReader imageReader;
     private VirtualDisplay virtualDisplay;
@@ -56,45 +59,25 @@ public interface WebViewUrlChangeListener {
     private boolean isRunning = true;
     private long downTime = 0;
 
-    public WebViewManager(Activity activity, int _webViewWidth, int _webViewHeight, int _outputWidth, int _outputHeight, long intervalMSec,
+    public WebViewManager(Activity activity, int webViewWidth, int webViewHeight, int outputWidth, int outputHeight, long intervalMSec,
                           WebViewBitmapListener bitmapListener, 
                           WebViewUrlChangeListener urlListener,
                           WebAppInterface.WebViewDataListener webViewDataListener,
                           ViewGroup rootView, View defaultFocusView)
     {
-        webViewWidth = _webViewWidth;
-        webViewHeight = _webViewHeight;
-        outputWidth = _outputWidth;
-        outputHeight = _outputHeight;
+        this.webViewWidth = webViewWidth;
+        this.webViewHeight = webViewHeight;
+        this.outputWidth = outputWidth;
+        this.outputHeight = outputHeight;
+        this.intervalMSec = intervalMSec;
+        this.bitmapListener = bitmapListener;
 
         mainHandler = new Handler(activity.getMainLooper());
 
         activity.runOnUiThread( () -> {
             WebView.enableSlowWholeDocumentDraw();
 
             imageReader = ImageReader.newInstance(outputWidth, outputHeight, PixelFormat.RGBA_8888, 2);
-            imageReader.setOnImageAvailableListener(imageReader -> {
-                synchronized (this)
-                {
-                    if (!isRunning)
-                    {
-                        return;
-                    }
-                }
-
-                Image image = imageReader.acquireNextImage();
-
-                Bitmap bitmap = convertToBitmap(image);
-
-                image.close();
-
-                ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                if(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream))
-                {
-                    byte[] bitmapArray = stream.toByteArray();
-                    bitmapListener.onWebViewUpdated(bitmapArray);
-                }
-            }, mainHandler);
 
             DisplayManager displayManager = (DisplayManager)activity.getSystemService(Context.DISPLAY_SERVICE);
 
@@ -166,33 +149,25 @@ public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
             });
 
             presentation.show();
+            mainHandler.post(() -> sendWebViewBitmapIfNeeded());
         });
     }
 
     public void onDestroy() {
+        isRunning = false;
         virtualDisplay.release();
         presentation.dismiss();
         imageReader.close();
         webAppInterface.onDestroy();
     }
 
-    public void onResume() {
-        // Ensure ImageReader resumes receiving new images after the activity resumes from sleep mode.
-        mainHandler.post( () -> {
-            Image image = imageReader.acquireNextImage();
-            if (image != null) {
-                image.close();
-            }
-        });
-        startUpdate();
-    }
-
     public void startUpdate() {
         synchronized (this) {
             if (!isRunning) {
                 isRunning = true;
             }
         }
+        mainHandler.post(() -> sendWebViewBitmapIfNeeded());
     }
 
     public void stopUpdate() {
@@ -296,6 +271,33 @@ public WebBackForwardList restoreState (Bundle inState) {
         return webBackForwardList;
     }
 
+    private void sendWebViewBitmapIfNeeded () {
+        synchronized (this)
+        {
+            if (!isRunning)
+            {
+                return;
+            }
+        }
+
+        Image image = imageReader.acquireNextImage();
+        
+        if (image != null) {
+            Bitmap bitmap = convertToBitmap(image);
+    
+            image.close();
+    
+            ByteArrayOutputStream stream = new ByteArrayOutputStream();
+            if(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream))
+            {
+                byte[] bitmapArray = stream.toByteArray();
+                bitmapListener.onWebViewUpdated(bitmapArray);
+            }
+        }
+
+        mainHandler.postDelayed(() -> sendWebViewBitmapIfNeeded(), intervalMSec);
+    }
+
     private static Bitmap convertToBitmap(Image image) {
         Image.Plane[] planes = image.getPlanes();
 

Plugins/Android/WebViewUnityPlayerActivity.java

@@ -32,6 +32,7 @@ public class WebViewUnityPlayerActivity extends UnityPlayerActivity
     private static final String WEBVIEW_HEIGHT_BUNDLE_KEY_FORMAT = "WebViewHeight_%d";
     private static final String OUTPUT_WIDTH_BUNDLE_KEY_FORMAT = "OutputWidth_%d";
     private static final String OUTPUT_HEIGHT_BUNDLE_KEY_FORMAT = "OutputHeight_%d";
+    private static final String INTERVAL_BUNDLE_KEY_FORMAT = "Interval_%d";
 
     public static WebViewUnityPlayerActivity currentWebViewActivity;
 
@@ -55,8 +56,9 @@ public void onCreate(Bundle savedInstanceState) {
                 int webViewHeight = savedInstanceState.getInt(String.format(WEBVIEW_HEIGHT_BUNDLE_KEY_FORMAT, index));
                 int outputWidth = savedInstanceState.getInt(String.format(OUTPUT_WIDTH_BUNDLE_KEY_FORMAT, index));
                 int outputHeight = savedInstanceState.getInt(String.format(OUTPUT_HEIGHT_BUNDLE_KEY_FORMAT, index));
+                long intervalMSec = savedInstanceState.getLong(String.format(INTERVAL_BUNDLE_KEY_FORMAT, index));
 
-                generateWebViewTextureProvider(gameObjectName, webViewWidth, webViewHeight, outputWidth, outputHeight, 100L);
+                generateWebViewTextureProvider(gameObjectName, webViewWidth, webViewHeight, outputWidth, outputHeight, intervalMSec);
             }
 
             if(webViewManagers.size() == 1) {
@@ -91,7 +93,7 @@ public void onResume() {
         super.onResume();
         Log.i("WebView", "onResume()");
         webViewManagers.forEach( (gameObjectName, webViewManager) -> {
-            webViewManager.onResume();
+            webViewManager.startUpdate();
         });
     }
 
@@ -117,6 +119,7 @@ protected void onSaveInstanceState(Bundle outState) {
             outState.putInt(String.format(WEBVIEW_HEIGHT_BUNDLE_KEY_FORMAT, index), webViewManager.webViewHeight);
             outState.putInt(String.format(OUTPUT_WIDTH_BUNDLE_KEY_FORMAT, index), webViewManager.outputWidth);
             outState.putInt(String.format(OUTPUT_HEIGHT_BUNDLE_KEY_FORMAT, index), webViewManager.outputHeight);
+            outState.putLong(String.format(INTERVAL_BUNDLE_KEY_FORMAT, index), webViewManager.outputHeight);
             ++index;
         }
     }