mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 23:35:34 +00:00
Bug 1253957 - Fix e10s race issue for test from bug 1165981; r=bsmedberg
This commit is contained in:
parent
ea9bc73f05
commit
7f4a21d386
@ -1861,7 +1861,8 @@ nsPluginHost::GetSpecialType(const nsACString & aMIMEType)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (aMIMEType.LowerCaseEqualsASCII("application/x-silverlight") ||
|
if (aMIMEType.LowerCaseEqualsASCII("application/x-silverlight") ||
|
||||||
aMIMEType.LowerCaseEqualsASCII("application/x-silverlight-2")) {
|
aMIMEType.LowerCaseEqualsASCII("application/x-silverlight-2") ||
|
||||||
|
aMIMEType.LowerCaseEqualsASCII("application/x-silverlight-test")) {
|
||||||
return eSpecialType_Silverlight;
|
return eSpecialType_Silverlight;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,5 +137,5 @@ skip-if = os != "win" || e10s
|
|||||||
skip-if = toolkit == "cocoa"
|
skip-if = toolkit == "cocoa"
|
||||||
[test_zero_opacity.html]
|
[test_zero_opacity.html]
|
||||||
[test_bug1165981.html]
|
[test_bug1165981.html]
|
||||||
skip-if = !(os == "win" && processor == "x86_64" && !e10s) # Bug 1253957
|
skip-if = !(os == "win" && processor == "x86_64")
|
||||||
[test_bug1245545.html]
|
[test_bug1245545.html]
|
||||||
|
@ -6,8 +6,6 @@
|
|||||||
<script type="text/javascript" src="plugin-utils.js"></script>
|
<script type="text/javascript" src="plugin-utils.js"></script>
|
||||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
|
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body onload="run()">
|
|
||||||
<script class="testbody" type="application/javascript">
|
<script class="testbody" type="application/javascript">
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
@ -36,7 +34,19 @@
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createNode(id, type) {
|
||||||
|
let obj = document.createElement("object");
|
||||||
|
obj.type = type;
|
||||||
|
obj.id = id;
|
||||||
|
obj.width = 200;
|
||||||
|
obj.height = 200;
|
||||||
|
document.body.appendChild(obj);
|
||||||
|
}
|
||||||
|
|
||||||
function run() {
|
function run() {
|
||||||
|
createNode("plugin-flash", "application/x-shockwave-flash-test");
|
||||||
|
createNode("plugin-silverlight", "application/x-silverlight-test");
|
||||||
|
createNode("disallowedPlugin", "application/x-third-test");
|
||||||
var pluginElement = document.getElementById("plugin-flash");
|
var pluginElement = document.getElementById("plugin-flash");
|
||||||
is(pluginElement.identifierToStringTest("foo"), "foo", "Should be able to call a function provided by the plugin");
|
is(pluginElement.identifierToStringTest("foo"), "foo", "Should be able to call a function provided by the plugin");
|
||||||
|
|
||||||
@ -66,8 +76,6 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<object id="plugin-flash" type="application/x-shockwave-flash-test" width=200 height=200></object>
|
<body onload="run()">
|
||||||
<object id="plugin-silverlight" type="application/x-silverlight-test" width=200 height=200></object>
|
|
||||||
<object id="disallowedPlugin" type="application/x-third-test" width=200 height=200></object>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
Reference in New Issue
Block a user