mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-05 16:46:26 +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 |
||
---|---|---|
.. | ||
bug421622-referer.sjs | ||
bug514705_helper.xul | ||
bug514705.html | ||
file_bug549682.xul | ||
Makefile.in | ||
test_bug206691.xul | ||
test_bug421622.xul | ||
test_bug429785.xul | ||
test_bug430050.xul | ||
test_bug467123.xul | ||
test_bug514705.xul | ||
test_bug549682.xul | ||
test_title.xul | ||
title_window.xul |