2f59dbe27b
Merge from mc
2010-06-29 14:39:57 -07:00
a793d4943c
Bug 556400 - Implement asyncable VisitURI. r=sdwilsh, sr=bz
2010-06-29 13:58:36 -07:00
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
a6a3778b55
Bug 574872 - 'Allow XPConnect to pass the JSContext through XPIDL when requested'. r=jst
2010-06-28 15:22:39 -07:00
c1b97654d7
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
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
0dcf14275c
Bug 570912: Allow already_AddRefed<T> to be coerced to already_AddRefed<U> when T can be coerced to U. r=dbaron
2010-06-21 15:35:49 -05:00
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
01ec17a1f9
Backed out changeset db6f8068e9a5
2010-06-29 17:49:21 +02:00
5d01c7f8a9
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedgerg
2010-06-29 17:14:36 +02:00
295f30a37e
Bug 574089 - Optimize ::GetInnerHTML, r=jst
...
--HG--
extra : rebase_source : 3ed1549eaa96d3ff3fe6bf2bb2562dd9e68fcc17
2010-06-26 23:39:56 +03:00
2a0ed36a96
Bug 508905 - /Zc:wchar_t- is no longer required (wince part) r=doug.turner
...
--HG--
extra : rebase_source : 13d6dadb676ca5e29b7e7bcfff5bbb1c964f78e4
2010-06-27 01:30:05 +02:00
710f9de58f
Bug 575014: cast pointer-subtraction in nsTArray to produce index_type instead of (64-bit) size_t, to fix build warning on Win64. (bustage fix) rs=timeless pending-r=bsmedberg
2010-06-26 17:50:36 -07:00
cd6484309a
Bug 574650 Fix xpcom/reflect/xptcall for gcc on Solaris r=jst
2010-06-27 00:56:47 +08:00
50a666bdd5
Backing out af6c00ca82d1
2010-06-26 00:32:19 -07:00
cf1760cbfb
Bug 556400 - Implement asyncable VisitURI. r=sdwilsh sr=bz
2010-06-25 22:50:29 -07:00
251c051e26
Merge with mc
2010-05-25 13:48:25 -07:00
91d5a62423
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04:00
3fed591ba3
m-c to e10 merge
2010-05-24 17:45:59 +03:00
096f6f9d9b
Bug 199473: Make downloads work if temporary directory is encrypted on Windows. r=jmathies
...
--HG--
extra : rebase_source : e88b316e071dd9bb8a57ab11e1bd13bc39d7d8eb
2010-05-23 10:48:21 -07:00
c1d8e8dd2e
Merge mozilla-central to tracemonkey.
2010-05-24 09:05:39 -07:00
11a655ab7e
Bug 564091: Fix spelling of nonexistent across the tree. r=timeless
...
--HG--
extra : rebase_source : 4f15f7fd6f90926b77d136be83af7f22c5ffa830
2010-05-23 12:26:15 -07:00
58f0e99f4d
Merge mozilla-central to tracemonkey
2010-05-17 13:55:37 -04:00
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
fea6936df1
Merged m-c
2010-05-13 18:04:53 -05:00
a169dc68ec
Bug 573530: Remove unused variable in nsXPComInit.cpp. r=bsmedberg
2010-06-23 17:30:59 -07:00
cdcd107eee
Bug 571210 Fix GetDiskSpaceAvailable for Solaris r=roc
2010-06-23 17:32:17 +08:00
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
a042fcb159
Bug 565461: Implement nsTArray::operator==. r=bsmedberg
2010-05-22 14:35:41 -05:00
d34a8f6578
bug 559263 - implement jemalloc for android r=vlad
2010-05-25 11:28:14 -04:00
ddd12dbe18
Merge with m-c. no hand edits
2010-04-29 21:04:50 -07:00
aee189207e
Test for bug 561971 [r=dtownsend]
...
--HG--
extra : rebase_source : 64b4940aaeb7b8e0591f7872f0b48b24e01f213a
2010-04-29 07:25:38 +00:00
6dfa925097
Bug 543441 - Avoid a race condition induced crash when trying to nsProcess::Kill() a terminated process [r=dtownsend]
...
--HG--
extra : rebase_source : eb04335b397772058c2c272736afb5604b09e0af
2010-04-29 07:24:32 +00:00
be55204793
Bug 552121 - Add omnijar API [2/7], r=bsmedberg
2010-05-21 10:58:32 -07:00
5ff9ae27f9
Bug 549388 - Don't use refcounting for nsProxyObjectManager: create it once, and destroy it at shutdown after all the clients have finished with it, r=timeless
...
--HG--
extra : rebase_source : d4c0486a748675e29de713a8a55ee594764c4c9b
2010-05-21 11:50:05 -04:00
f474d7e612
Fix bustage for non-libxul apps following bug 566467 - link xpcom-core against psapi.lib
2010-05-21 09:21:52 +01:00
886d747048
b=566467; add win32 core memory reporters; r=jmathies
2010-05-20 22:58:53 -07:00
149adda913
Bug 564689 - Signed/unsigned comparison warnings in nsComponentManager.cpp r=bsmedberg
...
--HG--
extra : rebase_source : 9d74a7a43a729ce9e0f96bd98992e6359da23322
2010-05-19 16:37:10 -04:00
cb3b3e8e7b
Bug 560647 - add startup timeline instrumentation; r=vlad
2010-05-19 19:22:19 -04:00
672a077bbd
Bug 564185: Centralize the breakpad-triggering abort code in mozalloc and use |*NULL| to abort on mac, since abort() doesn't trigger breakpad. r=ted
2010-05-18 20:53:52 -05:00
485bf66bbc
Bug 565748 - nsTArray.h:905: warning: unused variable ‘elem’, r=roc
2010-05-18 17:14:34 -07:00
3939cff12e
Bug 559854 - Compile target xpidl only if libIDL is configured when cross compiling. [r=ted]
...
(transplanted from 0388c837c9867762bcc10a1fb88428050d158479)
--HG--
extra : transplant_source : %03%88%C87%C9%86wb%BC%C1%0A%1F%B8%84%28%05%0D%15%84y
2010-06-02 10:08:00 -04:00
9a9b975fa9
Bug 560393, part 2: (xpcom directory) Fix compile warning: format $f expects type $t1, but argument 2 has type $t2. r=bsmedberg
2010-05-17 16:36:31 -07:00
903d7d380b
Bug 540665 - Make nsIRunnable a function so JS can use it as such. r=benjamin
...
--HG--
extra : rebase_source : cadf70d8c68810167894c069fc73df01c5046b0a
2010-05-07 09:52:04 +02:00
63ca8b65c6
Merged m-c
2010-04-27 01:53:06 -05:00
784888920c
Bug 518881: Make Send/Call*() methods for IPDL parent actors warn_unused_result. r=bent
2010-04-27 00:43:00 -05:00
30361f401e
Bug 545733: |const|-ify some *Channel methods. r=bent
2010-04-27 00:42:59 -05:00
6126049649
merge with m-c.
2010-04-26 23:17:51 -07:00
a2d75cb968
Replace direct instantiations of nsRunnableMethod with calls to the templatized NS_NewRunnableMethod function (part 3/3 of bug 558498). r=dwitte sr=dbaron
2010-04-20 16:21:35 -07:00
2f85d87cfe
Support __stdcall nsRunnableMethods (part 2/3 of bug 558498). r=dwitte sr=dbaron
2010-04-20 16:21:32 -07:00
Doug Turner
Benjamin Stover
Ben Turner
Jason Duell
Chris Jones
Dão Gottwald
Saint Wesonga
Olli Pettay
Jacek Caban
Daniel Holbert
Ginn Chen
Benjamin Stover
Oleg Romashin
Steve Harper
Robert Sayre
Michael Kohler
Brad Lassey
Mike Hommey
Michael Wu
Benjamin Smedberg
Mark Banner
Vladimir Vukicevic
Josh Matthews
Ehsan Akhgari
Ben Newman