mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 22:32:46 +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
|
||
|---|---|---|
| .. | ||
| test/unit_ipc | ||
| CookieServiceChild.cpp | ||
| CookieServiceChild.h | ||
| CookieServiceParent.cpp | ||
| CookieServiceParent.h | ||
| ipdl.mk | ||
| Makefile.in | ||
| nsCookie.cpp | ||
| nsCookie.h | ||
| nsCookieService.cpp | ||
| nsCookieService.h | ||
| nsICookie2.idl | ||
| nsICookie.idl | ||
| nsICookieManager2.idl | ||
| nsICookieManager.idl | ||
| nsICookiePermission.idl | ||
| nsICookieService.idl | ||
| PCookieService.ipdl | ||