diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index ee8c9adc917e..bc86083a8cb9 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -519,7 +519,6 @@ package org.mozilla.geckoview { method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); - method public boolean getUseContentProcessHint(); method public boolean getUseMaxScreenDepth(); method public boolean getUseMultiprocess(); method public boolean getWebFontsEnabled(); @@ -573,7 +572,6 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); - method @NonNull public GeckoRuntimeSettings.Builder useContentProcessHint(boolean); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); method @NonNull public GeckoRuntimeSettings.Builder useMultiprocess(boolean); method @NonNull public GeckoRuntimeSettings.Builder webFontsEnabled(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java index 5a0a651355c1..9a3faba2a368 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java @@ -293,7 +293,7 @@ public final class GeckoRuntime implements Parcelable { Log.d(LOGTAG, "init"); } int flags = 0; - if (settings.getUseContentProcessHint()) { + if (settings.getUseMultiprocess()) { flags |= GeckoThread.FLAG_PRELOAD_CHILD; } diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 5c7ae2475e59..e07463e74dab 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -41,19 +41,6 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return new GeckoRuntimeSettings(settings); } - /** - * Set the content process hint flag. - * - * @param use If true, this will preload the content process for future use. - * Default is true. - * @return This Builder instance. - - */ - public @NonNull Builder useContentProcessHint(final boolean use) { - getSettings().mUseContentProcess = use; - return this; - } - /** * Set whether multiprocess support should be enabled. * @@ -445,7 +432,6 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { } private GeckoRuntime mRuntime; - /* package */ boolean mUseContentProcess = true; /* package */ String[] mArgs; /* package */ Bundle mExtras; /* package */ String mConfigFilePath; @@ -538,7 +524,6 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { private void updateSettings(final @NonNull GeckoRuntimeSettings settings) { updatePrefs(settings); - mUseContentProcess = settings.getUseContentProcessHint(); mArgs = settings.getArguments().clone(); mExtras = new Bundle(settings.getExtras()); mContentBlocking = new ContentBlocking.Settings( @@ -561,15 +546,6 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { commitResetPrefs(); } - /** - * Get the content process hint flag. - * - * @return The content process hint flag. - */ - public boolean getUseContentProcessHint() { - return mUseContentProcess; - } - /** * Whether multiprocess is enabled. * @@ -1123,7 +1099,6 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags); - ParcelableUtils.writeBoolean(out, mUseContentProcess); out.writeStringArray(mArgs); mExtras.writeToParcel(out, flags); ParcelableUtils.writeBoolean(out, mDebugPause); @@ -1141,7 +1116,6 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { public void readFromParcel(final @NonNull Parcel source) { super.readFromParcel(source); - mUseContentProcess = ParcelableUtils.readBoolean(source); mArgs = source.createStringArray(); mExtras.readFromParcel(source); mDebugPause = ParcelableUtils.readBoolean(source); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md index 6ec037d41d50..5fe53756d5df 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md @@ -14,6 +14,9 @@ exclude: true ⚠️ breaking change ## v75 +- ⚠️ Remove [`GeckoRuntimeSettings.Builder#useContentProcessHint`]. The content + process is now preloaded by default if + [`GeckoRuntimeSettings.Builder#useMultiprocess`][75.1] is enabled. - ⚠️ Move [`GeckoSessionSettings.Builder#useMultiprocess`] to [`GeckoRuntimeSettings.Builder#useMultiprocess`][75.1]. Multiprocess state is no longer determined per session. @@ -582,4 +585,4 @@ exclude: true [65.24]: {{javadoc_uri}}/CrashReporter.html#sendCrashReport-android.content.Context-android.os.Bundle-java.lang.String- [65.25]: {{javadoc_uri}}/GeckoResult.html -[api-version]: af032cf9dfa68c15ed6321c9615dd8c5d32d215e +[api-version]: e79b2ea5f93700f9e920b962286ec7b203c493b9 diff --git a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java index d5207262a507..eeafb6f1737c 100644 --- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java @@ -379,7 +379,6 @@ public class GeckoViewActivity runtimeSettingsBuilder.extras(extras); } runtimeSettingsBuilder - .useContentProcessHint(useMultiprocess) .useMultiprocess(useMultiprocess) .remoteDebuggingEnabled(mEnableRemoteDebugging) .consoleOutput(true)