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
..
ipc	Bug 564382 - Remove CPOWs from PContentProcess tree. r=olli	2010-06-17 14:10:14 -07:00
jsd	Add an API for compartments (570040, r=jorendorff).	2010-06-04 16:32:10 -07:00
narcissus	Bug 546097 - Narcissus: replace the regex-based lexer with a handwritten one; remove GLOBAL. r=brendan	2010-05-24 13:43:21 -07:00
src	Merge from m-c.	2010-06-22 17:33:57 -07:00
landbranch.pl