Commit Graph

7 Commits

Author SHA1 Message Date
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
Olli Pettay
61c8ca96ee Bug 548847 - [E10s] forward modal (chrome) dialogs from content to chrome, r=jst 2010-05-17 14:25:22 +03:00
Benjamin Smedberg
5c35a5fb86 Bug 569948 - Remove NS_InitEmbedding because it was obsoleted long ago by XRE_InitEmbedding and it's a footgun, r=mfinkle sr=dougt 2010-06-08 11:34:30 -04:00
Benjamin Smedberg
2e9438fd2f Followup to bug 398573 - remove REQUIRES from the tree since it is no longer used... automatically generated patch, rs=ted 2009-08-25 08:59:31 -07:00
"Doug Turner ext:(%22)
30df99659b Removing Minimo references. b=405705, r=ted 2008-06-16 13:57:42 -07:00
gerv@gerv.net
2c4fa4403c Bug 398009 - fix mangled license headers. a=stuart. 2007-10-06 05:08:39 -07:00
hg@mozilla.com
465265d0d4 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