42ac78defe
Bug 571166 - merge from e10s to m-c. r=various. sr=bz. CLOSED TREE.
2010-06-30 23:27:52 -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
53c59bf276
Bug 571728 - Mismatched allocator for SuggestMgr::csconv. r=ehsan r=smaug
2010-06-30 23:11:41 +02: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
c7f597a357
Bug 573061 - Add persistent cookie tests. Part 2: revise and add tests. r=sdwilsh
2010-06-21 17:50:35 -07: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
91f01a8d3d
Bug 565475 - Allow 3rd party cookies for session only. r=sdwilsh
2010-06-07 12:32:12 -07:00
c2dc9a473f
Merge mozilla-central to tracemonkey.
2010-06-05 19:13:45 -04: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
d0ab6574c5
Bug 475837: Remove unused member vars "mDictionary" and "mIgnoreList" from mozPersonalDictionary.h & mozSpellChecker.h. r=smaug
2010-06-04 13:38:19 -07:00
5c0607d7f7
Add an API for compartments (570040, r=jorendorff).
2010-06-04 16:32:10 -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
5d6ba66093
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
c1d8e8dd2e
Merge mozilla-central to tracemonkey.
2010-05-24 09:05:39 -07:00
58f0e99f4d
Merge mozilla-central to tracemonkey
2010-05-17 13:55:37 -04:00
fea6936df1
Merged m-c
2010-05-13 18:04:53 -05: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
899eb84928
Bug 534694 - Move the layout debug extension to layout/tools; r=ted,roc
...
--HG--
rename : extensions/layout-debug/Makefile.in => layout/tools/layout-debug/Makefile.in
rename : extensions/layout-debug/application.ini => layout/tools/layout-debug/application.ini
rename : extensions/layout-debug/chrome.manifest => layout/tools/layout-debug/chrome.manifest
rename : extensions/layout-debug/layoutdebug-prefs.js => layout/tools/layout-debug/layoutdebug-prefs.js
rename : extensions/layout-debug/makefiles.sh => layout/tools/layout-debug/makefiles.sh
rename : extensions/layout-debug/src/Makefile.in => layout/tools/layout-debug/src/Makefile.in
rename : extensions/layout-debug/src/nsDebugFactory.cpp => layout/tools/layout-debug/src/nsDebugFactory.cpp
rename : extensions/layout-debug/src/nsILayoutDebuggingTools.idl => layout/tools/layout-debug/src/nsILayoutDebuggingTools.idl
rename : extensions/layout-debug/src/nsILayoutRegressionTester.idl => layout/tools/layout-debug/src/nsILayoutRegressionTester.idl
rename : extensions/layout-debug/src/nsLayoutDebugCIID.h => layout/tools/layout-debug/src/nsLayoutDebugCIID.h
rename : extensions/layout-debug/src/nsLayoutDebugCLH.cpp => layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp
rename : extensions/layout-debug/src/nsLayoutDebugCLH.h => layout/tools/layout-debug/src/nsLayoutDebugCLH.h
rename : extensions/layout-debug/src/nsLayoutDebuggingTools.cpp => layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp
rename : extensions/layout-debug/src/nsLayoutDebuggingTools.h => layout/tools/layout-debug/src/nsLayoutDebuggingTools.h
rename : extensions/layout-debug/src/nsRegressionTester.cpp => layout/tools/layout-debug/src/nsRegressionTester.cpp
rename : extensions/layout-debug/src/nsRegressionTester.h => layout/tools/layout-debug/src/nsRegressionTester.h
rename : extensions/layout-debug/ui/Makefile.in => layout/tools/layout-debug/ui/Makefile.in
rename : extensions/layout-debug/ui/content/layoutdebug-overlay.xul => layout/tools/layout-debug/ui/content/layoutdebug-overlay.xul
rename : extensions/layout-debug/ui/content/layoutdebug.js => layout/tools/layout-debug/ui/content/layoutdebug.js
rename : extensions/layout-debug/ui/content/layoutdebug.xul => layout/tools/layout-debug/ui/content/layoutdebug.xul
rename : extensions/layout-debug/ui/jar.mn => layout/tools/layout-debug/ui/jar.mn
rename : extensions/layout-debug/ui/locale/en-US/layoutdebug-overlay.dtd => layout/tools/layout-debug/ui/locale/en-US/layoutdebug-overlay.dtd
rename : extensions/layout-debug/ui/locale/en-US/layoutdebug.dtd => layout/tools/layout-debug/ui/locale/en-US/layoutdebug.dtd
2010-04-23 15:03:22 -04:00
99ac48f5b8
Backed out changeset 90d627f2471e (bug 564979) because it broke mochitests.
2010-05-17 14:59:49 -04:00
93a3d49314
Bug 564979. Get rid of nsINode::GetSibling and just use GetNext/PreviousSibling instead. r=peterv, sr=sicking
2010-05-17 14:18:25 -04:00
77ab880fda
Followup to bug 571728 - catch the remaining places where the return value of get_current_cs is freed; r=Olli.Pettay
2010-06-13 22:48:24 -04:00
41aab21115
Bug 472529, websockets (netwerk patch), r=smaug+biesi
...
--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
extra : rebase_source : 4f75d33eb4fc7cdaa1f011f176ef4434bbfe2c25
2010-06-17 21:33:42 +03:00
07b7c6359e
Bug 564097 - Move prompts.properties into commonDialog.properties. r=gavin, sr=bs
2010-06-16 17:06:15 -07:00
2918f2e692
Merge mozilla-central
2010-04-16 01:34:35 -05:00
5cfc06daae
Bug 537156 - [e10s] Implement cookies. r=jduell,sdwilsh; sr=bz
2010-03-25 16:02:28 -07:00
518a3564df
Bug 388195 - Remove gopher support. r=jduell,gavin sr=bz
2010-04-16 17:05:47 -04:00
bdbd82450b
Bug 571728 - Mismatched allocator for SuggestMgr::csconv; r=Olli.Pettay,RyanVM
2010-06-13 14:19:23 -04:00
cbddad67ad
Backed out changeset 3224dabf012e because I need one more review
2010-06-13 14:46:04 -04:00
a02b9e2ed8
Bug 571728 - Mismatched allocator for SuggestMgr::csconv; r=Olli.Pettay
2010-06-13 14:19:23 -04:00
9c409b2b4a
Bug 479334 - Firefox and Thunderbird need a better English language dictionary; r=gavin
2010-06-13 14:33:06 -04:00
d94e1d667f
Bug 562519 cache result from PR_GetPhysicalMemorySize
...
r=biesi
2010-05-13 11:11:24 -07:00
c5b2bbeb04
Merge tracemonkey to mozilla-central.
2010-05-06 08:50:41 -04:00
e0ac118cd1
Bug 562971. Include Element.h as mozilla/dom/Element.h and don't use 'using namespace' quite as much. r=jst
2010-05-05 14:18:05 -04:00
b54dc35195
Bug 552560 - Remove support for __parent__. r=mrbkap
2010-04-11 13:51:00 -07:00
70d486e6b1
Bug 560643 - Add a special jsval type to XPIDL. Part 1, rename JSVal -> jsval in existing IDL. r+sr=jst.
...
--HG--
extra : rebase_source : 3d50f7468277883a26790df13a639ce37757a257
2010-05-12 08:18:51 -05:00
9d6c65cee7
Bug 557416: Remove unnecessary includes and forward declarations of nsIPresShell. r=roc
2010-04-10 16:09:38 -04:00
8eae865c49
Bug 552339 - 2010-03-14 xulrunner nightlies failed to build (mozilla-central). r=bsmedberg
2010-03-22 01:01:47 +09:00
2974668ac1
Bug 512518 followup: fix 'unused variable' warnings in nsRegressionTester.cpp, and use & instead of && for bit-masking operation. r=dbaron
2010-03-17 21:41:34 -07:00
5d0b2629f4
Remove extension/universalchardet/doc/. Bug 471480, r=smontagu
2010-03-13 12:08:57 -08:00
5a22815ee5
Bug 544097 Chaning mochitests to run against mochi.test instead of localhost r=ted, waldo, dwitte p=jmaher. Landed on CLOSED TREE
2010-03-12 13:53:36 -08:00
4492ee705c
backing out changesets e939397fc6a5, 88529662c474 and 3d7c54b194bb due to random hangs in pgo tests
2010-03-09 22:33:11 -05:00
acb95ebf6d
Bug 544097 changing mochitests to use mochi.test instead of localhost for windows mobile refactoring p=jmaher, r=ted,dwitte, sayrer, waldo, ctalbert
2010-03-09 08:55:39 -08:00
010ae16e0a
Bug 564608 - Update Hunspell to 1.2.11. r=smaug
...
--HG--
extra : rebase_source : b3e8bccd5b58afb4cff64fa144068f6f64258c68
2010-06-09 08:06:40 +02:00
0a61f6479f
Bug 450450. Add some more debugging output to try to diagnose random orange.
2010-06-08 14:18:30 -05:00
f78a715db2
Backed out changeset 8ce70abd7777
2010-03-09 01:14:21 -05:00
4b8aff6ea3
Bug 544097 Change mochitests to use mochi.test instead of localhost for mobile refactoring p=jmaher r=ted,dwitte,sayrer
2010-03-08 19:21:33 -08:00
0800fab6c3
Bug 538723: run_for_effect is not portable for Bourne shell r=ted.mielczarek
2010-03-08 17:30:40 +08:00
b962e844a9
Backed out changeset b4372055f473 -- due to unexplained orange on OS X Leak test (Bd) box
2010-03-07 17:34:23 -08:00
Doug Turner
Ryan VanderMeulen
Jason Duell
Dan Witte
Robert Sayre
Dão Gottwald
Saint Wesonga
Daniel Holbert
Andreas Gal
Oleg Romashin
Olli Pettay
Jason Orendorff
Chris Jones
Ehsan Akhgari
Boris Zbarsky
wfernandom2004@gmail.com
Justin Dolske
Joe Drew
Matt Caywood
timeless@mozdev.org
Jeff Walden
Craig Topper
Makoto Kato
tyler.downer@gmail.com
Joel Maher
Brad Lassey
Timothy Nikkel
Kyle Huey
Ginn Chen
Clint Talbert