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
..
Makefile.in	Merging with M-C.	2010-06-07 13:38:02 -07:00
nsNetCID.h	Bug 472529, websockets (netwerk patch), r=smaug+biesi	2010-06-17 21:33:42 +03:00
nsNetModule.cpp	Merge from m-c.	2010-06-22 17:33:57 -07:00