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
|
||
|---|---|---|
| .. | ||
| autocomplete.xml | ||
| browser.xml | ||
| button.xml | ||
| checkbox.xml | ||
| colorpicker.xml | ||
| datetimepicker.xml | ||
| dialog.xml | ||
| editor.xml | ||
| expander.xml | ||
| filefield.xml | ||
| findbar.xml | ||
| general.xml | ||
| groupbox.xml | ||
| listbox.xml | ||
| menu.xml | ||
| menulist.xml | ||
| notification.xml | ||
| numberbox.xml | ||
| optionsDialog.xml | ||
| popup.xml | ||
| preferences.xml | ||
| progressmeter.xml | ||
| radio.xml | ||
| resizer.xml | ||
| richlistbox.xml | ||
| scale.xml | ||
| scrollbar.xml | ||
| scrollbox.xml | ||
| spinbuttons.xml | ||
| splitter.xml | ||
| stringbundle.xml | ||
| tabbox.xml | ||
| text.xml | ||
| textbox.xml | ||
| toolbar.xml | ||
| toolbarbutton.xml | ||
| tree.xml | ||
| videocontrols.css | ||
| videocontrols.xml | ||
| wizard.xml | ||