Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Bump GV to v77.0.20200428100141 #3271

Merged
merged 1 commit into from
Apr 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ SettingsStore getInstance(final @NonNull Context aContext) {
public final static int POINTER_COLOR_DEFAULT_DEFAULT = Color.parseColor("#FFFFFF");
public final static int SCROLL_DIRECTION_DEFAULT = 0;
public final static String ENV_DEFAULT = "offworld";
public final static int MSAA_DEFAULT_LEVEL = 1;
public final static int MSAA_DEFAULT_LEVEL = 0;
public final static boolean AUDIO_ENABLED = false;
public final static float CYLINDER_DENSITY_ENABLED_DEFAULT = 4680.0f;
private final static long CRASH_RESTART_DELTA = 2000;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ public static void vrPrefsWorkAround(Context aContext, Bundle aExtras) {
int msaa = SettingsStore.getInstance(aContext).getMSAALevel();
if (msaa > 0) {
int msaaLevel = msaa == 2 ? 4 : 2;
out.write(("pref(\"gl.msaa-level\"," + msaaLevel + ");\n").getBytes());
out.write(("pref(\"webgl.msaa-samples\"," + msaaLevel + ");\n").getBytes());
out.write("pref(\"webgl.msaa-force\", true);\n".getBytes());
} else {
out.write("pref(\"webgl.msaa-force\", false);\n".getBytes());
}
addOptionalPref(out, "dom.vr.require-gesture", aExtras);
addOptionalPref(out, "privacy.reduceTimerPrecision", aExtras);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/non_L10n.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<string name="settings_key_env" translatable="false">settings_env</string>
<string name="settings_key_pointer_color" translatable="false">settings_pointer_color</string>
<string name="settings_key_scroll_direction" translatable="false">settings_scroll_direction</string>
<string name="settings_key_msaa" translatable="false">settings_gfx_msaa</string>
<string name="settings_key_msaa" translatable="false">settings_gfx_msaa_v2</string>
<string name="settings_key_audio" translatable="false">settings_audio</string>
<string name="settings_key_voice_search_language" translatable="false">settings_voice_search_language</string>
<string name="settings_key_display_language" translatable="false">settings_display_language</string>
Expand Down
2 changes: 1 addition & 1 deletion versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "77.0.20200422093542"
versions.gecko_view = "77.0.20200428100141"
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.
Expand Down