Commit Graph

99 Commits

Author SHA1 Message Date
Joel Maher
b61eda4b1d Bug 586754 Xpcshell tests should use relativesrcdir instead of $MODULE (android prepartion) r=mitchell.field a=NPOTB 2010-08-26 14:47:28 -07:00
Clint Talbert
1afdc1b8df Backed out changeset 49beef9387a0 due to Xpcshell orange a=backout
--HG--
extra : rebase_source : 01307f705ab07b7784401d69a53921b200544978
2010-08-25 14:03:44 -07:00
Joel Maher
51fff79f07 Bug 586754 Change xpcshell to use $relativesrcdir instead of $module for android support a=NPOTB r=mitchell.field 2010-08-25 11:47:39 -07:00
Jonas Sicking
cbc0676504 Backout bugs 586754, 574189, 584611 due to orange. a=backout 2010-08-20 11:08:43 -07:00
Joel Maher
6763342e81 Bug 586754 xpcshell tests should use relativesrcdir instead of $MODULE r=:Mitch a=NPOTB 2010-08-20 09:32:58 -07:00
Justin Dolske
df2cae1217 bug 580508 - fix test_resolve_uris.js test. r=mossop 2010-08-03 16:26:27 +12:00
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
Mark Banner
27694b6ab6 Bug 577496 Linking issues in xpcom on static builds due to chrome registry not having FORCE_NO_PIC set. r=ted 2010-07-08 09:30:25 -07:00
Mark Banner
dd1a933488 Make test_resolve_uris.js account for non-libxul configurations where app-info isn't available and isn't needed. Agreed over irc with jdm. Test-only bustage fix. 2010-07-05 19:46:31 +01:00
Benjamin Smedberg
0b4de441c4 Bug 568691 - Fix MOZ_OMNIJAR registration, r=mwu
--HG--
rename : modules/libjar/nsXPTZipLoader.cpp => modules/libjar/nsManifestZIPLoader.cpp
rename : modules/libjar/nsXPTZipLoader.h => modules/libjar/nsManifestZIPLoader.h
rename : xpcom/reflect/xptinfo/public/nsIXPTLoader.idl => xpcom/components/nsIManifestLoader.idl
2010-07-02 09:53:19 -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
b83c7495d6 Support Windows line endings in manifest files again (regression introduced in revision 5229353383b0). With test! 2010-06-29 13:16:43 -04:00
Benjamin Smedberg
6669ee04a8 Bug 568691 - Add an ABI chrome registration modifier so that platform-specific directories can be implemented directly in chrome.manifest. 2010-06-27 15:13:04 -04:00
Benjamin Smedberg
5b4541cfe9 Fix chrome registry test setup. 2010-06-25 20:53:20 -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
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
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
f13550a209 Bug 568691 part B - mechanical changes to in-tree binary modules needed to get them building and registering correctly. After this patch, xpcshell appears to work. 2010-06-10 14:11:40 -04:00
Chris Jones
3921e1219b Bug 575918: Temporarily disable OOP xpcshell on OS X because it's completely broken. r=bsmedberg 2010-06-30 17:53:51 -05: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
ff330a24c3 Remove extra function accidentally added during merge 2010-06-23 11:59:50 -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
9e3c169292 Fix up the chrome registry. I think the mc->e10s merge was bad
--HG--
extra : rebase_source : a62f1db455d0c714ebb55e7ee3a61e1811eb1c45
2010-06-07 15:49:12 -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
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Jason Orendorff
d7cbea1f4d Bug 533592, part 1 - Remove uses of and support for xpcnativewrappers=no/yes in manifests. (The default has been yes for some time and we will now only have that behavior.) r=mrbkap.
--HG--
extra : rebase_source : 996d2abecb15f44293abd470a28a3fe2706e130e
2010-05-27 12:33:54 -07: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
8e7f89a8f1 Remove extraneous semicolon that's upsetting the anal gccs. 2010-05-14 20:49:00 -05: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
e6e7f60241 Fixing bad merge / build bustage 2010-05-11 11:49:57 -07: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
Craig Topper
3e0e604d67 Convert some callers of methods that changed from returning already_AddRefed<T> to returning T* away from using unneeded nsCOMPtrs. (Bug 239008) r=dbaron 2010-05-17 21:00:40 -07:00
Oleg Romashin
8de514e284 Merged with mozilla-central 2010-04-07 06:59:04 -04:00
Michael Wu
bc96fd0840 Bug 552121 - Point chrome uris to the omnijar [5/7], r=bsmedberg
--HG--
extra : rebase_source : 68bfe81be76b51d54bc977ace52562683817a99d
2010-06-14 14:41:12 -07:00
Craig Topper
d02574b6b4 DeCOMtaminate nsIStyleSheet method signatures. (Bug 239008) r=dbaron 2010-05-12 13:18:47 -07:00
Craig Topper
cb8187eff9 Remove nsICSSStyleSheet and replace all uses with nsCSSStyleSheet. (Bug 239008) r=dbaron 2010-05-11 13:41:47 -07: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
Josh Matthews
c7ce3d7d88 Build fix for non-MOZ_IPC environments 2010-03-22 22:18:53 -07:00
Josh Matthews
c9c6966c80 Bug 542907 - "e10s: Chrome registry should be unified between parent and child" [r=benjamin] 2010-03-11 18:33:00 +13:00
Josh Aas
bcb41f783d More Carbon usage cleanup. b=550787 r=bsmedberg 2010-03-10 14:30:11 -05:00
Serge Gautherie
da3feb8c55 Bug 541671 - [SeaMonkey 2.1] xpcshell: test_bug519468.js fails; (Av1) Call checkForNewChrome(), s/TmpD/ProfD/.
r=benjamin.
2010-04-02 18:25:13 +02:00
Jonas Sicking
1a6c0165bf Bug 534136 Part 1: Make atoms keep a pointer to an nsStringBuffer rather than storing the data inline. r=bsmedberg 2010-03-08 07:44:59 -08:00
Zack Weinberg
2c3e543d1d Bug 544112 part 2: DeCOMtaminate and devirtualize nsCSSLoader. r=bzbarsky sr=dbaron
--HG--
rename : layout/style/nsICSSLoader.h => layout/style/nsCSSLoader.h
2010-03-02 13:00:53 -08:00
Zack Weinberg
1e69ee7cc3 Bug 544112 part 1: Make speculative and chrome style sheet loads go through the document object. Rearrange some C++ unit tests so they'll still link after part 2. r=bzbarsky sr=dbaron
--HG--
rename : layout/html/tests/ParseCSS.cpp => layout/style/test/ParseCSS.cpp
rename : layout/html/tests/TestCSSPropertyLookup.cpp => layout/style/test/TestCSSPropertyLookup.cpp
2010-03-02 13:00:39 -08:00
Mike Hommey
6efe4389ae Bug 542999 - Setting general.useragent.locale in user profile should override any intl.locale.matchOS setting. r=bsmedberg 2010-02-22 12:42:38 +13:00
Michael Wu
3f3130f146 Bug 540745 - Remove app-chrome.manifest related code, r=bsmedberg
--HG--
extra : rebase_source : 9cd5849f99902033f357bae6620fb77bf8db3ba9
2010-01-20 11:57:31 -08:00
Olli Pettay
63fd91b1fa Bug 534226 - Remove support for multiple presshells, r=bz, sr=roc 2010-01-07 12:36:11 +02:00