Jason Duell d194b9d486 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
..
crashtests	Bug 506041 Part 2: Correct misspellings in source code	2010-05-13 14:19:50 +02:00
idl	Bug 560643 - Add a special jsval type to XPIDL. Part 2, manual IDL cleanup. r+sr=jst.	2010-05-12 08:19:22 -05:00
loader	Bug 572445 - Bug 552121 broke compilation with --enable-functiontimer turned on; r=vlad	2010-06-16 13:01:17 -04:00
public
sample
shell	Merging with M-C.	2010-06-07 13:38:02 -07:00
src	b=571029; readPixels API change, support both old and new signatures, also fix 572797 (allow non-fitting rectangles), and check that sizes are nonnegative; r=vladimir	2010-06-19 10:46:12 -04:00
tests	Bug 565351 - Disallow passing E4X values through SJOWs. r=jst	2010-06-14 14:30:58 -07:00
Makefile.in