Jason Duell 386a098a89 Merge from m-c. ... 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		2010-06-22 17:33:57 -07:00
..
appstartup	Bug 560647 - add startup timeline instrumentation; r=vlad	2010-05-19 19:22:19 -04:00
build	Bug 563274 - Overhaul nsIPrompt-related prompting code. r=gavin, sr=bs	2010-06-16 17:06:17 -07:00
commandhandler	Bug 528491, combine nsFocusController and nsWindowRoot, r=jst,sr=smaug	2010-02-20 11:07:03 -05:00
find	Bug 557620 - Implement <input type="tel">. r=smaug,dolske,dao sr=sicking	2010-05-12 09:17:07 +02:00
printingui	Bug 553586: Heap corruption in Windows ShowNativePrintDialog. r=vlad	2010-04-03 07:35:27 -04:00
webbrowserpersist	Bug 456229 - Implement <input type="search">. r=smaug sr=sicking	2010-05-17 12:20:22 +02:00
windowwatcher	Merge from m-c.	2010-06-22 17:33:57 -07:00
Makefile.in	Bug 548189 - Remove embedding/components/ui/, r=bsmedberg	2010-02-24 00:20:33 -08:00