From 0f9e435300bcfa19f9614adc93c13520dbcdd314 Mon Sep 17 00:00:00 2001 From: "Randall E. Barker" Date: Mon, 9 Mar 2020 02:27:47 -0700 Subject: [PATCH] Permanently enable e10s (#2913) Fixes #2912 --- .../mozilla/vrbrowser/VRBrowserActivity.java | 10 --------- .../vrbrowser/browser/SettingsStore.java | 13 ----------- .../browser/engine/EngineProvider.kt | 2 +- .../settings/DeveloperOptionsView.java | 22 +------------------ app/src/main/res/layout/options_developer.xml | 6 ----- app/src/main/res/values/non_L10n.xml | 1 - app/src/main/res/values/strings.xml | 7 ------ 7 files changed, 2 insertions(+), 59 deletions(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java index 015f26940..f589edd35 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java @@ -543,16 +543,6 @@ void loadFromIntent(final Intent intent) { SettingsStore.getInstance(this).setHomepage(homepageUri.toString()); } - // Enable/Disable e10s - if (extras.containsKey("e10s")) { - boolean wasEnabled = SettingsStore.getInstance(this).isMultiprocessEnabled(); - boolean enabled = extras.getBoolean("e10s", wasEnabled); - if (wasEnabled != enabled) { - SettingsStore.getInstance(this).setMultiprocessEnabled(enabled); - mHandler.postDelayed(() -> SystemUtils.scheduleRestart(this, 100), 500); - } - } - // Open the provided URL in a new tab, if there is no URL provided we just open the homepage if (extras.containsKey("create_new_tab")) { openInTab = extras.getBoolean("create_new_tab", false); diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java index a3b12f187..d67fa944b 100644 --- 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,6 @@ 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 = true; public final static boolean UI_HARDWARE_ACCELERATION_DEFAULT = true; public final static boolean UI_HARDWARE_ACCELERATION_DEFAULT_WAVEVR = false; public final static boolean PERFORMANCE_MONITOR_DEFAULT = true; @@ -226,18 +225,6 @@ public void setEnvironmentOverrideEnabled(boolean isEnabled) { editor.commit(); } - - public boolean isMultiprocessEnabled() { - return mPrefs.getBoolean( - mContext.getString(R.string.settings_key_multiprocess_e10s), MULTIPROCESS_DEFAULT); - } - - public void setMultiprocessEnabled(boolean isEnabled) { - SharedPreferences.Editor editor = mPrefs.edit(); - editor.putBoolean(mContext.getString(R.string.settings_key_multiprocess_e10s), isEnabled); - editor.commit(); - } - public boolean isUIHardwareAccelerationEnabled() { boolean defaultValue = UI_HARDWARE_ACCELERATION_DEFAULT; if (DeviceType.isWaveBuild()) { 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 index f34da9698..2e013c8c1 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/EngineProvider.kt +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/EngineProvider.kt @@ -32,7 +32,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) + builder.useMultiprocess(true) if (SettingsStore.getInstance(context).transparentBorderWidth > 0) { builder.useMaxScreenDepth(true) 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 index 59af60a8f..5a6dc5bed 100644 --- 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 @@ -58,9 +58,6 @@ protected void updateUI() { mBinding.showConsoleSwitch.setOnCheckedChangeListener(mConsoleLogsListener); setConsoleLogs(SettingsStore.getInstance(getContext()).isConsoleLogsEnabled(), false); - mBinding.multiprocessSwitch.setOnCheckedChangeListener(mMultiprocessListener); - setMultiprocess(SettingsStore.getInstance(getContext()).isMultiprocessEnabled(), false); - mBinding.performanceMonitorSwitch.setOnCheckedChangeListener(mPerformanceListener); setPerformance(SettingsStore.getInstance(getContext()).isPerformanceMonitorEnabled(), false); // Hide Performance Monitor switch until it can handle multiple windows. @@ -92,10 +89,6 @@ protected void updateUI() { setConsoleLogs(value, doApply); }; - private SwitchSetting.OnCheckedChangeListener mMultiprocessListener = (compoundButton, value, doApply) -> { - setMultiprocess(value, doApply); - }; - private SwitchSetting.OnCheckedChangeListener mPerformanceListener = (compoundButton, value, doApply) -> { setPerformance(value, doApply); }; @@ -121,9 +114,7 @@ protected void updateUI() { if (mBinding.showConsoleSwitch.isChecked() != SettingsStore.CONSOLE_LOGS_DEFAULT) { setConsoleLogs(SettingsStore.CONSOLE_LOGS_DEFAULT, true); } - if (mBinding.multiprocessSwitch.isChecked() != SettingsStore.MULTIPROCESS_DEFAULT) { - setMultiprocess(SettingsStore.MULTIPROCESS_DEFAULT, true); - } + if (mBinding.servoSwitch.isChecked() != SettingsStore.SERVO_DEFAULT) { setServo(SettingsStore.SERVO_DEFAULT, true); } @@ -171,17 +162,6 @@ private void setConsoleLogs(boolean value, boolean doApply) { } } - private void setMultiprocess(boolean value, boolean doApply) { - mBinding.multiprocessSwitch.setOnCheckedChangeListener(null); - mBinding.multiprocessSwitch.setValue(value, false); - mBinding.multiprocessSwitch.setOnCheckedChangeListener(mMultiprocessListener); - - if (doApply) { - SettingsStore.getInstance(getContext()).setMultiprocessEnabled(value); - showRestartDialog(); - } - } - private void setUIHardwareAcceleration(boolean value, boolean doApply) { mBinding.hardwareAccelerationSwitch.setOnCheckedChangeListener(null); mBinding.hardwareAccelerationSwitch.setValue(value, false); diff --git a/app/src/main/res/layout/options_developer.xml b/app/src/main/res/layout/options_developer.xml index 861302e08..110573725 100644 --- a/app/src/main/res/layout/options_developer.xml +++ b/app/src/main/res/layout/options_developer.xml @@ -49,12 +49,6 @@ android:layout_height="wrap_content" app:description="@string/developer_options_show_console" /> - - settings_remote_debugging settings_console_logs settings_environment_override - settings_environment_multiprocess_e10s_v3 settings_performance_monitor settings_environment_servo settings_key_drm_playback diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd63d4a1f..c3fb82281 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -329,13 +329,6 @@ and is used to customize background environments of the app. --> Enable Environment Override - - Enable Multiprocess -