Do not release GeckoDisplay when switching visible window sessions (M…

…ozillaReality#2336)
lissyx · Jan 21, 2020 · e579436 · e579436
1 parent 58d3470
commit e579436
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -20,6 +20,7 @@
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 
+import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
@@ -89,6 +90,12 @@ default void onBookmarksShown(WindowWidget aWindow) {}
         default void onBookmarksHidden(WindowWidget aWindow) {}
     }
 
+    @IntDef(value = { SESSION_RELEASE_DISPLAY, SESSION_DO_NOT_RELEASE_DISPLAY})
+    public @interface OldSessionDisplayAction {}
+    public static final int SESSION_RELEASE_DISPLAY = 0;
+    public static final int SESSION_DO_NOT_RELEASE_DISPLAY = 1;
+
+
     private Surface mSurface;
     private int mWidth;
     private int mHeight;
@@ -1030,11 +1037,17 @@ public void draw(Canvas aCanvas) {
     }
 
     public void setSession(@NonNull Session aSession) {
+        setSession(aSession, SESSION_RELEASE_DISPLAY);
+    }
+
+    public void setSession(@NonNull Session aSession, @OldSessionDisplayAction int aDisplayAction) {
         if (mSession != aSession) {
             Session oldSession = mSession;
             if (oldSession != null) {
                 cleanListeners(oldSession);
-                oldSession.releaseDisplay();
+                if (aDisplayAction == SESSION_RELEASE_DISPLAY) {
+                    oldSession.releaseDisplay();
+                }
             }
 
             mSession = aSession;

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -1145,8 +1145,8 @@ public void onTabSelect(Session aTab) {
             Session moveTo = targetWindow.getSession();
             moveFrom.surfaceDestroyed();
             moveTo.surfaceDestroyed();
-            windowToMove.setSession(moveTo);
-            targetWindow.setSession(moveFrom);
+            windowToMove.setSession(moveTo, WindowWidget.SESSION_DO_NOT_RELEASE_DISPLAY);
+            targetWindow.setSession(moveFrom, WindowWidget.SESSION_DO_NOT_RELEASE_DISPLAY);
             SessionStore.get().setActiveSession(targetWindow.getSession());
 
         } else {