gecko/content/events/public
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
..
Makefile.in Bug 543398 Drop nsTextEventReply and nsIPrivateCompositionEvent r=smaug, sr=roc 2010-04-10 18:24:35 +09:00
nsEventDispatcher.h Bug 528196 - Optimize nsEventTargetChainItem::HandleEvent, r=jst 2009-12-18 20:50:49 +02:00
nsIEventListenerManager.h Bug 558773 - Reduce virtual calls during event dispatch, r=jst 2010-04-16 12:04:41 +03:00
nsIEventListenerService.idl Bug 564669 Remove nsIPlaintextEditor::handleKeyPress() r=smaug+ehsan, sr=roc 2010-06-10 10:16:58 +09:00
nsIEventStateManager.h Bug 426082, part 3: Reflect a label's :hover/:active state on its associated natively themed control. 2010-05-31 19:49:55 +02:00
nsIPrivateDOMEvent.h Merge from m-c. 2010-06-22 17:33:57 -07:00
nsIPrivateTextEvent.h Bug 543398 Drop nsTextEventReply and nsIPrivateCompositionEvent r=smaug, sr=roc 2010-04-10 18:24:35 +09:00
nsIPrivateTextRange.h Bug 482138 [TSF] nsTextFrame has to draw composition string by TIP specified style r+sr=roc 2009-04-23 12:27:12 +09:00
nsMutationEvent.h Free the (distributed) Lizard! Automatic merge from CVS: Module mozilla: tag HG_REPO_INITIAL_IMPORT at 22 Mar 2007 10:30 PDT, 2007-03-22 10:30:00 -07:00
nsPIDOMEventTarget.h Bug 549682 - Port the message-manager API to mozilla-central, r=jst 2010-05-18 15:28:37 +03:00
nsPLDOMEvent.h Bug 544642: Make frames report an error event if the frame src is pointed at a local file url. And don't make setAttribute thrown an exception in that scenario. r=smaug 2010-02-24 18:45:43 -08:00