Kyle Huey
932ea79b49
Bug 522770: Link directly to object files instead of intermediate static libs. Patch originally written by Ted Mielczarek. Checking into a CLOSED TREE as a bustage fix. reviews pending.
...
--HG--
extra : rebase_source : 54a506a5815dcdedaf3f61ad7d6bdd0529d7f5f7
2010-08-01 01:48:21 -07:00
Robert Sayre
55a8586519
Merge mozilla-central to tracemonkey.
2010-07-27 13:09:04 -07:00
Robert Sayre
1b744a7685
Merge mozilla-central to tracemonkey.
2010-07-20 15:07:03 -07:00
Benoit Girard
5d68779104
Bug 557225 - Fix TryServer failures. r=cjones r=josh
2010-07-20 00:17:45 -04:00
Benoit Girard
d5759eca95
Bug 557225 - Load the plugin-container from the App Bundle. r=cjones
2010-07-19 18:35:45 -04:00
Blake Kaplan
de74d9d8f4
Bug 563106 - Tie XPConnect to compartments. r=jorendorff/gal/jst
2010-07-19 13:36:49 -07:00
Luke Wagner
99411cc93d
Bug 549143 - fatvals
2010-07-14 23:19:36 -07:00
Ted Mielczarek
0effa57b4a
bug 557225 - add a bundle for the plugin process to make it not show up in the dock
...
@@ -575,7 +575,7 @@
--HG--
rename : toolkit/mozapps/update/updater/macbuild/Contents/Info.plist => ipc/app/macbuild/Contents/Info.plist.in
rename : toolkit/mozapps/update/updater/macbuild/Contents/PkgInfo => ipc/app/macbuild/Contents/PkgInfo
rename : toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in => ipc/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
2010-06-11 08:28:03 -04:00
Chris Jones
d37c23f270
Bug 578262: Clean up style in and remove build warnings from new-ishly merged e10s code. r=bsmedberg
...
--HG--
rename : dom/ipc/ContentProcessChild.cpp => dom/ipc/ContentChild.cpp
rename : dom/ipc/ContentProcessChild.h => dom/ipc/ContentChild.h
rename : dom/ipc/ContentProcessParent.cpp => dom/ipc/ContentParent.cpp
rename : dom/ipc/ContentProcessParent.h => dom/ipc/ContentParent.h
rename : dom/ipc/ContentProcessProcess.cpp => dom/ipc/ContentProcess.cpp
rename : dom/ipc/ContentProcessProcess.h => dom/ipc/ContentProcess.h
rename : dom/ipc/PIFrameEmbedding.ipdl => dom/ipc/PBrowser.ipdl
rename : dom/ipc/PContentProcess.ipdl => dom/ipc/PContent.ipdl
2010-07-19 13:33: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
timeless@mozdev.org
d6f1639143
Bug 577456 warning: format not a string literal and no format arguments in GetLine
...
r=cjones
--HG--
extra : rebase_source : c3499b2ede5c0a4ebe0725e5e01d9813d6a17342
2010-07-08 13:34:40 +03:00
timeless@mozdev.org
8bfb404feb
Bug 555690 ThreadData::StartTracking should use #else. r=cjones
2010-07-13 11:56:47 -07: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
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
Ehsan Akhgari
cc3957ab41
Bug 580406 - [OOOP] plugin process should be properly named; r=benjamin approval2.0=beltzner
2010-07-21 11:55:51 -04:00
Benjamin Smedberg
0380ca87ed
Remove pieces of bug 557225 which depend on the incorrect @loader_path changes in bug 578751. This will probably allow plugin-container to launch, because DYLD_LIBRARY_PATH has been munged for it. a=johnath for pushing to a CLOSED TREE
2010-07-20 17:57:02 -04: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
63c0077443
Merge mozilla-central into the branch for bug 568691, including fixup of the new jetpack binary module.
2010-06-25 19:41:09 -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
Benjamin Smedberg
45af085fff
Merge mozilla-central into the "branch" for but 568691. The omnijar XPT/component/chrome registration was removed during this merge, and will be re-added to the component manager shortly.
...
--HG--
rename : content/base/public/nsIChromeRegistry.idl => chrome/public/nsIChromeRegistry.idl
2010-06-21 11:41:42 -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
40cced4588
merge
2010-06-30 21:09:47 -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
Chris Jones
3921e1219b
Bug 575918: Temporarily disable OOP xpcshell on OS X because it's completely broken. r=bsmedberg
2010-06-30 17:53:51 -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
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
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
7bce0acffc
Fix windows build after bug 574120 1727bfc11147
2010-06-25 13:03:48 -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
Doug Turner
efbab3368a
Bug 570945 - Qt is not compiling. r=me. Slightly modifed based on chris.jones comments
2010-06-09 16:02:38 -07: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
Oleg Romashin
b36fb69349
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04: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
2877589e40
Merge missed nsChromeRegistry change from m-c and fix busted content-process XPCOM/chromium event loop.
2010-05-14 01:41:14 -05: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