Commit Graph

110 Commits

Author SHA1 Message Date
timeless@mozdev.org
8bfb404feb Bug 555690 ThreadData::StartTracking should use #else. r=cjones 2010-07-13 11:56:47 -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
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
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
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
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
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
cd133a7a10 Bug 563747: Allow building ipc/chromium on PPC, enable MOZ_IPC for mac/ppc. r=bsmedberg 2010-05-04 19:22:34 -05: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
Chris Jones
84a3655756 Bug 551071: Suppress valgrind-reported "mismatched free()" (false alarm) of chromium objects by using mozalloc there (complements STL wrappers). Add a gross hack to prevent mozalloc macros from conflicting with methods in jscntxt.h. r=bent r=bsmedberg dependent-r=brendan 2010-06-04 18:16:34 -05: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
660b8c799c Bug 555275: Clean up shared memory segments when the top-level actor dies. r=bent 2010-04-26 20:11:42 -05: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
Doug Turner
6c196f14e2 Automerge with mc. no manual changes 2010-04-21 03:31:13 -07:00
Mike Hommey
f950f70917 Bug 558789 - Allow to build against system libevent [r=benjamin, r=cjones]
--HG--
extra : rebase_source : cd964ba40277ebd89dda8392c8a842ca9ef01bf8
2010-04-20 09:06:55 +02:00
Chris Jones
09869cfb77 Merge mozilla-central 2010-04-16 01:34:35 -05:00
Jonathan Kew
5e4a15e897 bug 558489 - prevent cocoa object autorelease-leakage during ipc startup. r=josh 2010-04-15 09:31:10 +01:00
Josh Matthews
7354faf277 b=539406 retain existing listener in AyncChannel for GeckoChildProcessHost::OnChannelConnected r=cjones 2010-04-12 12:13:00 +12:00
Jim Mathies
bee34d930e Bug 558503 - [OOPP] Watching netflix video: Silverlight crashes the plugin helper. r=bsmedberg. 2010-04-12 15:25:57 -05:00
Doug Turner
24bc0a9a66 Bug 570945 - Qt is not compiling. r=me. Slightly modifed based on chris.jones comments 2010-06-09 16:02:38 -07:00
Dão Gottwald
ae2f7ccc8b Backed out changeset 48e202424e35 2010-05-13 18:26:36 +02:00
Martin Stránský
a28426a5cb Bug 562029 - ipc fails to build with gcc version 4.1.2. r=chris.jones 2010-05-13 17:38:19 +02:00
Oleg Romashin
b2716147b6 Bug 562285 - Rewrite gfxSharedImageSurface class to be compatible with IPC Shmem.r=jones.chris.g, sr=vladimir
--HG--
extra : rebase_source : 245e4c8ee52856bcf8900a049132b9f5b4a53bbb
2010-05-13 11:52:59 -04:00
Mike Hommey
ce41784187 Bug 542460 - Remove executable permission on source files [r=ted.mielczarek] 2010-05-06 09:32:50 +02:00
Mike Hommey
0e0b16f3aa Bug 563294 - Include memory.h instead of memory to avoid failure to build in gcc C++0x mode [r=benjamin] 2010-05-06 09:16:54 +02:00
Chris Jones
def07f1688 Bug 563747: Allow building ipc/chromium on PPC, enable MOZ_IPC for mac/ppc. r=bsmedberg 2010-05-05 16:35:09 -05:00
Kai Engert
d754f0faf2 Bug 560615, XPCOM fails to build because of incorrect IPC code
r=jones.chris.g
2010-05-03 13:35:19 +02:00
Ben Turner
75ca06acb6 Bug 521118 - '[OOPP] Need NPAPI threadsafety checks in plugin process'. r=cjones, a=dbaron for CLOSED TREE 2010-03-24 12:30:45 -07:00
Oleg Romashin
a793154807 Bug 564997 - _state is not initialized in QT-MessagePumpForUI ctor. r=dougt
--HG--
extra : rebase_source : 07e186531ad8b4d3bd71778d2a0b3d613b8ddc17
2010-05-12 05:46:33 -04:00
Oleg Romashin
494639846e Bug 553904 - Child tab process crashes on attempt to initialize child plugin process. r=bent.mozilla
--HG--
extra : rebase_source : 2a018b5f9c74a713e493643e611b330e08e1afd8
2010-04-20 21:43:51 +03:00
Martin Stránský
1507192afe Make ipc/ build with gcc 4.1.2. r=cjones 2010-05-24 09:36:49 +12:00
Chris Jones
8a134203f8 Bug 542053: Set LD_LIBRARY_PATH=[GRE dir] for mozilla-runtime on linux. r=bsmedberg 2010-04-09 15:03:08 -05:00
Dan Witte
7a710d8ca6 Bug 562198: Namespace NSS & NSPR functions in ipc/chromium code, to avoid stomping on their Mozilla counterparts. r=bsmedberg 2010-06-11 11:03:07 -07:00
Chris Jones
bc14ef93fa Bug 533055: Part 1: Add a name field to IPC::Message. r=bent 2010-03-18 17:52:29 -05:00
Josh Aas
50805865c7 Update Mac OS X message pump code for child processes. b=552878 rs=cjones 2010-03-17 20:10:42 -04:00
Josh Aas
09fc21cbeb Allow Gecko to build and run on Mac OS X with MOZ_IPC defined. b=552862 r=cjones 2010-03-17 14:38:28 -04:00
Oleg Romashin
f38368aba9 Bug 544190 - QCore version needed to replace message_pump_glib.cc. r=dougt 2010-02-18 23:48:50 +02:00
Chris Jones
cc5715ebf9 Bug 544882, bug 545312: Only tell glib that work is pending if there has been a pollin or timer expiration. Merged from chromium latest, r=chromium
--HG--
extra : transplant_source : %E5%C0%3E%24%FEXX%FC%9A%1C%F4%93Pc%05%0AH%91%A1%F7
2010-02-10 22:04:56 -06:00
Jim Mathies
c877b84ecc Bug 538918 - [OOPP] Modal system dialogs cause UI freeze w/windowless controls. r=bent, cjones.
--HG--
extra : transplant_source : %28B%08h%F29L%BE%BBEh%E8%92%22%2A%8E%A8%00F%83
2010-02-09 16:34:38 -06:00
Benjamin Smedberg
30bd4e4e51 Bug 516515 - Don't initialize XPCOM in plugin processes, r=cjones
--HG--
extra : rebase_source : cab356b862a66fb7f5955b1f936944f2395bba3c
2010-02-03 17:17:09 -05:00
Oleg Romashin
959dec8b52 Bug 534644 - e10s: implement Qt ipc/chromium backend, part 2. r=benjamin. 2010-01-29 08:50:44 +02:00
Oleg Romashin
2d419b5929 Bug 534644 - implement Qt ipc/chromium backend, first part. r=benjamin, r=jones.chris.g 2010-01-28 07:22:41 +02:00