Backed out changeset 9d2cc3a9622d (bug 1721631) for causing geckoview failures. CLOSED TREE

This commit is contained in:
Butkovits Atila 2021-07-21 23:54:19 +03:00
Родитель 0e8b9d451f
Коммит 65bab54631
1 изменённых файлов: 14 добавлений и 0 удалений

Просмотреть файл

@ -30,6 +30,7 @@ import androidx.annotation.AnyThread;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
import androidx.collection.ArrayMap;
import android.util.Log; import android.util.Log;
import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.EventDispatcher;
@ -49,6 +50,7 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
public final class GeckoRuntime implements Parcelable { public final class GeckoRuntime implements Parcelable {
private static final String LOGTAG = "GeckoRuntime"; private static final String LOGTAG = "GeckoRuntime";
@ -357,6 +359,18 @@ public final class GeckoRuntime implements Parcelable {
info.extras = settings.getExtras(); info.extras = settings.getExtras();
info.flags = flags; info.flags = flags;
// Bug 1605454: Temporary change for Fenix experiment that disables webrender
// Once the experiment ends or experimenter gets implemented in Gecko, this should be removed
// and replaced by :
// info.prefs = settings.getPrefsMap();
final Map<String, Object> prefMap = new ArrayMap<String, Object>();
prefMap.putAll(settings.getPrefsMap());
if (info.extras.getInt("forcedisablewebrender") == 1) {
prefMap.put("gfx.webrender.force-disabled", true);
}
info.prefs = prefMap;
// End of Bug 1605454 hack
// Older versions have problems with SnakeYaml // Older versions have problems with SnakeYaml
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
String configFilePath = settings.getConfigFilePath(); String configFilePath = settings.getConfigFilePath();