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 birch to m-c.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-06-10 15:43:30 -04:00
commit 39565c8428
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/app/b2g.js
View File

@ -610,7 +610,7 @@ pref("hal.processPriorityManager.gonk.LowCPUNice", 18);
// this too high, then we'll send out a memory pressure event every Z seconds
// (see below), even while we have processes that we would happily kill in
// order to free up memory.
pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 10);
pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 14);
// We wait this long before polling the memory-pressure fd after seeing one
// memory pressure event. (When we're not under memory pressure, we sit

5
b2g/chrome/content/identity.js
View File

@ -109,13 +109,16 @@ function doInternalRequest() {
method: 'login',
assertion: assertion,
_internalParams: internalParams});
} else {
identityCall({
method: 'cancel'
});
}
closeIdentityDialog();
},
stringifiedOptions);
}
}
function doInternalLogout(aOptions) {
log("doInternalLogout:", (options && isLoaded));
if (options && isLoaded) {