Backed out changeset b04073aaa278 (bug 911243) for Android 4.0 mochitest failures.

This commit is contained in:
Ryan VanderMeulen 2013-08-30 22:40:23 -04:00
parent 450782aa3b
commit 8629024daf
2 changed files with 16 additions and 48 deletions

View File

@ -80,7 +80,6 @@ var interfaceNamesInGlobalScope =
"Attr",
"Audio",
"AudioBuffer",
{name: "AudioChannelManager", b2g: true},
"AudioContext",
"AudioBufferSourceNode",
"AudioDestinationNode",
@ -95,14 +94,8 @@ var interfaceNamesInGlobalScope =
"BiquadFilterNode",
"Blob",
"BlobEvent",
{name: "BluetoothAdapter", b2g: true},
{name: "BluetoothDevice", b2g: true},
{name: "BluetoothDeviceEvent", b2g: true},
{name: "BluetoothManager", b2g: true},
{name: "BluetoothStatusChangedEvent", b2g: true},
{name: "BoxObject", xbl: true},
{name: "BrowserFeedWriter", mobile: false},
{name: "CallEvent", b2g: true},
{name: "BrowserFeedWriter", android: false},
"CameraCapabilities",
"CameraControl",
"CameraManager",
@ -111,7 +104,6 @@ var interfaceNamesInGlobalScope =
"CanvasRenderingContext2D",
"CaretPosition",
"CDATASection",
{name: "CFStateChangeEvent", b2g: true},
"ChannelMergerNode",
"ChannelSplitterNode",
"CharacterData",
@ -125,7 +117,7 @@ var interfaceNamesInGlobalScope =
"CompositionEvent",
"Controllers",
"ConvolverNode",
{name: "CRMFObject", mobile: false},
{name: "CRMFObject", android: false},
"Crypto",
"CSS",
"CSS2Properties",
@ -152,7 +144,6 @@ var interfaceNamesInGlobalScope =
"CustomEvent",
"DataChannel",
"DataContainerEvent",
{name: "DataErrorEvent", b2g: true},
"DataTransfer",
"DelayNode",
"DesktopNotification",
@ -194,14 +185,13 @@ var interfaceNamesInGlobalScope =
"FileList",
"FileReader",
"FileRequest",
{name: "FMRadio", b2g: true},
"FocusEvent",
"FormData",
"GainNode",
{name: "Gamepad", mobile: false},
{name: "GamepadAxisMoveEvent", mobile: false},
{name: "GamepadButtonEvent", mobile: false},
{name: "GamepadEvent", mobile: false},
{name: "Gamepad", android: false},
{name: "GamepadAxisMoveEvent", android: false},
{name: "GamepadButtonEvent", android: false},
{name: "GamepadEvent", android: false},
"HashChangeEvent",
"History",
"HTMLAnchorElement",
@ -275,7 +265,6 @@ var interfaceNamesInGlobalScope =
"HTMLUListElement",
"HTMLUnknownElement",
"HTMLVideoElement",
{name: "IccCardLockErrorEvent", b2g: true},
"IDBCursor",
"IDBCursorWithValue",
"IDBDatabase",
@ -290,7 +279,7 @@ var interfaceNamesInGlobalScope =
"IDBVersionChangeEvent",
"Image",
"ImageData",
{name: "InstallTrigger", b2g: false, xbl: false},
{name: "InstallTrigger", xbl: false},
"KeyEvent",
"KeyboardEvent",
"LoadStatus",
@ -313,28 +302,18 @@ var interfaceNamesInGlobalScope =
"ModalContentWindow",
"MouseEvent",
"MouseScrollEvent",
{name: "MozActivity", b2g: true},
"MozApplicationEvent",
"MozCanvasPrintState",
{name: "MozCellBroadcast", b2g: true},
{name: "MozCellBroadcastEvent", b2g: true},
"MozConnection",
"mozContact",
"MozContactChangeEvent",
"MozCSSKeyframeRule",
"MozCSSKeyframesRule",
{name: "MozEmergencyCbModeEvent", b2g: true},
{name: "MozIccManager", b2g: true},
{name: "MozInputContext", b2g: true},
{name: "MozInputMethod", b2g: true},
{name: "MozInputMethodManager", b2g: true},
"MozMmsEvent",
"MozMmsMessage",
{name: "MozMobileConnection", b2g: true},
"MozMobileMessageManager",
"MozMobileMessageThread",
"MozNamedAttrMap",
{name: "MozOtaStatusEvent", b2g: true},
"MozPowerManager",
"mozRTCIceCandidate",
"mozRTCPeerConnection",
@ -344,13 +323,7 @@ var interfaceNamesInGlobalScope =
"MozSmsFilter",
"MozSmsMessage",
"MozSmsSegmentInfo",
{name: "MozStkCommandEvent", b2g: true},
{name: "MozTimeManager", b2g: true},
{name: "MozVoicemail", b2g: true},
{name: "MozVoicemailEvent", b2g: true},
"MozWakeLock",
{name: "MozWifiConnectionInfoEvent", b2g: true},
{name: "MozWifiStatusChangeEvent", b2g: true},
"MutationEvent",
"MutationObserver",
"MutationRecord",
@ -382,8 +355,8 @@ var interfaceNamesInGlobalScope =
"PopupBlockedEvent",
"ProcessingInstruction",
"ProgressEvent",
{name: "Promise", b2g: false, release: false},
{name: "PromiseResolver", b2g: false, release: false},
{name: "Promise", release: false},
{name: "PromiseResolver", release: false},
"PropertyNodeList",
"Range",
"RecordErrorEvent",
@ -531,9 +504,6 @@ var interfaceNamesInGlobalScope =
"SVGViewElement",
"SVGZoomAndPan",
"SVGZoomEvent",
{name: "Telephony", b2g: true},
{name: "TelephonyCall", b2g: true},
{name: "TelephonyCallGroup", b2g: true},
"Text",
"TextDecoder",
"TextEncoder",
@ -554,7 +524,6 @@ var interfaceNamesInGlobalScope =
"URL",
{name: "UserDataHandler", xbl: true},
"UserProximityEvent",
{name: "USSDReceivedEvent", b2g: true},
"ValidityState",
"VideoStreamTrack",
"WaveShaperNode",
@ -603,8 +572,7 @@ function createInterfaceMap(isXBLScope) {
var version = SpecialPowers.Cc["@mozilla.org/xre/app-info;1"].getService(SpecialPowers.Ci.nsIXULAppInfo).version;
var isNightly = version.endsWith("a1");
var isRelease = !version.contains("a");
var isMobile = navigator.userAgent.contains("Mobile");
var isB2G = isMobile && !navigator.userAgent.contains("Android");
var isAndroid = navigator.userAgent.indexOf("Android") >= 0;
var interfaceMap = {};
for (var entry of ecmaGlobals) {
if (typeof(entry) === "string") {
@ -619,13 +587,12 @@ function createInterfaceMap(isXBLScope) {
for (var entry of interfaceNamesInGlobalScope) {
if (typeof(entry) === "string") {
interfaceMap[entry] = true;
} else if (entry.xbl === !isXBLScope ||
entry.mobile === !isMobile ||
entry.b2g === !isB2G ||
entry.release === !isRelease) {
interfaceMap[entry.name] = false;
} else {
} else if (entry.xbl === isXBLScope ||
entry.android === isAndroid ||
entry.release === isRelease) {
interfaceMap[entry.name] = true;
} else {
interfaceMap[entry.name] = false;
}
}
return interfaceMap;

View File

@ -332,6 +332,7 @@
"content/base/test/test_bug166235.html":"clipboard undefined",
"dom/tests/mochitest/general/test_idleapi_permissions.html":"",
"dom/tests/mochitest/general/test_interfaces.html":"",
"dom/tests/mochitest/general/test_paste_selection.html":"No clipboard",
"dom/tests/mochitest/geolocation/test_allowCurrent.html":"Bug 910235 - Error: no message manager set when calling method: [nsIObserver::observe]",