mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
d194b9d486
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
|
||
|---|---|---|
| .. | ||
| httpserver | ||
| reftest | ||
| unit | ||
| unit_ipc | ||
| Makefile.in | ||
| neckoTiming.pl | ||
| PageList.txt | ||
| PropertiesTest.cpp | ||
| ReadNTLM.cpp | ||
| sites.txt | ||
| TestAsyncCache.js | ||
| TestBlockingSocket.cpp | ||
| TestCacheBlockFiles.cpp | ||
| TestCacheCollisions.js | ||
| TestCachePerformance.js | ||
| TestCacheService.cpp | ||
| TestCacheVisitor.js | ||
| TestCallbacks.cpp | ||
| TestCommon.h | ||
| TestCookie.cpp | ||
| TestDiskCache.js | ||
| TestDNS.cpp | ||
| TestDNSDaemon.cpp | ||
| TestFileInput2.cpp | ||
| TestHttp.cpp | ||
| TestIDN.cpp | ||
| TestIncrementalDownload.cpp | ||
| TestIOThreads.cpp | ||
| TestMakeAbs.cpp | ||
| TestMCTransport.cpp | ||
| TestObjectCache.js | ||
| TestOpen.cpp | ||
| TestOverlappedIO.cpp | ||
| TestPageLoad.cpp | ||
| TestPerf.cpp | ||
| TestProtocols.cpp | ||
| TestRes.cpp | ||
| TestServ.cpp | ||
| TestServ.js | ||
| TestSocketInput.cpp | ||
| TestSocketIO.cpp | ||
| TestSocketTransport.cpp | ||
| TestStandardURL.cpp | ||
| TestStreamChannel.cpp | ||
| TestStreamLoader.cpp | ||
| TestStreamPump.cpp | ||
| TestStreamTransport.cpp | ||
| TestSyncHTTP.cpp | ||
| TestThreadedIO.cpp | ||
| TestUDPSocketProvider.cpp | ||
| TestUpload.cpp | ||
| TestURLManipulation.html | ||
| TestURLParser.cpp | ||
| TestWriteSpeed.cpp | ||
| urlparse_mac.dat | ||
| urlparse_unx.dat | ||
| urlparse_win.dat | ||
| urlparse.dat | ||
| urltest.cpp | ||
| urltests.dat | ||