Commit Graph

518 Commits

Author SHA1 Message Date
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
Steffen Imhof
87bfa9832b Bug 567066 - Keep Qt related command line parameters during restart. r=dtownsend
--HG--
extra : rebase_source : 875da9f999311031ea266b8b9ce26c6251f056e8
2010-07-17 09:52:23 +03:00
Josh Aas
5759fdff07 Backed out changeset f6c93f02146c, bug 571193. 2010-07-16 20:31:24 -04:00
Josh Aas
6a6d3c8ee5 Bug 571193. Move Mac OS X to UNIX filesystem code shared with Linux. Also fixes bug 506812, bug 528447, bug 530188. r=benwa sr=bsmedberg CLOSED TREE 2010-07-16 18:35:59 -04:00
Dave Townsend
fbd07113b1 Bug 376553: Don't restart during startup affor extension and app changes. r=robstring, r=bsmedberg 2010-07-14 10:13:26 -07:00
Neil Rashbrook
3ab5e497d0 Bug 568691 Further followup to actually register static components r=bsmedberg 2010-07-13 15:24:58 +01:00
Benedict Hsieh
94b9e463dd Bug 531886 - [regression] *.mfasl fastload caches not invalidated after build / changing XUL/JS code. r=bsmedberg 2010-07-02 16:59:17 -07:00
Benjamin Smedberg
76af4cae87 Fix --disable-libxul from bug 568691. r=Mossop 2010-07-02 14:23:41 -04:00
Benjamin Smedberg
d6805bcab6 Bug 576492 - Load default preferences from extension defaults, r=Mossop 2010-07-02 12:45:20 -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
79be6b8325 Rename XRE_AddComponentLocation to XRE_AddManifestLocation to better-convey what it actually does now (it still auto-registers XPT files when passed a directory, but we may get rid of that as well and just fold those into components.manifest), as noted in bug 568691 comment 58. 2010-06-27 21:26:38 -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
Benjamin Smedberg
87b751cfc8 Bug 568691 - Register extension components/chrome again. This doesn't remove the EM restart yet, because there's some weirdness about reading default prefs from extensions that needs to be solved first. 2010-06-23 12:18:32 -04:00
Benjamin Smedberg
4588c2f4bf Fix --disable-crashreporter build in nsAppRunner.cpp 2010-06-22 20:18:45 -04:00
Benjamin Smedberg
38b1ff6d7b Fix crash running leaktest --register because nNativeAppSupport hasn't been set yet. 2010-06-22 20:11:32 -04:00
Benjamin Smedberg
ed3a49c9a2 Address review comments from bug 568691 comment 13/14/17:
* rename mozilla::Module struct entries to be clearer
* change Module documentation so that the last entry is { NULL } in all cases (the compiler will 0-expand the structure)
* remove NS_XPCOM_COMPONENT_REGISTRY_FILE
* add MOZ_MEDIA/MOZ_OGG/MOZ_WAVE/MOZ_WEBM ifdefs to nsHTMLMediaElement.h and nsContentUtils.cpp
2010-06-21 12:46:26 -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
Benedict Hsieh
9ae1b68f3b Bug 573092: Fix a startup crash when the extension manager is unavailable. r=dtownsend 2010-06-22 10:23:01 -07:00
Chris Jones
bf91852da6 Bug 572295: Add X11Util.h for X11 toolkits. r=karlt,joedrew 2010-06-21 15:35:49 -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
Benjamin Smedberg
c020d3bdef Bug 570488 - Remove xpti.dat caching which harms us in runtime and code complexity 2010-06-10 12:51:29 -04:00
Jason Duell
c3574973c1 Add a missing 'break' that caused assertion for e10s tree at startup. r=cjones 2010-06-29 00:08:35 -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
Jason Duell
1b0fefc8aa Merged again from m-c to get latest bits and avoid deleted branch issue. 2010-06-22 17:57:09 -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
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
e4786c8d43 Followup to bug 528146 for dom/ipc, and revert chome registry merge.
--HG--
rename : dom/ipc/ContentProcessThread.cpp => dom/ipc/ContentProcessProcess.cpp
rename : dom/ipc/ContentProcessThread.h => dom/ipc/ContentProcessProcess.h
2010-05-13 18:44:53 -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
Doug Turner
8f97a20153 Merge with m-c. no hand edits 2010-04-29 21:04:50 -07:00
Mike Hommey
924b226213 Bug 368477 - Set $HOME with data from getpwuid if $HOME is not set. [r=benjamin]
--HG--
extra : rebase_source : eada90f268f55842d556a18a76845e944f1a553c
2010-04-29 07:19:50 +00:00
Michael Wu
a7bab5285a Bug 552121 - Add omnijar API [2/7], r=bsmedberg 2010-05-21 10:58:32 -07:00
Ehsan Akhgari
a87b134220 Bug 560647 - add startup timeline instrumentation; r=vlad 2010-05-19 19:22:19 -04:00
Michael Wu
f7ea7a8b12 Bug 565142 - Support startup on Android, patch by vlad, blassey, alexp, and me. r=dougt
--HG--
extra : rebase_source : 1153c0a4fb1d73f29d8c9da78c66bf4bf21b8142
2010-06-03 18:16:20 -07:00
Mark Finkle
0204aa7bde Bug 232691 - replace nsString() nsAutoString() and friends with EmptyC?String() (Maemo only bustage fix) [r=bz] 2010-05-18 13:41:42 -04:00
Edmund Wong
3f9353b789 Bug 232691 - replace nsString() nsAutoString() and friends with EmptyC?String(). r=jonas 2010-05-18 09:50:14 +02:00
Jesse Ruderman
f04ef428cb Remove stray line breaks from NS_ERROR messages, since they interfere with log processing. rs=jst
--HG--
extra : rebase_source : 87421691da969e0ebe5fbfbc44cd8f18617d1351
2010-06-17 13:28:38 -07:00
Chris Jones
d53b8a18d0 Merged m-c 2010-04-27 01:53:06 -05:00
Doug Turner
ed6494b616 merge with m-c. 2010-04-26 23:17:51 -07:00
Vladimir Vukicevic
e3731a1e45 b=560647; basic start-to-end startup instrumentation and some fixes; r=bz a=coop 2010-04-26 11:13:03 -07:00
Doug Turner
b6a5b5d71c Bug 561831 - Build bustage on qt in toolkit/xre. r=ted
--HG--
extra : rebase_source : 539baef0937ade25ced67b33efc2f474cbbb1fa7
2010-04-28 13:33:14 -07:00
Oleg Romashin
87c511839e Merged with mozilla-central 2010-04-22 20:22:26 -04: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