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

Bug 786361 - Prevent a startup race waiting for the DOM application registry to load [r=marshall]

Browse Source
This commit is contained in:
Fabrice Desré 2012-09-11 18:17:01 -07:00
parent 35cf5be123
commit cdd45aeb2c
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
b2g/chrome/content/shell.js
View File

@ -245,7 +245,7 @@ var shell = {
case 'keypress':
return;
}
// On my device, the physical hardware buttons (sleep and volume)
// send multiple events (press press release release), but the
// soft home button just sends one. This hack is to manually
@ -421,6 +421,10 @@ Services.obs.addObserver(function(aSubject, aTopic, aData) {
fullscreenorigin: aData });
}, "fullscreen-origin-change", false);
Services.obs.addObserver(function onWebappsReady(subject, topic, data) {
shell.sendChromeEvent({ type: 'webapps-registry-ready' });
}, 'webapps-registry-ready', false);
(function Repl() {
if (!Services.prefs.getBoolPref('b2g.remote-js.enabled')) {
return;

33
dom/apps/src/Webapps.jsm
View File

@ -77,6 +77,8 @@ let DOMApplicationRegistry = {
dirList.push("coreAppsDir");
#endif
let currentId = 1;
this.dirsToLoad = dirList.length;
this.dirsLoaded = 0;
dirList.forEach((function(dir) {
let curFile;
try {
@ -91,13 +93,16 @@ let DOMApplicationRegistry = {
if (!aData) {
return;
}
#ifdef MOZ_SYS_MSG
let ids = [];
#endif
// Add new apps to the merged list.
for (let id in aData) {
this.webapps[id] = aData[id];
this.webapps[id].basePath = appDir.path;
this.webapps[id].removable = (dir == DIRECTORY_NAME);
#ifdef MOZ_SYS_MSG
this._processManifestForId(id);
ids.push({ id: id });
#endif
// local ids must be stable between restarts.
// We partition the ids in two buckets:
@ -114,7 +119,13 @@ let DOMApplicationRegistry = {
this.webapps[id].appStatus = Ci.nsIPrincipal.APP_STATUS_INSTALLED;
}
};
#ifdef MOZ_SYS_MSG
this._processManifestForIds(ids);
#endif
}).bind(this));
} else {
// The directory we're trying to load from doesn't exist.
this.dirsToLoad--;
}
}).bind(this));
},
@ -175,13 +186,19 @@ let DOMApplicationRegistry = {
}
},
_processManifestForId: function(aId) {
let app = this.webapps[aId];
this._readManifests([{ id: aId }], (function registerManifest(aResult) {
let manifest = aResult[0].manifest;
app.name = manifest.name;
this._registerSystemMessages(manifest, app);
this._registerActivities(manifest, app);
_processManifestForIds: function(aIds) {
this._readManifests(aIds, (function registerManifests(aResults) {
aResults.forEach(function registerManifest(aResult) {
let app = this.webapps[aResult.id];
let manifest = aResult.manifest;
app.name = manifest.name;
this._registerSystemMessages(manifest, app);
this._registerActivities(manifest, app);
}, this);
this.dirsLoaded++;
if (this.dirsLoaded == this.dirsToLoad) {
Services.obs.notifyObservers(this, "webapps-registry-ready", null);
}
}).bind(this));
},
#endif