wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out changeset 3769091b5a3e (bug 1218482) for frequent "Assertion failure: mCompositorThreadHolder" on b2g

Browse Source
This commit is contained in:
Phil Ringnalda 2015-12-29 19:32:45 -08:00
parent bac851a4f0
commit 657283eccb
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/tests/mochitest/general/test_interfaces.html
View File

@ -514,7 +514,7 @@ var interfaceNamesInGlobalScope =
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "HDMIInputPort", b2g: true, permission: ["inputport"]}, {name: "HDMIInputPort", b2g: true, permission: ["inputport"]},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "HMDVRDevice", release: false}, {name: "HMDVRDevice", android: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
"HTMLAllCollection", "HTMLAllCollection",
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
@ -938,7 +938,7 @@ var interfaceNamesInGlobalScope =
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PopupBoxObject", xbl: true}, {name: "PopupBoxObject", xbl: true},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PositionSensorVRDevice", release: false}, {name: "PositionSensorVRDevice", android: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "PresentationDeviceInfoManager", {name: "PresentationDeviceInfoManager",
disabled: true, disabled: true,
@ -1390,15 +1390,15 @@ var interfaceNamesInGlobalScope =
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
"VideoStreamTrack", "VideoStreamTrack",
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VRDevice", release: false}, {name: "VRDevice", android: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VRPositionState", release: false}, {name: "VRPositionState", android: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VREyeParameters", release: false}, {name: "VREyeParameters", android: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VRFieldOfView", release: false}, {name: "VRFieldOfView", android: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VRFieldOfViewReadOnly", release: false}, {name: "VRFieldOfViewReadOnly", android: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
"VTTCue", "VTTCue",
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!

8
modules/libpref/init/all.js
View File

@ -4675,12 +4675,8 @@ pref("dom.browserElement.maxScreenshotDelayMS", 2000);
// Whether we should show the placeholder when the element is focused but empty. // Whether we should show the placeholder when the element is focused but empty.
pref("dom.placeholder.show_on_focus", true); pref("dom.placeholder.show_on_focus", true);
// VR is disabled by default in release and enabled for nightly and aurora // VR is disabled by default
#ifdef RELEASE_BUILD
pref("dom.vr.enabled", false); pref("dom.vr.enabled", false);
#else
pref("dom.vr.enabled", true);
#endif
// Oculus > 0.5 // Oculus > 0.5
pref("dom.vr.oculus.enabled", true); pref("dom.vr.oculus.enabled", true);
// Oculus <= 0.5; will only trigger if > 0.5 is not used or found // Oculus <= 0.5; will only trigger if > 0.5 is not used or found
@ -4688,7 +4684,7 @@ pref("dom.vr.oculus050.enabled", true);
// Cardboard VR device is disabled by default // Cardboard VR device is disabled by default
pref("dom.vr.cardboard.enabled", false); pref("dom.vr.cardboard.enabled", false);
// 0 = never; 1 = only if real devices aren't there; 2 = always // 0 = never; 1 = only if real devices aren't there; 2 = always
pref("dom.vr.add-test-devices", 0); pref("dom.vr.add-test-devices", 1);
// true = show the VR textures in our compositing output; false = don't. // true = show the VR textures in our compositing output; false = don't.
// true might have performance impact // true might have performance impact
pref("gfx.vr.mirror-textures", false); pref("gfx.vr.mirror-textures", false);