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

Merge b2g-inbound to m-c a=merge

Browse Source
This commit is contained in:
Wes Kocher 2015-04-02 17:55:28 -07:00
commit 861aa7e2cc
12 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/dolphin/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator-ics/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>

2
b2g/config/emulator-jb/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="1b1d86462d3150dceacff927536ded9fcc168419"/>

2
b2g/config/emulator-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator-l/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/emulator/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>

2
b2g/config/flame-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

2
b2g/config/flame/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="1b1d86462d3150dceacff927536ded9fcc168419"/>

4
b2g/config/gaia.json
View File

@ -1,9 +1,9 @@
{
"git": {
"git_revision": "62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7",
"git_revision": "7969b367a7da62877c3a24a26d3cb5fda89d766c",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
"revision": "4b56fba8a50f20300465f09ae79b123e77ddc858",
"revision": "eea7ee4fcbcd01b1662667a700b18a15688388c7",
"repo_path": "integration/gaia-central"
}

2
b2g/config/nexus-4/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="1b1d86462d3150dceacff927536ded9fcc168419"/>

2
b2g/config/nexus-5-l/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="62042ffcc8c6cca0f51ad23f5c2b979fc153b5a7"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7969b367a7da62877c3a24a26d3cb5fda89d766c"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

98
dom/apps/Webapps.jsm
View File

@ -1274,6 +1274,12 @@ this.DOMApplicationRegistry = {
}, this);
},
formatMessage: function(aData) {
let msg = aData;
delete msg["mm"];
return msg;
},
receiveMessage: function(aMessage) {
// nsIPrefBranch throws if pref does not exist, faster to simply write
// the pref instead of first checking if it is false.
@ -1474,8 +1480,8 @@ this.DOMApplicationRegistry = {
if (!(aMsgName in this.children)) {
return;
}
this.children[aMsgName].forEach(function(mmRef) {
mmRef.mm.sendAsyncMessage(aMsgName, aContent);
this.children[aMsgName].forEach((mmRef) => {
mmRef.mm.sendAsyncMessage(aMsgName, this.formatMessage(aContent));
});
},
@ -1566,14 +1572,14 @@ this.DOMApplicationRegistry = {
doExport: function(aMsg, aMm) {
function sendError(aError) {
let sendError = (aError) => {
aMm.sendAsyncMessage("Webapps:Export:Return",
{ requestID: aMsg.requestID,
oid: aMsg.oid,
error: aError,
success: false
});
}
};
let app = this.getAppByManifestURL(aMsg.manifestURL);
if (!app) {
@ -1595,14 +1601,14 @@ this.DOMApplicationRegistry = {
},
doImport: function(aMsg, aMm) {
function sendError(aError) {
let sendError = (aError) => {
aMm.sendAsyncMessage("Webapps:Import:Return",
{ requestID: aMsg.requestID,
oid: aMsg.oid,
error: aError,
success: false
});
}
};
if (!aMsg.blob || !aMsg.blob instanceof Ci.nsIDOMBlob) {
sendError("NoBlobFound");
@ -1624,14 +1630,14 @@ this.DOMApplicationRegistry = {
},
doExtractManifest: function(aMsg, aMm) {
function sendError() {
let sendError = (aError) => {
aMm.sendAsyncMessage("Webapps:ExtractManifest:Return",
{ requestID: aMsg.requestID,
oid: aMsg.oid,
error: aError,
success: false
});
}
};
if (!aMsg.blob || !aMsg.blob instanceof Ci.nsIDOMBlob) {
sendError("NoBlobFound");
@ -1663,12 +1669,12 @@ this.DOMApplicationRegistry = {
aData.manifestURL,
aData.startPoint,
aData.timestamp,
function onsuccess() {
aMm.sendAsyncMessage("Webapps:Launch:Return:OK", aData);
() => {
aMm.sendAsyncMessage("Webapps:Launch:Return:OK", this.formatMessage(aData));
},
function onfailure(reason) {
(reason) => {
aData.error = reason;
aMm.sendAsyncMessage("Webapps:Launch:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:Launch:Return:KO", this.formatMessage(aData));
}
);
},
@ -2123,11 +2129,11 @@ this.DOMApplicationRegistry = {
checkForUpdate: function(aData, aMm) {
debug("checkForUpdate for " + aData.manifestURL);
function sendError(aError) {
let sendError = (aError) => {
debug("checkForUpdate error " + aError);
aData.error = aError;
aMm.sendAsyncMessage("Webapps:CheckForUpdate:Return:KO", aData);
}
aMm.sendAsyncMessage("Webapps:CheckForUpdate:Return:KO", this.formatMessage(aData));
};
let id = this._appIdForManifestURL(aData.manifestURL);
let app = this.webapps[id];
@ -2529,13 +2535,13 @@ this.DOMApplicationRegistry = {
doInstall: function doInstall(aData, aMm) {
let app = aData.app;
let sendError = function sendError(aError) {
let sendError = (aError) => {
aData.error = aError;
aMm.sendAsyncMessage("Webapps:Install:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:Install:Return:KO", this.formatMessage(aData));
Cu.reportError("Error installing app from: " + app.installOrigin +
": " + aError);
this.popContentAction(aData.oid);
}.bind(this);
};
if (app.receipts.length > 0) {
for (let receipt of app.receipts) {
@ -2684,13 +2690,13 @@ this.DOMApplicationRegistry = {
doInstallPackage: function doInstallPackage(aData, aMm) {
let app = aData.app;
let sendError = function sendError(aError) {
let sendError = (aError) => {
aData.error = aError;
aMm.sendAsyncMessage("Webapps:Install:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:Install:Return:KO", this.formatMessage(aData));
Cu.reportError("Error installing packaged app from: " +
app.installOrigin + ": " + aError);
this.popContentAction(aData.oid);
}.bind(this);
};
if (app.receipts.length > 0) {
for (let receipt of app.receipts) {
@ -2843,7 +2849,7 @@ this.DOMApplicationRegistry = {
} catch(e) {
}
}
aData.mm.sendAsyncMessage("Webapps:Install:Return:KO", aData);
aData.mm.sendAsyncMessage("Webapps:Install:Return:KO", this.formatMessage(aData));
},
// This function is called after we called the onsuccess callback on the
@ -4171,7 +4177,7 @@ this.DOMApplicationRegistry = {
}
if ((aMm = aMm.get())) {
aMm.sendAsyncMessage(response, aData);
aMm.sendAsyncMessage(response, this.formatMessage(aData));
}
}),
@ -4264,7 +4270,7 @@ this.DOMApplicationRegistry = {
if (aData.appId == Ci.nsIScriptSecurityManager.NO_APP_ID ||
aData.appId == Ci.nsIScriptSecurityManager.UNKNOWN_APP_ID) {
aMm.sendAsyncMessage("Webapps:GetSelf:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:GetSelf:Return:OK", this.formatMessage(aData));
return;
}
@ -4282,14 +4288,14 @@ this.DOMApplicationRegistry = {
}
if (!aData.apps.length) {
aMm.sendAsyncMessage("Webapps:GetSelf:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:GetSelf:Return:OK", this.formatMessage(aData));
return;
}
this._readManifests(tmp).then((aResult) => {
for (let i = 0; i < aResult.length; i++)
aData.apps[i].manifest = aResult[i].manifest;
aMm.sendAsyncMessage("Webapps:GetSelf:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:GetSelf:Return:OK", this.formatMessage(aData));
});
},
@ -4311,7 +4317,7 @@ this.DOMApplicationRegistry = {
aData.app.manifest = aResult[i].manifest;
break;
}
aMm.sendAsyncMessage("Webapps:CheckInstalled:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:CheckInstalled:Return:OK", this.formatMessage(aData));
});
},
@ -4330,7 +4336,7 @@ this.DOMApplicationRegistry = {
this._readManifests(tmp).then((aResult) => {
for (let i = 0; i < aResult.length; i++)
aData.apps[i].manifest = aResult[i].manifest;
aMm.sendAsyncMessage("Webapps:GetInstalled:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:GetInstalled:Return:OK", this.formatMessage(aData));
});
},
@ -4348,16 +4354,16 @@ this.DOMApplicationRegistry = {
this._readManifests(tmp).then((aResult) => {
for (let i = 0; i < aResult.length; i++)
aData.apps[i].manifest = aResult[i].manifest;
aMm.sendAsyncMessage("Webapps:GetNotInstalled:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:GetNotInstalled:Return:OK", this.formatMessage(aData));
});
},
getIcon: function(aData, aMm) {
function sendError(aError) {
let sendError = (aError) => {
debug("getIcon error: " + aError);
aData.error = aError;
aMm.sendAsyncMessage("Webapps:GetIcon:Return", aData);
}
aMm.sendAsyncMessage("Webapps:GetIcon:Return", this.formatMessage(aData));
};
let app = this.getAppByManifestURL(aData.manifestURL);
if (!app) {
@ -4513,14 +4519,14 @@ this.DOMApplicationRegistry = {
if (!receipt) {
aData.error = "INVALID_PARAMETERS";
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:KO", this.formatMessage(aData));
return;
}
let error = this.isReceipt(receipt);
if (error) {
aData.error = error;
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:KO", this.formatMessage(aData));
return;
}
@ -4531,14 +4537,14 @@ this.DOMApplicationRegistry = {
app.receipts = [];
} else if (app.receipts.length > 500) {
aData.error = "TOO_MANY_RECEIPTS";
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:KO", this.formatMessage(aData));
return;
}
let index = app.receipts.indexOf(receipt);
if (index >= 0) {
aData.error = "RECEIPT_ALREADY_EXISTS";
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:KO", this.formatMessage(aData));
return;
}
@ -4546,7 +4552,7 @@ this.DOMApplicationRegistry = {
this._saveApps().then(() => {
aData.receipts = app.receipts;
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:AddReceipt:Return:OK", this.formatMessage(aData));
});
},
@ -4557,7 +4563,7 @@ this.DOMApplicationRegistry = {
if (!receipt) {
aData.error = "INVALID_PARAMETERS";
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:KO", this.formatMessage(aData));
return;
}
@ -4566,14 +4572,14 @@ this.DOMApplicationRegistry = {
if (!app.receipts) {
aData.error = "NO_SUCH_RECEIPT";
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:KO", this.formatMessage(aData));
return;
}
let index = app.receipts.indexOf(receipt);
if (index == -1) {
aData.error = "NO_SUCH_RECEIPT";
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:KO", this.formatMessage(aData));
return;
}
@ -4581,7 +4587,7 @@ this.DOMApplicationRegistry = {
this._saveApps().then(() => {
aData.receipts = app.receipts;
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:OK", this.formatMessage(aData));
});
},
@ -4593,14 +4599,14 @@ this.DOMApplicationRegistry = {
if (!oldReceipt || !newReceipt) {
aData.error = "INVALID_PARAMETERS";
aMm.sendAsyncMessage("Webapps:ReplaceReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:ReplaceReceipt:Return:KO", this.formatMessage(aData));
return;
}
let error = this.isReceipt(newReceipt);
if (error) {
aData.error = error;
aMm.sendAsyncMessage("Webapps:ReplaceReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:ReplaceReceipt:Return:KO", this.formatMessage(aData));
return;
}
@ -4609,14 +4615,14 @@ this.DOMApplicationRegistry = {
if (!app.receipts) {
aData.error = "NO_SUCH_RECEIPT";
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:RemoveReceipt:Return:KO", this.formatMessage(aData));
return;
}
let oldIndex = app.receipts.indexOf(oldReceipt);
if (oldIndex == -1) {
aData.error = "NO_SUCH_RECEIPT";
aMm.sendAsyncMessage("Webapps:ReplaceReceipt:Return:KO", aData);
aMm.sendAsyncMessage("Webapps:ReplaceReceipt:Return:KO", this.formatMessage(aData));
return;
}
@ -4624,7 +4630,7 @@ this.DOMApplicationRegistry = {
this._saveApps().then(() => {
aData.receipts = app.receipts;
aMm.sendAsyncMessage("Webapps:ReplaceReceipt:Return:OK", aData);
aMm.sendAsyncMessage("Webapps:ReplaceReceipt:Return:OK", this.formatMessage(aData));
});
},