Commit Graph

294 Commits

Author SHA1 Message Date
Chris Jones
ee72f210ea Merge m-c --> cedar 2010-09-13 19:24:09 -05:00
Oleg Romashin
497f2db326 Merge with mozilla central 2779c55431a4, no conflicts 2010-09-10 22:32:25 -07:00
Chris Jones
4820da2166 Merge m-c --> cedar 2010-09-08 17:25:30 -05:00
Chris Jones
9454ae60b8 Bug 592866: Allow Shmem to be used in IPDL unions. r=bent a=blocking-2.0 2010-09-08 13:27:52 -05:00
Doug Turner
4c4c8dfdd9 Bug 594261 - IPC part - Factor out geolocation prompt into something that can be reused. r=chris jones, a=stuart
--HG--
rename : dom/src/geolocation/PGeolocationRequest.ipdl => dom/ipc/PContentPermissionRequest.ipdl
extra : rebase_source : 73f75b6f4c4deae71337dd2a9925d15aefcaacb8
2010-09-09 22:00:08 -07:00
Benoit Girard
4fd9b06f6c Bug 589371 - Prevent FatalError from being inlined for better error reporting. r=josh a2.0=blocking2.0:betaN 2010-09-11 10:03:29 -07:00
Oleg Romashin
7ff38c48b1 Merge m-c: 09872e2e2130 -> cedar, (qt build bustage fix) 2010-09-01 12:07:19 -07:00
Chris Jones
078e84688f Test for bug 592002. a=test 2010-09-01 13:01:50 -05:00
Chris Jones
07e1a3fd87 Bug 570620, part n: Hook layout/ipc into the build system, and integrate PRenderFrame into the PBrowser family. sr=bsmedberg 2010-08-20 18:24:41 -05:00
Chris Jones
ac0063f9b0 Bug 540097: Add a ProcessingError(what) notification interface for top-level actors. r=bent 2010-08-20 18:24:40 -05:00
Brian Crowder
5ff434c249 Bug 562444 - e10s: fix external app handler code to enable download manager and others over IPC, r=dwitte, sr=biesi, blocking-fennec2.0a1=mfinkle 2010-08-17 20:19:24 -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
Benjamin Smedberg
d2b5f1a5d7 But 578821 - Give jetpacks a way to mark a handle as unrooted, so that it can live as long as client code holds it alive without having to be explicitly deleted, and give the other side the ability to see handle deletion, r=bent/atul/cjones 2010-07-27 16:18:08 -04:00
Chris Jones
215c42366a Bug 581930: Add an async "spam test" and make output more readable. r=NPOTB (alas!) 2010-08-05 17:11:23 -05:00
Chris Jones
9de8956b51 Bug 575110: Fix C++ IPDL test build failure on windows. r=NPOTB (alas!) 2010-08-05 17:11:23 -05:00
Chris Jones
5277f4315f Bug 570294, part d: IPC protocol for Layers. r=jrmuizel sr=vlad
--HG--
extra : rebase_source : dba7175f08f4fe6df93f2a66622dc3780a1890ed
2010-07-21 16:17:33 -05:00
Chris Jones
4500eb81e9 Bug 525181, part 3: Turn on "soft" state checking, NS_WARNING()ing on bad transitions. Fix tests. r=bent 2010-07-15 14:27:43 -05:00
Chris Jones
dce4511b26 Bug 525181, part 2: Implement protocol state machines in C++. r=bent 2010-07-15 14:27:43 -05:00
Chris Jones
bb1ac58a3c Bug 525181, part 1: Fix up the stub C++ implementation of protocol states in actor classes. Add a special Null state that only transitions to -->Null and -->Dead for stateless protocols. r=bent 2010-07-15 14:27:43 -05:00
Doug Turner
901e02b2de Merging with mozilla-central. Manually merged: content/canvas/src/nsCanvasRenderingContext2D.cpp ipc/ipdl/Makefile.in toolkit/toolkit-tiers.mk toolkit/xre/nsEmbedFunctions.cpp
--HG--
rename : gfx/thebes/src/gfxSharedImageSurface.cpp => gfx/thebes/gfxSharedImageSurface.cpp
rename : gfx/thebes/public/gfxSharedImageSurface.h => gfx/thebes/gfxSharedImageSurface.h
2010-06-28 16:33:19 -07:00
Doug Turner
4719dd0705 Automerge w mozilla-central 2010-06-24 14:06:13 -07:00
Chris Jones
710c313ec5 Bug 570099: Allow Shmems to be used in IPDL structs. r=benjamn 2010-06-23 13:59:07 -05: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
Chris Jones
a6258b9dae Bug 570096: Implement serialization of a grab-bag of gfx types. r=joe 2010-06-21 15:35:48 -05:00
Doug Turner
be96d6cdaf Fixup to http after the necko-file-move
--HG--
rename : netwerk/protocol/http/src/HttpBaseChannel.cpp => netwerk/protocol/http/HttpBaseChannel.cpp
rename : netwerk/protocol/http/src/HttpBaseChannel.h => netwerk/protocol/http/HttpBaseChannel.h
rename : netwerk/protocol/http/src/HttpChannelChild.cpp => netwerk/protocol/http/HttpChannelChild.cpp
rename : netwerk/protocol/http/src/HttpChannelChild.h => netwerk/protocol/http/HttpChannelChild.h
rename : netwerk/protocol/http/src/HttpChannelParent.cpp => netwerk/protocol/http/HttpChannelParent.cpp
rename : netwerk/protocol/http/src/HttpChannelParent.h => netwerk/protocol/http/HttpChannelParent.h
rename : netwerk/protocol/http/src/PHttpChannel.ipdl => netwerk/protocol/http/PHttpChannel.ipdl
rename : netwerk/protocol/http/src/PHttpChannelParams.h => netwerk/protocol/http/PHttpChannelParams.h
rename : netwerk/protocol/http/src/ipdl.mk => netwerk/protocol/http/ipdl.mk
2010-06-07 14:40:08 -07:00
Doug Turner
cee802814f Moving cookie ipc source to the right place. 2010-06-07 14:19:20 -07:00
Doug Turner
ded51c1c5f Merging with M-C.
Hand merged the following files:

U chrome/src/nsChromeRegistry.cpp
U chrome/src/nsChromeRegistry.h
U content/base/src/nsFrameLoader.cpp
U content/base/src/nsFrameLoader.h
U dom/src/geolocation/nsGeolocation.cpp
U dom/src/geolocation/nsGeolocation.h
U netwerk/build/Makefile.in
U netwerk/cookie/nsCookieService.cpp
U netwerk/cookie/nsCookieService.h

--HG--
rename : extensions/cookie/test/unit/test_cookies.js => extensions/cookie/test/unit/test_cookies_thirdparty.js
rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp
rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h
rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h
rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h
rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp
rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h
rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp
rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h
rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h
rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h
rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h
2010-06-07 13:38:02 -07:00
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Chris Jones
9327ed8dcc Merged m-c 2010-05-13 18:04:53 -05:00
Chris Jones
07a9bff462 No bug: Reduce IPDL-compiler spew and stop logging to stderr. irc-r=bsmedberg 2010-05-13 17:25:20 -05:00
Doug Turner
74337a6b6a Bug 552822 - IPC remoting of geolocation prompt. r=olli/r=jdm 2010-05-13 10:44:51 -07:00
Ben Newman
9b5dc10c32 Bug 565078 - Move js/src/ipc to js/ipc. r=bsmedberg
--HG--
rename : js/src/ipc/CPOWTypes.h => js/ipc/CPOWTypes.h
rename : js/src/ipc/ContextWrapperChild.h => js/ipc/ContextWrapperChild.h
rename : js/src/ipc/ContextWrapperParent.h => js/ipc/ContextWrapperParent.h
rename : js/src/ipc/Makefile.in => js/ipc/Makefile.in
rename : js/src/ipc/ObjectWrapperChild.cpp => js/ipc/ObjectWrapperChild.cpp
rename : js/src/ipc/ObjectWrapperChild.h => js/ipc/ObjectWrapperChild.h
rename : js/src/ipc/ObjectWrapperParent.cpp => js/ipc/ObjectWrapperParent.cpp
rename : js/src/ipc/ObjectWrapperParent.h => js/ipc/ObjectWrapperParent.h
rename : js/src/ipc/PContextWrapper.ipdl => js/ipc/PContextWrapper.ipdl
rename : js/src/ipc/PObjectWrapper.ipdl => js/ipc/PObjectWrapper.ipdl
rename : js/src/ipc/ipdl.mk => js/ipc/ipdl.mk
rename : js/src/ipc/jar.mn => js/ipc/jar.mn
rename : js/src/ipc/tests/Makefile.in => js/ipc/tests/Makefile.in
rename : js/src/ipc/tests/adhoc/child.html => js/ipc/tests/adhoc/child.html
rename : js/src/ipc/tests/adhoc/test.xul => js/ipc/tests/adhoc/test.xul
rename : js/src/ipc/tests/unit/cpow_child.js => js/ipc/tests/unit/cpow_child.js
rename : js/src/ipc/tests/unit/test_cpow.js => js/ipc/tests/unit/test_cpow.js
2010-05-11 10:44:42 -07: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
a647aa0990 Bug 560000: Allow IPDL unions and structs to be recursively defined. r=benjamn 2010-05-22 14:35:38 -05:00
Chris Jones
6bb717f964 Tests for bug 553846.
--HG--
rename : ipc/ipdl/test/cxx/PTestArrays.ipdl => ipc/ipdl/test/cxx/PTestDataStructures.ipdl
rename : ipc/ipdl/test/cxx/PTestArraysSub.ipdl => ipc/ipdl/test/cxx/PTestDataStructuresSub.ipdl
rename : ipc/ipdl/test/cxx/TestArrays.cpp => ipc/ipdl/test/cxx/TestDataStructures.cpp
rename : ipc/ipdl/test/cxx/TestArrays.h => ipc/ipdl/test/cxx/TestDataStructures.h
2010-05-22 14:35:37 -05:00
Chris Jones
de3a2d743f Bug 553846: Implement an IPDL "struct" type. r=benjamn 2010-05-22 14:35:35 -05:00
Chris Jones
f196c3f8dd Bug 522547: Serialize/deserialize IPC messages in a "streaming" style. r=bent 2010-05-22 14:35:34 -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
eef3841654 Bug 564086: Frontend support for IPDL process graphs and Bridge()ing processes. r=benjamn 2010-05-22 14:35:31 -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
Mike Hommey
bbd7d47d17 Bug 561971 - Cleanup ipdl generated code and compiled python on make clean [r=benjamin]
--HG--
extra : rebase_source : d4ab3ddde23f3b98521756f8362376fef6b76764
2010-04-29 07:21:14 +00: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
24be06f9cd Followup to bug 559898: fix cycle checker to allow self-loop special case. 2010-04-27 02:12:39 -05:00
Chris Jones
bb21ef7d89 Followup to bug 541131: update |include protocol "PFoo.ipdl"| usages in e10s. 2010-04-27 02:12:38 -05:00