Commit Graph

177 Commits

Author SHA1 Message Date
Robert O'Callahan
b096738cb6 Fix for bug 466157 (Enable dumping of cycle-collector graphs in any build). r=dbaron, a=jst.
--HG--
extra : rebase_source : b47d149434c735981a9a80ae6016624120fee371
2010-08-12 12:03:23 +12:00
Michael Wu
4eff31a667 Bug 533038 - 1. Generalize manifest reading code and add api for reading manifests from jars, r=bsmedberg a=blocking-beta6 2010-09-08 20:37:11 -07:00
bhsieh@mozilla.com
fba716bbcd bug 520309, startupcache core r=dwitte sr=bsmedberg a=bsmedberg 2010-08-12 12:37:44 -07:00
Michael Wu
608574db24 Bug 556644 - 1. Move omnijar setup to NS_InitXPCOM and use omni.jar by default, r=bsmedberg a=blocking2.0 2010-08-10 15:08:06 -07:00
Wan-Teh Chang
c415ddd0a4 Bug 561510: fix unrecognized option /L... linker warning on
Windows.  Define MOZALLOC_LIB using EXPAND_LIBNAME_PATH instead
of EXPAND_MOZLIBNAME.  r=bsmedberg,ginn.chen.  approval2.0+ by
bsmedberg.
2010-08-06 06:51:38 -07:00
Benjamin Stover
e4051ec461 Bug 556400 - Add visits Asynchronously. r=mak r=sdwilsh sr=bz 2010-07-13 18:00:33 -07:00
Dave Townsend
f1d4bafdbd Backed out changeset f9a700607b86 from bug556400 due to possible browser-chrome failures.
--HG--
extra : transplant_source : %AC%2C%060%A3Shzk%F0%19i%87%AB%D8%87%B8%5E%80%A6
2010-07-02 20:01:44 -07:00
Mitchell Field
eb1e793da7 Remove @status FROZEN and @status UNDER_REVIEW. r=bsmedberg
--HG--
extra : rebase_source : 7fab31a6b7898e05ff828482390846cc9ce2854d
2010-07-02 10:27:06 -04:00
Benjamin Stover
97eb3d6fee Bug 556400 - Make adding visits asynchronous. r=sdwilsh r=mak sr=bz 2010-06-30 16:08:28 -07: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
9cadd0fe5f Fix contracts which were not registered correctly: nsPlacesAutoComplete.js was completely missing, and the nsINIParserFactory contract was missing. Fixes test_pref_interval.js to register/unregister its mock objects correctly. 2010-06-25 22:17:31 -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
4a738917da Bug 568691 - Move cycle collection earlier: XPConnect is initialized during component manager initialization and tries to register a CC language helper. 2010-06-22 12:59:57 -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
Benjamin Smedberg
492155b10e Bug 568691 part C - Register all components based on reading .manifest files from the components directories. Binary components auto-register using "binary-component name.dll". JS components register using "component CID file.js" "contract @mozilla.org/contract;1 CID" and "category categoryname keyname value".
This patch has some bugs, specifically we stop looking for .manifest files in chrome/. I will fix that in a followup. It also probably breaks non-libxul builds because of ordering issues.

Another followup will actually fix our in-tree JS components and add build machinery for creating a proper components.manifest file.
2010-06-11 16:13:26 -04: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
c729bcd681 Bug 570488 part B - fix and test loading XPT files from JARs, needed for omnijar, r=mwu 2010-06-10 12:51:43 -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
Doug Turner
a73902aba6 Merge with mc 2010-06-29 20:10:23 -07:00
Benjamin Stover
8150bfd360 Backout of bugs 575908, 566738, and 556400 2010-06-29 17:34:52 -07:00
Doug Turner
c92986c46a Merge from mc 2010-06-29 14:39:57 -07:00
Benjamin Stover
86673a511e Bug 556400 - Implement asyncable VisitURI. r=sdwilsh, sr=bz 2010-06-29 13:58:36 -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
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
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
Doug Turner
26297a1c2a Backing out af6c00ca82d1 2010-06-26 00:32:19 -07:00
Benjamin Stover
44b838b62d Bug 556400 - Implement asyncable VisitURI. r=sdwilsh sr=bz 2010-06-25 22:50:29 -07: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
Daniel Holbert
ee5c59f86c Bug 573530: Remove unused variable in nsXPComInit.cpp. r=bsmedberg 2010-06-23 17:30:59 -07:00
Michael Wu
a7bab5285a Bug 552121 - Add omnijar API [2/7], r=bsmedberg 2010-05-21 10:58:32 -07:00
Mark Banner
c4ebbd68ad Fix bustage for non-libxul apps following bug 566467 - link xpcom-core against psapi.lib 2010-05-21 09:21:52 +01:00
Ehsan Akhgari
a87b134220 Bug 560647 - add startup timeline instrumentation; r=vlad 2010-05-19 19:22:19 -04:00
Oleg Romashin
87c511839e Merged with mozilla-central 2010-04-22 20:22:26 -04:00
Neil Rashbrook
19df16de3a Bug 560715 Trying harder to fix nonlibxul build bustage 2010-04-22 00:40:27 +01:00
Neil Rashbrook
47abb294e5 Bug 560715 - "Windows trunk builds failing due to: storagecomps.dll : fatal error LNK1120: 2 unresolved externals" [r=bsmedberg] ok on a CLOSED TREE per sheriff 2010-04-21 01:08:00 -04:00
Doug Turner
6c196f14e2 Automerge with mc. no manual changes 2010-04-21 03:31:13 -07:00
Vladimir Vukicevic
3ce92fdab6 b=480735; add infrastructure for simple timeline logging; r=bsmedberg 2010-04-20 00:04:42 -07:00
Chris Jones
09869cfb77 Merge mozilla-central 2010-04-16 01:34:35 -05:00
Doug Turner
c15f159231 merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp. 2010-03-26 14:22:48 -07:00
Taras Glek
d3d1d47d7e Bug 516085 - C++ easy access for common global services r=bsmedberg 2010-04-02 11:38:25 -07:00
Benjamin Smedberg
3fcaf094f4 Bug 570488 - Fix loading of XPTs nested in JARs [2/2] r=mwu
--HG--
extra : rebase_source : b97a591c0260daed1f2ef2eba69e60ff82acd18f
2010-06-14 16:10:04 -07:00
Benjamin Smedberg
755c2ae337 Bug 570488 - Stop reading/writing xpti.dat and incrementally loading XPT files [1/2] r=Mossop
--HG--
extra : rebase_source : 9f28729c1032b516e8b950d29d80402e87759fda
2010-06-14 16:05:48 -07:00
Chris Jones
926e2f746f Bug 544936, part 4: Move some common code for dealing with minidumps and .extra files into nsExceptionHandler. r=ted 2010-03-24 16:22:01 -05:00
Ginn Chen
c3fc2f9d1c Bug 550371 mozalloc failed to build on Solaris r=bsmedberg 2010-04-07 14:16:32 +08:00
Mitchell Field
6ad77bd6db Bug 564950 - Make more use of mozilla::services, r=surkov, jst, neil, smontagu, roc, joshmoz, gavin, shaver 2010-05-14 18:24:41 +09:00
Ben Newman
b3cb7ea79d Bug 516522 - CPOW: Cross-Process (JavaScript) Object Wrapper. r=mrbkap r=bent sr=jst 2009-11-06 12:43:39 -08:00