Commit Graph

536 Commits

Author SHA1 Message Date
Robert Sayre
073bde8d2b Merge mozilla-central to tracemonkey. 2010-07-30 21:57:41 -07:00
Kyle Huey
cc25e38cd5 Bug 575043: Remove internal uses of nsICaseConversion. r=smontagu sr=roc
--HG--
extra : rebase_source : f95ad3f21a95e354324e1524c378cad7146f3241
2010-07-29 12:22:16 -07:00
Dan Witte
8528b7d534 Bug 572223 - too much cookies.sqlite io. Part 4: tests. r=sdwilsh 2010-07-29 12:17:43 -07:00
Robert Sayre
1b744a7685 Merge mozilla-central to tracemonkey. 2010-07-20 15:07:03 -07:00
Luke Wagner
99411cc93d Bug 549143 - fatvals 2010-07-14 23:19:36 -07:00
Saint Wesonga
e7a357dcaf Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg 2010-07-05 11:42:18 +02:00
Dão Gottwald
9b15b69a1b Backed out changeset 59ace8d80ce8 2010-07-04 22:01:13 +02:00
Saint Wesonga
8dd5da1024 Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg 2010-07-04 21:39:17 +02:00
Ryan VanderMeulen
fc51cfe729 Bug 579649 - Update Hunspell to version 1.2.12. r=smaug 2010-07-19 18:19:52 -04: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
Alon Zakai
84a215c2da Bug 564535 - permission manager needs to be remoted [r=dwitte] 2010-07-15 10:04:25 -04:00
Dan Witte
b2c9e41036 Add new images to circumvent caching during tests. b=450450 2010-07-02 17:40:29 -07:00
Dan Witte
bd456200bd Switch from Cache-Control: no-cache to no-store to see if it fixes random orange. b=450450 2010-07-02 10:24:03 -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
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
abf280675d Testing fixes for bug 568691 - change xpcshell do_load_module to do_load_manifest, and switch the relevant tests to use manifests and the new function. 2010-06-25 10:43:25 -04:00
Benjamin Smedberg
762def30bb Merge mozilla-central into the static-xpcom-registration branch. 2010-06-23 17:26:25 -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
3fbca784cb More Linux-specific fixup from bug 568691 2010-06-12 20:50:56 -04:00
Dan Witte
28ea03e548 Bug 573061 - Add persistent cookie tests. Part 2: revise and add tests. r=sdwilsh 2010-06-21 17:50:35 -07: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
Doug Turner
a8d2b069bc Bug 571166 - merge from e10s to m-c. r=various. sr=bz. CLOSED TREE. 2010-06-30 23:27:52 -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
Ryan VanderMeulen
60025c3498 Bug 571728 - Mismatched allocator for SuggestMgr::csconv. r=ehsan r=smaug 2010-06-30 23:11:41 +02: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
Dan Witte
903768fcbf Bug 565475 - Allow 3rd party cookies for session only. r=sdwilsh 2010-06-07 12:32:12 -07:00
Robert Sayre
d9e86770e3 Merge mozilla-central to tracemonkey. 2010-06-05 19:13:45 -04:00
Dão Gottwald
b314909c2e Backed out changeset db6f8068e9a5 2010-06-29 17:49:21 +02:00
Saint Wesonga
c3669d7e9c Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedgerg 2010-06-29 17:14:36 +02:00
Daniel Holbert
5ff8190e4a Bug 475837: Remove unused member vars "mDictionary" and "mIgnoreList" from mozPersonalDictionary.h & mozSpellChecker.h. r=smaug 2010-06-04 13:38:19 -07:00
Andreas Gal
70617110b8 Add an API for compartments (570040, r=jorendorff). 2010-06-04 16:32:10 -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
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
Robert Sayre
def349ad75 Merge mozilla-central to tracemonkey. 2010-05-24 09:05:39 -07:00
Robert Sayre
13c247559e Merge mozilla-central to tracemonkey 2010-05-17 13:55:37 -04: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
Ehsan Akhgari
cdd6eec761 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
Boris Zbarsky
9f46f37b84 Backed out changeset 90d627f2471e (bug 564979) because it broke mochitests. 2010-05-17 14:59:49 -04:00
Boris Zbarsky
f830440dab 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
Ehsan Akhgari
33a01e702a 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
wfernandom2004@gmail.com
dfefa110ff 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
Justin Dolske
f997da1518 Bug 564097 - Move prompts.properties into commonDialog.properties. r=gavin, sr=bs 2010-06-16 17:06:15 -07:00
Chris Jones
09869cfb77 Merge mozilla-central 2010-04-16 01:34:35 -05:00
Dan Witte
94bef3b858 Bug 537156 - [e10s] Implement cookies. r=jduell,sdwilsh; sr=bz 2010-03-25 16:02:28 -07:00
Joe Drew
98f411e39e Bug 388195 - Remove gopher support. r=jduell,gavin sr=bz 2010-04-16 17:05:47 -04:00
Ehsan Akhgari
c015726bab Bug 571728 - Mismatched allocator for SuggestMgr::csconv; r=Olli.Pettay,RyanVM 2010-06-13 14:19:23 -04:00
Ehsan Akhgari
8f948d54f7 Backed out changeset 3224dabf012e because I need one more review 2010-06-13 14:46:04 -04:00