Enable e10s by default (again) (#2783)

MozillaReality · Feb 13, 2020 · a81f0f0 · a81f0f0
1 parent 37ab021
commit a81f0f0
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 17 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -548,7 +548,7 @@ void loadFromIntent(final Intent intent) {
                 boolean enabled = extras.getBoolean("e10s", wasEnabled);
                 if (wasEnabled != enabled) {
                     SettingsStore.getInstance(this).setMultiprocessEnabled(enabled);
-                    SessionStore.get().resetMultiprocess();
+                    mHandler.postDelayed(() -> SystemUtils.scheduleRestart(this, 100), 500);
                 }
             }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
@@ -49,7 +49,7 @@ SettingsStore getInstance(final @NonNull Context aContext) {
     public final static boolean REMOTE_DEBUGGING_DEFAULT = false;
     public final static boolean CONSOLE_LOGS_DEFAULT = false;
     public final static boolean ENV_OVERRIDE_DEFAULT = false;
-    public final static boolean MULTIPROCESS_DEFAULT = false;
+    public final static boolean MULTIPROCESS_DEFAULT = true;
     public final static boolean UI_HARDWARE_ACCELERATION_DEFAULT = true;
     public final static boolean PERFORMANCE_MONITOR_DEFAULT = true;
     public final static boolean DRM_PLAYBACK_DEFAULT = false;

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/EngineProvider.kt b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/EngineProvider.kt
@@ -35,6 +35,7 @@ object EngineProvider {
             builder.displayDpiOverride(SettingsStore.getInstance(context).displayDpi)
             builder.screenSizeOverride(SettingsStore.getInstance(context).maxWindowWidth,
                     SettingsStore.getInstance(context).maxWindowHeight)
+            builder.useMultiprocess(SettingsStore.getInstance(context).isMultiprocessEnabled)
 
             if (SettingsStore.getInstance(context).transparentBorderWidth > 0) {
                 builder.useMaxScreenDepth(true)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java
@@ -415,7 +415,6 @@ private SessionState createSession(@NonNull SessionSettings aSettings, @SessionO
 
     private GeckoSession createGeckoSession(@NonNull SessionSettings aSettings) {
         GeckoSessionSettings geckoSettings = new GeckoSessionSettings.Builder()
-                .useMultiprocess(SettingsStore.getInstance(mContext).isMultiprocessEnabled())
                 .usePrivateMode(aSettings.isPrivateBrowsingEnabled())
                 .useTrackingProtection(aSettings.isTrackingProtectionEnabled())
                 .userAgentMode(aSettings.getUserAgentMode())
@@ -821,9 +820,6 @@ public void setUaMode(int mode) {
         mState.mSession.loadUri(overrideUri != null ? overrideUri : mState.mUri, GeckoSession.LOAD_FLAGS_BYPASS_CACHE | GeckoSession.LOAD_FLAGS_REPLACE_HISTORY);
     }
 
-    protected void resetMultiprocess() {
-        recreateSession();
-    }
 
     protected void setTrackingProtection(final boolean aEnabled) {
         if (mState.mSettings.isTrackingProtectionEnabled() != aEnabled) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
@@ -257,12 +257,6 @@ public void setUaMode(final int mode) {
         }
     }
 
-    public void resetMultiprocess() {
-        for (Session session: mSessions) {
-            session.resetMultiprocess();
-        }
-    }
-
     public void setTrackingProtection(final boolean aEnabled) {
         for (Session session: mSessions) {
             session.setTrackingProtection(aEnabled);

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java
@@ -176,10 +176,9 @@ private void setMultiprocess(boolean value, boolean doApply) {
         mBinding.multiprocessSwitch.setValue(value, false);
         mBinding.multiprocessSwitch.setOnCheckedChangeListener(mMultiprocessListener);
 
-        SettingsStore.getInstance(getContext()).setMultiprocessEnabled(value);
-
         if (doApply) {
-            SessionStore.get().resetMultiprocess();
+            SettingsStore.getInstance(getContext()).setMultiprocessEnabled(value);
+            showRestartDialog();
         }
     }
 

diff --git a/app/src/main/res/values/non_L10n.xml b/app/src/main/res/values/non_L10n.xml
@@ -11,7 +11,7 @@
     <string name="settings_key_remote_debugging" translatable="false">settings_remote_debugging</string>
     <string name="settings_key_console_logs" translatable="false">settings_console_logs</string>
     <string name="settings_key_environment_override" translatable="false">settings_environment_override</string>
-    <string name="settings_key_multiprocess_e10s" translatable="false">settings_environment_multiprocess_e10s_v2</string>
+    <string name="settings_key_multiprocess_e10s" translatable="false">settings_environment_multiprocess_e10s_v3</string>
     <string name="settings_key_performance_monitor" translatable="false">settings_performance_monitor</string>
     <string name="settings_key_servo" translatable="false">settings_environment_servo</string>
     <string name="settings_key_drm_playback" translatable="false">settings_key_drm_playback</string>

diff --git a/versions.gradle b/versions.gradle
@@ -24,7 +24,7 @@ ext.deps = [:]
 def versions = [:]
 // GeckoView versions can be found here:
 // https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
-versions.gecko_view = "74.0.20200107215758"
+versions.gecko_view = "75.0.20200213035745"
 versions.android_components = "28.0.1"
 // Note that android-components also depends on application-services,
 // and in fact is our main source of appservices-related functionality.