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

Backed out changeset 49086e9caa4e (bug 1051114) for making Gaia-unit tests timeout on a CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2014-08-11 15:27:58 -07:00
parent 6dbfffbba9
commit b04134dbf2
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/apps/src/InterAppCommService.jsm
View File

@ -804,13 +804,6 @@ this.InterAppCommService = {
if (pair.publisher.target === aTarget ||
pair.subscriber.target === aTarget) {
messagePortIDs.push(messagePortID);
// Send a shutdown message to the part of the pair that is still alive.
let actor = pair.publisher.target === aTarget ? pair.subscriber
: pair.publisher;
actor.target.sendAsyncMessage("InterAppMessagePort:Shutdown",
{ manifestURL: actor.manifestURL,
pageURL: actor.pageURL,
messagePortID: messagePortID });
}
}
messagePortIDs.forEach(function(aMessagePortID) {

11
dom/apps/src/InterAppMessagePort.js
View File

@ -30,8 +30,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "appsService",
"@mozilla.org/AppsService;1",
"nsIAppsService");
const kMessages = ["InterAppMessagePort:OnMessage",
"InterAppMessagePort:Shutdown"];
const kMessages = ["InterAppMessagePort:OnMessage"];
function InterAppMessagePort() {
if (DEBUG) debug("InterAppMessagePort()");
@ -150,8 +149,6 @@ InterAppMessagePort.prototype = {
cpmm.sendAsyncMessage("InterAppMessagePort:Unregister",
{ messagePortID: this._messagePortID,
manifestURL: this._manifestURL });
this.removeMessageListeners(kMessages);
},
get onmessage() {
@ -196,8 +193,7 @@ InterAppMessagePort.prototype = {
if (message.manifestURL != this._manifestURL ||
message.pageURL != this._pageURL ||
message.messagePortID != this._messagePortID) {
if (DEBUG) debug("The message doesn't belong to this page. Returning. " +
uneval(message));
if (DEBUG) debug("The message doesn't belong to this page. Returning.");
return;
}
@ -217,9 +213,6 @@ InterAppMessagePort.prototype = {
this._dispatchMessage(message.message);
break;
case "InterAppMessagePort:Shutdown":
this.close();
break;
default:
if (DEBUG) debug("Error! Shouldn't fall into this case.");
break;