Commit Graph

636 Commits

Author SHA1 Message Date
Doug Turner
9c89be497e Automerge w mozilla-central 2010-06-24 14:06:13 -07:00
Chris Jones
2d2a5f4b25 Bug 570099: Allow Shmems to be used in IPDL structs. r=benjamn 2010-06-23 13:59:07 -05:00
Benjamin Smedberg
dd8b532430 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
Jason Duell
386a098a89 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
ac67f4dbc4 Bug 570096: Implement serialization of a grab-bag of gfx types. r=joe 2010-06-21 15:35:48 -05:00
Doug Turner
7d42fba019 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
8951d536c0 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
4fa7fe3460 Moving cookie ipc source to the right place. 2010-06-07 14:19:20 -07:00
Doug Turner
b2c88178e3 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
2538039097 Merge with latest mozilla central r 42802:ffbc3baf03ae 2010-05-25 15:19:33 -04:00
Olli Pettay
93984b6736 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Doug Turner
cfd298a40d 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
cb5eb283e4 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
2ed40cd772 Merged m-c 2010-05-13 18:04:53 -05:00
Chris Jones
58222a942d No bug: Reduce IPDL-compiler spew and stop logging to stderr. irc-r=bsmedberg 2010-05-13 17:25:20 -05:00
Doug Turner
1aca4c8153 Bug 552822 - IPC remoting of geolocation prompt. r=olli/r=jdm 2010-05-13 10:44:51 -07:00
Ben Newman
293a2d1b82 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
0dc0f3273e 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
94d6258a5b 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
ba8e10bb5d Bug 565462: Implement operator== for IPDL structs and unions. r=bsmedberg 2010-05-22 14:35:42 -05:00
Chris Jones
3736c87ff8 Tests for bug 560000 2010-05-22 14:35:40 -05:00
Chris Jones
81dfc13752 Bug 560000: Allow IPDL unions and structs to be recursively defined. r=benjamn 2010-05-22 14:35:38 -05:00
Chris Jones
ca7af8ea8c 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
6407922744 Bug 553846: Implement an IPDL "struct" type. r=benjamn 2010-05-22 14:35:35 -05:00
Chris Jones
e0a14f18fc Bug 522547: Serialize/deserialize IPC messages in a "streaming" style. r=bent 2010-05-22 14:35:34 -05:00
Chris Jones
03b01c916d Bug 562741: Allow |Shmem|s to be shared across different protocol trees. r=bent 2010-05-22 14:35:33 -05:00
Chris Jones
e3a04f9359 Bug 562741: Refcount |SharedMemory|s. r=joedrew 2010-05-22 14:35:32 -05:00
Chris Jones
9751148c41 Bug 564086: Frontend support for IPDL process graphs and Bridge()ing processes. r=benjamn 2010-05-22 14:35:31 -05:00
Chris Jones
5be467f10e 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
Chris Jones
e7c13aeb2d Bug 563747: Allow building ipc/chromium on PPC, enable MOZ_IPC for mac/ppc. r=bsmedberg 2010-05-04 19:22:34 -05:00
Doug Turner
c88906d971 Merge with m-c. no hand edits 2010-04-29 21:04:50 -07:00
Mike Hommey
92506b7f9a 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
0879ff6221 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
Masatoshi Kimura
db541da182 Bug 567497 - "Files executed via download manager cause Win7 compatibility mode to permanently apply to firefox.exe and not downloaded file" [r=ted]
(transplanted from 63b89b3114614929b80a358163a2d1ae9feea91b)

--HG--
extra : transplant_source : c%B8%9B1%14aI%29%B8%0A5%81c%A2%D1%AE%9F%EE%A9%1B
2010-05-24 09:55:00 -04:00
Chris Jones
9e8fb2c03a 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
e9cf1d1dad 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
695ab55828 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
a945d618e9 Followup to bug 559898: fix cycle checker to allow self-loop special case. 2010-04-27 02:12:39 -05:00
Chris Jones
574b849ecd Followup to bug 541131: update |include protocol "PFoo.ipdl"| usages in e10s. 2010-04-27 02:12:38 -05:00
Chris Jones
bd6bf48e7a Merged m-c 2010-04-27 01:53:06 -05:00
Chris Jones
cc52e0aa86 Bug 518881: Fix unused-result warnings in IPDL/C++ unit tests. 2010-04-27 00:43:01 -05:00
Chris Jones
168d0459ca Bug 518881: Make Send/Call*() methods for IPDL parent actors warn_unused_result. r=bent 2010-04-27 00:43:00 -05:00
Chris Jones
a2d53e0f5e Bug 545733: |const|-ify some *Channel methods. r=bent 2010-04-27 00:42:59 -05:00
Chris Jones
43db547c0a Bug 559898: Allow (sub-)protocols to manage themselves. r=bsmedberg 2010-04-26 20:11:48 -05:00
Chris Jones
821e840e3b Bug 559953: Add a |const nsTArray<Subactor*>& ManagedFoo();| accessor. r=bent 2010-04-26 20:11:47 -05:00
Thomas Lee
f562dffa71 Bug 541131: Include IPDL headers as |include protocol PFoo;|. r=cjones 2010-04-26 20:11:46 -05:00
Chris Jones
14a0306954 Bug 554244: Get the right loc info for message declarations. r=bent 2010-04-26 20:11:44 -05:00
Chris Jones
b95a8efccc Bug 555276: Top-level protocols should handle shmem messages if any subprotocol uses it. r=bent 2010-04-26 20:11:43 -05:00
Chris Jones
403eae2c27 Bug 555275: Clean up shared memory segments when the top-level actor dies. r=bent 2010-04-26 20:11:42 -05:00
Chris Jones
c2273182da Bug 555275: Implement a DeallocShmem() interface. r=bent 2010-04-26 20:11:40 -05:00