Граф коммитов

663 Коммитов

Автор SHA1 Сообщение Дата
Chris Jones ebaad53cfe 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 0870f7f1c1 Bug 525181, part 2: Implement protocol state machines in C++. r=bent 2010-07-15 14:27:43 -05:00
Chris Jones aee77be857 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 0c9649a871 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 604c8de576 Bug 555690 ThreadData::StartTracking should use #else. r=cjones 2010-07-13 11:56:47 -07:00
timeless@mozdev.org 7e1a8cac9e 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 88b1dca8bc 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 dfed11844b Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg b54a384bb8 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 f56445a420 Merge mozilla-central into the static-xpcom-registration branch. 2010-06-23 17:26:25 -04:00
Chris Jones 70b14142fc Bug 570099: Allow Shmems to be used in IPDL structs. r=benjamn 2010-06-23 13:59:07 -05:00
Benjamin Smedberg 9dfb495463 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 cae1800556 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 374277e489 Bug 570096: Implement serialization of a grab-bag of gfx types. r=joe 2010-06-21 15:35:48 -05:00
Benjamin Smedberg 4d7e3ff7df 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 f51e70def2 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 4d4c880191 merge 2010-06-30 21:09:47 -05:00
Jim Mathies 993f078977 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 72ae9fb347 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 83708ad128 Bug 569500 - e10s: /netwerk/test/unit_ipc/* fails on windows 7 r=bsmedberg 2010-06-30 15:51:44 -07:00
Doug Turner c7c3407599 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 6ce8eb93c9 Bug 574120 - Add support for IPC on Android to everything else, r=dougt 2010-06-25 13:29:43 -07:00
Michael Wu bce4cb589c Fix windows build after bug 574120 1727bfc11147 2010-06-25 13:03:48 -07:00
Michael Wu ce5dbc8e97 Bug 574120 - Add Android support to IPC code, r=cjones 2010-06-25 11:39:02 -07:00
Doug Turner c1b97654d7 Automerge w mozilla-central 2010-06-24 14:06:13 -07:00
Jason Duell 549ae22a9e 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 611fabe87f 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 217acab227 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 7f7c2c6b10 Moving cookie ipc source to the right place. 2010-06-07 14:19:20 -07:00
Doug Turner 6e5944e4fe 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 91d5a62423 Merge with latest mozilla central r 42802:ffbc3baf03ae 2010-05-25 15:19:33 -04:00
Olli Pettay 3fed591ba3 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Doug Turner 6f853bbfda 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 93323859a7 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 fea6936df1 Merged m-c 2010-05-13 18:04:53 -05:00
Chris Jones 0b2a3d2985 No bug: Reduce IPDL-compiler spew and stop logging to stderr. irc-r=bsmedberg 2010-05-13 17:25:20 -05:00
Doug Turner b2b1085458 Bug 552822 - IPC remoting of geolocation prompt. r=olli/r=jdm 2010-05-13 10:44:51 -07:00
Ben Newman 14294cc97f 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 7492065872 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 7c3b2bbde3 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 9a9c6b5800 Bug 565462: Implement operator== for IPDL structs and unions. r=bsmedberg 2010-05-22 14:35:42 -05:00
Chris Jones 7b752496f2 Tests for bug 560000 2010-05-22 14:35:40 -05:00
Chris Jones 91c7c512cc Bug 560000: Allow IPDL unions and structs to be recursively defined. r=benjamn 2010-05-22 14:35:38 -05:00
Chris Jones 5a179e6412 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 3e08fa01c3 Bug 553846: Implement an IPDL "struct" type. r=benjamn 2010-05-22 14:35:35 -05:00
Chris Jones 34baacd79e Bug 522547: Serialize/deserialize IPC messages in a "streaming" style. r=bent 2010-05-22 14:35:34 -05:00
Chris Jones 2c7ffd5131 Bug 562741: Allow |Shmem|s to be shared across different protocol trees. r=bent 2010-05-22 14:35:33 -05:00
Chris Jones 834a27d892 Bug 562741: Refcount |SharedMemory|s. r=joedrew 2010-05-22 14:35:32 -05:00
Chris Jones c55a427970 Bug 564086: Frontend support for IPDL process graphs and Bridge()ing processes. r=benjamn 2010-05-22 14:35:31 -05:00
Chris Jones e530ee8961 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