Implement TimeWarp Layers

app/CMakeLists.txt

@@ -24,18 +24,20 @@ add_library( # Sets the name of the library.
              src/main/cpp/ControllerContainer.cpp
              src/main/cpp/DeviceUtils.cpp
              src/main/cpp/ElbowModel.cpp
-             src/main/cpp/FadeBlitter.cpp
-             src/main/cpp/GestureDelegate.cpp
+             src/main/cpp/FadeAnimation.cpp
              src/main/cpp/Quad.cpp
              src/main/cpp/ExternalBlitter.cpp
              src/main/cpp/ExternalVR.cpp
              src/main/cpp/GeckoSurfaceTexture.cpp
              src/main/cpp/GestureDelegate.cpp
              src/main/cpp/LoadingAnimation.cpp
              src/main/cpp/JNIUtil.cpp
+             src/main/cpp/Skybox.cpp
              src/main/cpp/SplashAnimation.cpp
              src/main/cpp/VRBrowser.cpp
              src/main/cpp/VRVideo.cpp
+             src/main/cpp/VRLayer.cpp
+             src/main/cpp/VRLayerNode.cpp
              src/main/cpp/Widget.cpp
              src/main/cpp/WidgetPlacement.cpp
              src/main/cpp/WidgetResizer.cpp

app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java

@@ -21,6 +21,7 @@
 import android.util.Log;
 import android.util.Pair;
 import android.view.KeyEvent;
+import android.view.Surface;
 import android.view.View;
 import android.widget.FrameLayout;
 
@@ -48,6 +49,7 @@
 import org.mozilla.vrbrowser.ui.widgets.RootWidget;
 import org.mozilla.vrbrowser.ui.widgets.TopBarWidget;
 import org.mozilla.vrbrowser.ui.widgets.TrayWidget;
+import org.mozilla.vrbrowser.ui.widgets.UIWidget;
 import org.mozilla.vrbrowser.ui.widgets.VideoProjectionMenuWidget;
 import org.mozilla.vrbrowser.ui.widgets.Widget;
 import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
@@ -421,14 +423,47 @@ public void onFrameAvailable(SurfaceTexture surfaceTexture) {
         });
     }
 
+    @Keep
+    @SuppressWarnings("unused")
+    void dispatchCreateWidgetLayer(final int aHandle, final Surface aSurface, final int aWidth, final int aHeight) {
+        runOnUiThread(() -> {
+            final Widget widget = mWidgets.get(aHandle);
+            if (widget == null) {
+                Log.e(LOGTAG, "Widget " + aHandle + " not found");
+                return;
+            }
+
+            Runnable aFirstDrawCallback = null;
+            if (aSurface != null && !widget.getFirstDraw()) {
+                aFirstDrawCallback = () -> {
+                    widget.setFirstDraw(true);
+                    updateWidget(widget);
+                };
+            }
+
+            widget.setSurface(aSurface, aWidth, aHeight, aFirstDrawCallback);
+
+            View view = (View) widget;
+            // Add widget to a virtual display for invalidation
+            if (aSurface != null && view.getParent() == null) {
+                mWidgetContainer.addView(view, new FrameLayout.LayoutParams(aWidth, aHeight));
+            } else if (aSurface == null && view.getParent() != null) {
+                mWidgetContainer.removeView(view);
+            }
+            view.postInvalidate();
+        });
+    }
+
     @Keep
     @SuppressWarnings("unused")
     void handleMotionEvent(final int aHandle, final int aDevice, final boolean aPressed, final float aX, final float aY) {
         runOnUiThread(() -> {
             Widget widget = mWidgets.get(aHandle);
             if (widget == null) {
                 MotionEventGenerator.dispatch(mRootWidget, aDevice, aPressed, aX, aY);
-
+            } else if (widget == mBrowserWidget && mBrowserWidget.getBorderWidth() > 0) {
+                final int border = mBrowserWidget.getBorderWidth();
+                MotionEventGenerator.dispatch(widget, aDevice, aPressed, aX - border, aY - border);
             } else {
                 MotionEventGenerator.dispatch(widget, aDevice, aPressed, aX, aY);
             }
@@ -582,6 +617,12 @@ public boolean isOverrideEnvPathEnabled() {
         return SettingsStore.getInstance(this).isEnvironmentOverrideEnabled();
     }
 
+    @Keep
+    @SuppressWarnings("unused")
+    public boolean areLayersEnabled() {
+        return SettingsStore.getInstance(this).getLayersEnabled();
+    }
+
     @Keep
     @SuppressWarnings("unused")
     public String getActiveEnvironment() {
@@ -657,7 +698,7 @@ public void updateWidget(final Widget aWidget) {
             params.width = textureWidth;
             params.height = textureHeight;
             ((View)aWidget).setLayoutParams(params);
-            aWidget.resizeSurfaceTexture(textureWidth, textureHeight);
+            aWidget.resizeSurface(textureWidth, textureHeight);
         }
 
         boolean visible = aWidget.getPlacement().visible;
@@ -803,7 +844,7 @@ public void setTrayVisible(boolean visible) {
             mTray.show();
 
         } else {
-            mTray.hide();
+            mTray.hide(UIWidget.KEEP_WIDGET);
         }
     }
 

app/src/common/shared/org/mozilla/vrbrowser/browser/SessionStore.java

@@ -162,6 +162,9 @@ public void setContext(Context aContext, Bundle aExtras) {
             runtimeSettingsBuilder.displayDpiOverride(SettingsStore.getInstance(aContext).getDisplayDpi());
             runtimeSettingsBuilder.screenSizeOverride(SettingsStore.getInstance(aContext).getMaxWindowWidth(),
                     SettingsStore.getInstance(aContext).getMaxWindowHeight());
+            if (SettingsStore.getInstance(aContext).getLayersEnabled()) {
+                runtimeSettingsBuilder.useMaxScreenDepth(true);
+            }
 
             if (BuildConfig.DEBUG) {
                 runtimeSettingsBuilder.arguments(new String[] { "-purgecaches" });
@@ -492,23 +495,22 @@ public String getCurrentUri() {
     }
 
     public Media getFullScreenVideo() {
-        Media result = null;
         if (mCurrentSession != null) {
             State state = mSessions.get(mCurrentSession.hashCode());
             if (state == null) {
-                return result;
-            }
-            if (state.mMediaElements.size() > 0) {
-                return state.mMediaElements.get(state.mMediaElements.size() - 1);
+                return null;
             }
             for (Media media: state.mMediaElements) {
                 if (media.isFullscreen()) {
-                    result = media;
-                    break;
+                    return media;
                 }
             }
+            if (state.mMediaElements.size() > 0) {
+                return state.mMediaElements.get(state.mMediaElements.size() - 1);
+            }
         }
-        return result;
+
+        return null;
     }
 
     public boolean isInputActive(int aSessionId) {

app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java

@@ -9,6 +9,7 @@
 
 import org.mozilla.geckoview.GeckoSessionSettings;
 import org.mozilla.telemetry.TelemetryHolder;
+import org.mozilla.vrbrowser.BuildConfig;
 import org.mozilla.vrbrowser.R;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
 
@@ -305,4 +306,11 @@ public void setMSAALevel(int level) {
         editor.commit();
     }
 
+    public boolean getLayersEnabled() {
+        if (BuildConfig.FLAVOR_platform.equalsIgnoreCase("oculusvr")) {
+            return true;
+        }
+        return false;
+    }
+
 }

app/src/common/shared/org/mozilla/vrbrowser/ui/prompts/ChoicePromptWidget.java

@@ -172,7 +172,7 @@ public void releaseWidget() {
 
     @Override
     protected void onDismiss() {
-        hide();
+        hide(REMOVE_WIDGET);
 
         if (mPromptDelegate != null) {
             mPromptDelegate.onDismissed(getDefaultChoices(mListItems));

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrowserWidget.java

@@ -43,11 +43,13 @@ public class BrowserWidget extends View implements Widget, SessionStore.SessionC
     private ChoicePromptWidget mChoicePrompt;
     private int mWidthBackup;
     private int mHeightBackup;
+    private int mBorderWidth;
 
     public BrowserWidget(Context aContext, int aSessionId) {
         super(aContext);
         mSessionId = aSessionId;
         mWidgetManager = (WidgetManagerDelegate) aContext;
+        mBorderWidth = SettingsStore.getInstance(aContext).getLayersEnabled() ? 1 : 0;
         SessionStore.get().addSessionChangeListener(this);
         SessionStore.get().addPromptListener(this);
         setFocusable(true);
@@ -65,14 +67,15 @@ public BrowserWidget(Context aContext, int aSessionId) {
 
     private void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         Context context = getContext();
-        aPlacement.width = SettingsStore.getInstance(getContext()).getWindowWidth();
-        aPlacement.height = SettingsStore.getInstance(getContext()).getWindowHeight();
+        aPlacement.width = SettingsStore.getInstance(getContext()).getWindowWidth() + mBorderWidth * 2;
+        aPlacement.height = SettingsStore.getInstance(getContext()).getWindowHeight() + mBorderWidth * 2;
         aPlacement.density = 1.0f;
         aPlacement.translationX = 0.0f;
         aPlacement.translationY = WidgetPlacement.unitFromMeters(context, R.dimen.browser_world_y);
         aPlacement.translationZ = WidgetPlacement.unitFromMeters(context, R.dimen.browser_world_z);
         aPlacement.anchorX = 0.5f;
         aPlacement.anchorY = 0.0f;
+        aPlacement.visible = true;
     }
 
     public void pauseCompositor() {
@@ -91,31 +94,37 @@ public void resumeCompositor() {
             return;
         }
 
-        mDisplay.surfaceChanged(mSurface, mWidth, mHeight);
+        callSurfaceChanged();
     }
 
-    public void enableVRVideoMode(int aVideoWidth, int aVideoHeight) {
+    public void enableVRVideoMode(int aVideoWidth, int aVideoHeight, boolean aResetBorder) {
         mWidthBackup = mWidth;
         mHeightBackup = mHeight;
-        if (aVideoWidth == mWidth && aVideoHeight == mHeight) {
+        boolean borderChanged = aResetBorder && mBorderWidth > 0;
+        if (aVideoWidth == mWidth && aVideoHeight == mHeight && !borderChanged) {
             return;
         }
-        mWidgetPlacement.width = aVideoWidth;
-        mWidgetPlacement.height = aVideoHeight;
-        resizeSurfaceTexture(aVideoWidth, aVideoHeight);
+        if (aResetBorder) {
+            mBorderWidth = 0;
+        }
+        mWidgetPlacement.width = aVideoWidth + mBorderWidth * 2;
+        mWidgetPlacement.height = aVideoHeight + mBorderWidth * 2;
+        resizeSurface(aVideoWidth, aVideoHeight);
         Log.e(LOGTAG, "onMetadataChange resize browser " + aVideoWidth + " " + aVideoHeight);
     }
 
     public void disableVRVideoMode() {
         if (mWidthBackup == 0 || mHeightBackup == 0) {
             return;
         }
-        if (mWidthBackup == mWidth && mHeightBackup == mHeight) {
+        int border = SettingsStore.getInstance(getContext()).getLayersEnabled() ? 1 : 0;
+        if (mWidthBackup == mWidth && mHeightBackup == mHeight && border == mBorderWidth) {
             return;
         }
+        mBorderWidth = border;
         mWidgetPlacement.width = mWidthBackup;
         mWidgetPlacement.height = mHeightBackup;
-        resizeSurfaceTexture(mWidthBackup, mWidthBackup);
+        resizeSurface(mWidthBackup, mWidthBackup);
     }
 
     public void setBrowserSize(float windowWidth, float windowHeight, float multiplier) {
@@ -130,6 +139,18 @@ public void setBrowserSize(float windowWidth, float windowHeight, float multipli
         handleResizeEvent(targetWidth, targetHeight);
     }
 
+    public int getBorderWidth() {
+        return mBorderWidth;
+    }
+
+    public int getTextureWidth() {
+        return mWidth;
+    }
+
+    public int getTextureHeight() {
+        return mHeight;
+    }
+
     @Override
     public void setSurfaceTexture(SurfaceTexture aTexture, final int aWidth, final int aHeight) {
         GeckoSession session = SessionStore.get().getSession(mSessionId);
@@ -146,15 +167,45 @@ public void setSurfaceTexture(SurfaceTexture aTexture, final int aWidth, final i
         } else {
             Log.e(LOGTAG, "GeckoDisplay was not null in BrowserWidget.setSurfaceTexture()");
         }
-        mDisplay.surfaceChanged(mSurface, aWidth, aHeight);
+        callSurfaceChanged();
+    }
+
+    @Override
+    public void setSurface(Surface aSurface, final int aWidth, final int aHeight, Runnable aFirstDrawCallback) {
+        GeckoSession session = SessionStore.get().getSession(mSessionId);
+        if (session == null) {
+            return;
+        }
+        mWidth = aWidth;
+        mHeight = aHeight;
+        mSurface = aSurface;
+        if (mDisplay == null) {
+            mDisplay = session.acquireDisplay();
+        } else {
+            Log.e(LOGTAG, "GeckoDisplay was not null in BrowserWidget.setSurfaceTexture()");
+        }
+        if (mSurface != null) {
+            callSurfaceChanged();
+        } else {
+            mDisplay.surfaceDestroyed();
+        }
+        if (aFirstDrawCallback != null) {
+            aFirstDrawCallback.run();
+        }
+    }
+
+    private void callSurfaceChanged() {
+        mDisplay.surfaceChanged(mSurface, mBorderWidth, mBorderWidth, mWidth - mBorderWidth * 2, mHeight - mBorderWidth * 2);
     }
 
     @Override
-    public void resizeSurfaceTexture(final int aWidth, final int aHeight) {
+    public void resizeSurface(final int aWidth, final int aHeight) {
         mWidth = aWidth;
         mHeight = aHeight;
-        mSurfaceTexture.setDefaultBufferSize(aWidth, aHeight);
-        mDisplay.surfaceChanged(mSurface, aWidth, aHeight);
+        if (mSurfaceTexture != null) {
+            mSurfaceTexture.setDefaultBufferSize(aWidth, aHeight);
+        }
+        callSurfaceChanged();
     }
 
     @Override
@@ -197,8 +248,8 @@ public void handleResizeEvent(float aWorldWidth, float aWorldHeight) {
 
         float aspect = (float)defaultWidth / (float)defaultHeight;
         float worldHeight = worldWidth / aspect;
-        mWidgetPlacement.width = (int)((aWorldWidth * defaultWidth) / worldWidth);
-        mWidgetPlacement.height = (int)((aWorldHeight * defaultHeight) /worldHeight);
+        mWidgetPlacement.width = (int)((aWorldWidth * defaultWidth) / worldWidth) + mBorderWidth * 2;
+        mWidgetPlacement.height = (int)((aWorldHeight * defaultHeight) /worldHeight) + mBorderWidth * 2;
         mWidgetPlacement.worldWidth = aWorldWidth;
         mWidgetManager.updateWidget(this);
 
@@ -281,7 +332,7 @@ public void onCurrentSessionChange(GeckoSession aSession, int aId) {
         mSessionId = aId;
         mDisplay = aSession.acquireDisplay();
         Log.d(LOGTAG, "surfaceChanged: " + aId);
-        mDisplay.surfaceChanged(mSurface, mWidth, mHeight);
+        callSurfaceChanged();
         aSession.getTextInput().setView(this);
 
         boolean isPrivateMode  = aSession.getSettings().getBoolean(GeckoSessionSettings.USE_PRIVATE_MODE);
@@ -410,7 +461,7 @@ public void onChoicePrompt(GeckoSession session, String title, String msg, int t
             @Override
             public void onDismissed(String[] ids) {
                 callback.confirm(ids);
-                mChoicePrompt.hide();
+                mChoicePrompt.hide(UIWidget.REMOVE_WIDGET);
             }
         });
 

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/CrashDialogWidget.java

@@ -91,7 +91,7 @@ private void initialize(Context aContext) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
             }
 
-            hide();
+            hide(REMOVE_WIDGET);
 
             if(mCrashDialogDelegate != null) {
                 mCrashDialogDelegate.onSendData();
@@ -142,8 +142,8 @@ public void show() {
     }
 
     @Override
-    public void hide() {
-        super.hide();
+    public void hide(@HideFlags int aHideFlags) {
+        super.hide(aHideFlags);
 
         mWidgetManager.popWorldBrightness(this);
     }

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/DeveloperOptionsWidget.java

@@ -184,7 +184,7 @@ public void show() {
     }
 
     private void showRestartDialog() {
-        hide();
+        hide(REMOVE_WIDGET);
 
         UIWidget widget = getChild(mRestartDialogHandle);
         if (widget == null) {