Commit Graph

223 Commits

Author SHA1 Message Date
Doug Turner
7c50d1ab8c Merge from e10s clone. a=dougt 2010-08-10 18:33:38 -07:00
Benedict Hsieh
4be16266ab Bug 535077 - Fixes hang caused by failure to execute sync launch r=cjones a=blocking2.0 2010-08-10 14:14:10 -07:00
Michael Wu
608574db24 Bug 556644 - 1. Move omnijar setup to NS_InitXPCOM and use omni.jar by default, r=bsmedberg a=blocking2.0 2010-08-10 15:08:06 -07:00
Benoit Girard
d5759eca95 Bug 557225 - Load the plugin-container from the App Bundle. r=cjones 2010-07-19 18:35:45 -04:00
Chris Jones
dce4511b26 Bug 525181, part 2: Implement protocol state machines in C++. r=bent 2010-07-15 14:27:43 -05:00
timeless@mozdev.org
4e044ef7bb Bug 576384 AsyncChannel::ReportConnectionError case ChannelTimeout and case ChannelClosing are missing break
r=cjones

--HG--
extra : rebase_source : effdbd4b77048842387f834bd59495beae2d9875
2010-07-02 17:36:15 +03:00
timeless@mozdev.org
7b8177e5e1 Bug 576383 AsyncChannel::MaybeHandleError case MsgProcessingError is missing break
r=cjones

--HG--
extra : rebase_source : 4a595a81bcbd43bd37f0b5886b0a9f5c3a5e41fe
2010-07-02 17:33:19 +03:00
Benjamin Smedberg
4d172dd53d Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg
762def30bb Merge mozilla-central into the static-xpcom-registration branch. 2010-06-23 17:26:25 -04:00
Chris Jones
710c313ec5 Bug 570099: Allow Shmems to be used in IPDL structs. r=benjamn 2010-06-23 13:59:07 -05:00
Benjamin Smedberg
1af2f3576f Bug 449129 - abort a plugin process if a plugin attempts to spin an event loop while painting, r=jmathies 2010-06-23 10:18:00 -04:00
Chris Jones
a6258b9dae Bug 570096: Implement serialization of a grab-bag of gfx types. r=joe 2010-06-21 15:35:48 -05:00
Benjamin Smedberg
9045c05660 Bug 568691 part A - register static and binary components using data tables rather than programmatic nsIComponentRegistrar methods. This part contains the important needs-review bits of the change: part B contains the mechanical changes to each module in order to actually get a working build. Part C will contain changes necessary to register JS components from .manifest files 2010-06-10 14:11:11 -04:00
Jim Mathies
75a4de084c Bug 569500 - e10s: /netwerk/test/unit_ipc/* fails on windows 7. (patch re-pushed with headers needed in release builds.) r=bsmedberg. 2010-06-30 22:07:50 -05:00
Jim Mathies
4495dfe6ee Backout of bug 569500 due to opt build bustage and possible debug xpshell test timeouts. 2010-06-30 21:09:38 -05:00
Jim Mathies
56782c2715 Bug 569500 - e10s: /netwerk/test/unit_ipc/* fails on windows 7 r=bsmedberg 2010-06-30 15:51:44 -07:00
Michael Wu
01a2cef59b Bug 574120 - Add support for IPC on Android to everything else, r=dougt 2010-06-25 13:29:43 -07:00
Michael Wu
1cc0b6840d Bug 574120 - Add Android support to IPC code, r=cjones 2010-06-25 11:39:02 -07:00
Doug Turner
4719dd0705 Automerge w mozilla-central 2010-06-24 14:06:13 -07:00
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
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Doug Turner
3ad0032930 Merged with MC. Hand merged netwerk/protocol/http/src/nsHttpHandler.cpp
also removed modules/plugin/default*
2010-05-17 08:59:15 -07:00
Chris Jones
9327ed8dcc Merged m-c 2010-05-13 18:04:53 -05:00
Doug Turner
fe405e740c merge with m-c. resolved conflicts in:
U chrome/src/nsChromeRegistry.cpp
U content/base/src/Makefile.in
U dom/base/nsDOMClassInfo.cpp
U toolkit/toolkit-tiers.mk

--HG--
rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js
2010-05-11 11:09:54 -07:00
Benoit Girard
4fe7201af4 Bug 528146: Run plug-in code on the thread that starts in main(). r=cjones
--HG--
rename : dom/plugins/PluginThreadChild.cpp => dom/plugins/PluginProcessChild.cpp
rename : dom/plugins/PluginThreadChild.h => dom/plugins/PluginProcessChild.h
rename : ipc/ipdl/test/cxx/IPDLUnitTestThreadChild.cpp => ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.cpp
rename : ipc/ipdl/test/cxx/IPDLUnitTestThreadChild.h => ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.h
2010-05-10 23:18:00 -05:00
Chris Jones
41d4381920 Bug 565462: Implement operator== for IPDL structs and unions. r=bsmedberg 2010-05-22 14:35:42 -05:00
Chris Jones
8cd4f6e0b8 Tests for bug 560000 2010-05-22 14:35:40 -05:00
Chris Jones
0f31d5ef38 Bug 562741: Allow |Shmem|s to be shared across different protocol trees. r=bent 2010-05-22 14:35:33 -05:00
Chris Jones
e3145e0a2f Bug 562741: Refcount |SharedMemory|s. r=joedrew 2010-05-22 14:35:32 -05:00
Chris Jones
39eb188564 Bug 565844: Distinguish between illegal-value and couldn't-process errors in IPDL error messages. r=bent 2010-05-22 14:35:29 -05:00
Doug Turner
8f97a20153 Merge with m-c. no hand edits 2010-04-29 21:04:50 -07:00
Jim Mathies
67068143b5 Bug 558986 - detect and resolve races between MS-COM RPC and IPDL RPC by implementing IMessageFilter and processing pending IPDL RPC calls while waiting for MS-COM RPC responses. Original patch by bsmedberg, r=cjones/jimm/ehsan with followup fixes by Jim Mathies, r=bsmedberg
--HG--
extra : rebase_source : 214029d3188f8aa00948e0dcdc3c11cd279d1569
2010-05-21 11:48:34 -04:00
Jim Mathies
2a9af3f851 Bug 558986 - Backout of fix for crashes in TSF with Flash/Silverlight on tablets. CLOSED TREE 2010-05-17 14:36:43 -05:00
Benjamin Smedberg
e43e305194 Bug 558986 - Fix for crashes in TSF with Flash/Silverlight on tablets (OLE/COM nested event loops). r=cjones, jimm, ehsan. 2010-05-17 11:33:34 -05:00
Chris Jones
d53b8a18d0 Merged m-c 2010-04-27 01:53:06 -05:00
Chris Jones
4665be334c Bug 545733: |const|-ify some *Channel methods. r=bent 2010-04-27 00:42:59 -05:00
Chris Jones
ce3499a322 Bug 555275: Implement a DeallocShmem() interface. r=bent 2010-04-26 20:11:40 -05:00
Doug Turner
ed6494b616 merge with m-c. 2010-04-26 23:17:51 -07:00
Benjamin Smedberg
67995408eb Bug 561871 part B: don't use Windows events to enter/exit a nested event loop within an RPC stack frame, because delivery of those events isn't always associated with the correct stack frame, and also because the events can be lost if they race with an incoming RPC reply message. Instead, keep a linked list (on the stack) of RPC frames globally and per-channel, to associate requests to enter a nested event loop with the correct frame, r=jimm
--HG--
extra : rebase_source : 694186dde4643904752c67e0c6eb7a6ad1dd2082
2010-04-28 11:01:09 -04:00
Oleg Romashin
7a2ec023c4 Bug 553904 - Child tab process crashes on attempt to initialize child plugin process. r=bent.mozilla 2010-04-20 21:43:51 +03:00
Chris Jones
09869cfb77 Merge mozilla-central 2010-04-16 01:34:35 -05:00
Joe Drew ext:(%20and%20Chris%20Jones%20%3Cjones.chris.g%40gmail.com%3E)
8ed356359a Bug 548437: Add a SysV shmem subtype of SharedMemory. r=dougt 2010-04-16 00:29:16 -05:00
Josh Matthews
7354faf277 b=539406 retain existing listener in AyncChannel for GeckoChildProcessHost::OnChannelConnected r=cjones 2010-04-12 12:13:00 +12:00
Oleg Romashin
8de514e284 Merged with mozilla-central 2010-04-07 06:59:04 -04:00
Doug Turner
c15f159231 merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp. 2010-03-26 14:22:48 -07:00
Chris Jones
1adcc7f5e1 Bug 557011: Ensure OOP crashreporter has been initialized on mac. r=bsmedberg 2010-04-12 15:47:47 -05:00
Gavin Sharp
508e0b8635 Bug 552889: avoid spamming stderr in release builds, r=cjones 2010-05-06 15:17:08 -04:00
Jim Mathies
d70b2de416 Bug 545338 - RPCChannel should use events rather than thread messages for NotifyWokerThread. r=bent. 2010-03-25 16:53:10 -05:00
Chris Jones
e4aea6bfca Followup to bug 544936: Open child process handles with more privileges. r=bsmedberg 2010-03-24 19:12:31 -05:00
Chris Jones
06f32ffddd Bug 554262 - [OOPP] Silverlight context menu hangs the browser. r=bent, jmathies. 2010-03-24 16:49:54 -05:00