mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 559303 - Consolidate strBuf and longStrBuf in the tokenizer. r=wchen. (b385e7635) - Bug 489820 part 1 - Make charRefBuf non-growable and have the same lifetime as the tokenizer. r=wchen. (5c9a2c402) - Bug 489820 part 2 - Grow buffers to the worst-case size before tokenizing; fix comments. r=wchen. (7dad72a9a) - Bug 1176668 - Fix overflow avoidance in numeric character reference handling. r=wchen. (f9cdb2b5b) - Bug 1171309 - Remove PREF_Init()'s return value. r=bsmedberg. (245dd4436) - Bug 916101 - Show entire pref name when wanring about size, r=mossop (61245be0f) - add back crashrep, it is not defined anyway (4995d8d3e) - Bug 1195123: Restructure logic (pulling out "!") for SVG image rejection, to make it clearer that it matches the comment. r=longsonr (57e3698f6) - Bug 629682 - Add a better warning message for SVG-as-an-image external resources being blocked. r=dholbert (35ea836e4) - remove useless cast (abb30e8ac) - add internal CSP preload check from TFF (14c4d843e) - Bug 1167650 - Expose DOMRequest and DOMCursor to workers. r=bent (468365262) - Bug 1154041 - Enable child process memory report logging by default on B2G. r=erahm (141254fc5) - namespace (515b42704) - Bug 1164587 - Get rid of Fault() in the cycle collector. r=smaug (9587d4971)
This commit is contained in:
@@ -517,8 +517,7 @@ Preferences::Init()
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
rv = PREF_Init();
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
PREF_Init();
|
||||
|
||||
rv = pref_InitInitialObjects();
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
@@ -638,8 +637,7 @@ Preferences::ResetPrefs()
|
||||
NotifyServiceObservers(NS_PREFSERVICE_RESET_TOPIC_ID);
|
||||
PREF_CleanupPrefs();
|
||||
|
||||
nsresult rv = PREF_Init();
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
PREF_Init();
|
||||
|
||||
return pref_InitInitialObjects();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user