Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1253957 - Fix e10s race issue for test from bug 1165981; r=bsmedberg

Browse Source
This commit is contained in:
Kyle Machulis 2016-03-28 15:37:26 -07:00
parent ea9bc73f05
commit 7f4a21d386
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/plugins/base/nsPluginHost.cpp
View File

@ -1861,7 +1861,8 @@ nsPluginHost::GetSpecialType(const nsACString & aMIMEType)
}
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;
}

2
dom/plugins/test/mochitest/mochitest.ini
View File

@ -137,5 +137,5 @@ skip-if = os != "win" || e10s
skip-if = toolkit == "cocoa"
[test_zero_opacity.html]
[test_bug1165981.html]
skip-if = !(os == "win" && processor == "x86_64" && !e10s) # Bug 1253957
skip-if = !(os == "win" && processor == "x86_64")
[test_bug1245545.html]

18
dom/plugins/test/mochitest/test_bug1165981.html
View File

@ -6,8 +6,6 @@
<script type="text/javascript" src="plugin-utils.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body onload="run()">
<script class="testbody" type="application/javascript">
"use strict";
@ -36,7 +34,19 @@
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() {
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");
is(pluginElement.identifierToStringTest("foo"), "foo", "Should be able to call a function provided by the plugin");
@ -66,8 +76,6 @@
}
</script>
<object id="plugin-flash" type="application/x-shockwave-flash-test" width=200 height=200></object>
<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 onload="run()">
</body>
</html>