Jason Duell d194b9d486 Merge from m-c. ... Fair amount of merge conflicts. Biggest item was changes to nsHttpChannel from web sockets changes. Other likely suspects if things are borken: nsFrameLoader.cpp: - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or nsnull (m-c) to local process call to new nsFrameMessageManager(), callback arg? Smaug said null. - only calling SetCallBackData for local case. also +r smaug. nsPrefBranch.cpp had fairly extensive merge conflicts. nsChromeRegistry had lots of changes. Dougt did most of the non-necko changes (thanks). --HG-- rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h		2010-06-22 17:33:57 -07:00
..
public	Bug 506041 Part 2: Correct misspellings in source code	2010-05-13 14:19:50 +02:00
src	Merge from m-c.	2010-06-22 17:33:57 -07:00
test	Bug 543739 - Need xpcshell unit test suites for libPref. r=dwitte	2010-05-12 12:12:01 +02:00
Makefile.in	Bug 345529 - "crash removing an observer during an nsPref:changed notification [@ pref_DoCallback] (node is 0xdddddddd)" [p=asqueella@gmail.com (Nickolay Ponomarev) r+sr=bsmedberg sr=darinf a=blocking1.9+]	2007-11-16 20:25:41 -08:00