Dan Witte
c4091d7694
Back out Bug 536324 part 3.
2010-08-30 13:20:39 -07:00
Dan Witte
886f18b404
Merge m-c -> e10s.
2010-08-21 10:21:06 -07:00
Jonas Sicking
1fb16b80d7
Fix missing comments from patch for bug 546857
2010-08-21 18:48:01 +02:00
Dan Witte
5f4dbe5953
Bug 536324 - e10s HTTP: refactor nsHashPropertyBag. Part 3: contentLength consumers. r=jduell, a=beta5+
2010-08-21 00:31:35 -07:00
Bobby Holley
ae9d0e0ff2
Backout of changesets c866e73f3209 and baff7b7b32bc because of sicking's push-and-run bustage. a=backout
2010-08-20 23:42:24 -04:00
Jonas Sicking
c8ed6b7843
Fix missing comments from patch for bug 546857
2010-08-20 17:50:35 -07:00
Jonas Sicking
f56b8d6804
Bug 546857 Part 2: Allow permissions to be set on files. r=dwitte a=blocker
2010-08-19 16:06:07 -07:00
Edmund Wong
7ef58c704b
Bug 585336: Fix "a the" in comments (for General core code). r=timeless a=NPOTB (comment-only)
2010-08-15 15:50:02 -07:00
James Pearson
fd7f67bc83
Bug 576430 - Autoconfiguration with mozilla.cfg no longer works on trunk, Failed to read the configuration file. r=jorendorff
2010-08-10 19:04:43 -03:00
Ehsan Akhgari
ce0b3f1a9f
Bug 582863 - Spell checker shouldn't copy the text node contents unnecessarily; r=roc a=blocking2.0+
...
--HG--
extra : rebase_source : 7313d44dfe2645a8df15a4fca78e75ecfc39b536
2010-07-30 18:55:42 -04:00
Ehsan Akhgari
536ad17a6d
Backed out changeset b64704446120 because of build bustage failure in TestWinTSF.cpp
2010-08-06 11:39:19 -04:00
Ehsan Akhgari
186be467b6
Bug 582863 - Spell checker shouldn't copy the text node contents unnecessarily; r=roc a=blocking2.0+
...
--HG--
extra : rebase_source : e134b15a712630b542b7b499e15a16727350bea6
2010-07-30 18:55:42 -04:00
Josh Matthews
efd0cccb18
Bug 580450 - Clean up IPC::URI. r=dwitte
2010-07-26 15:59:34 -04:00
Dan Witte
590da7c4c9
Bug 572223 - too much cookies.sqlite io. Part 8: test write + close + read combination.
2010-08-02 17:03:25 -07:00
Dan Witte
54322e823d
Bug 572223 - too much cookies.sqlite io. Part 4: tests. r=sdwilsh
2010-07-29 12:17:43 -07:00
Dan Witte
dfcfc976fb
Revert bug 572223 to fix creation of duplicate cookies.
2010-08-01 12:24:38 -07:00
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