mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-04 11:26:09 +00:00
386a098a89
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
|
||
|---|---|---|
| .. | ||
| effective_tld_names.dat | ||
| Makefile.in | ||
| nameprep_template.c | ||
| nameprep.c | ||
| nameprepdata.c | ||
| nsDNSService2.cpp | ||
| nsDNSService2.h | ||
| nsEffectiveTLDService.cpp | ||
| nsEffectiveTLDService.h | ||
| nsHostResolver.cpp | ||
| nsHostResolver.h | ||
| nsIDNKitInterface.h | ||
| nsIDNService.cpp | ||
| nsIDNService.h | ||
| nsIDNSListener.idl | ||
| nsIDNSRecord.idl | ||
| nsIDNSRequest.idl | ||
| nsIDNSService.idl | ||
| nsIEffectiveTLDService.idl | ||
| nsIIDNService.idl | ||
| nsPIDNSService.idl | ||
| prepare_tlds.py | ||
| punycode.c | ||
| punycode.h | ||
| race.c | ||