Commit Graph

2035 Commits

Author SHA1 Message Date
Doug Turner
b7e29e0542 Merge with mc 2010-06-29 20:10:23 -07:00
Doug Turner
b30e9a9fec Places on m-c was backed out, so this backs out the e10s bits: 5690bf8b558b, 87122ab4c9b2, ca18a037097f, 71114e4522c7 2010-06-29 20:09:43 -07:00
Benjamin Stover
9eedd2f065 Backout of bugs 575908, 566738, and 556400 2010-06-29 17:34:52 -07:00
Doug Turner
b39ef0496a Bug 516728 - Remote link-visited information r=sdwilsh sr=bz 2010-06-29 16:41:16 -07:00
Doug Turner
840b7d952b Merge from mc 2010-06-29 14:39:57 -07:00
Benjamin Stover
6ac557ee71 Bug 566738 - Add SetURITitle to IHistory r=sdwilsh, sr=bz 2010-06-29 14:12:41 -07:00
Benjamin Stover
f0627a524c Bug 556400 - Implement asyncable VisitURI. r=sdwilsh, sr=bz 2010-06-29 13:58:36 -07:00
Jason Duell
69fa05ae34 # User Michal Novotny <michal.novotny@gmail.com>
# Date 1277056918 -7200
Bug 537164 - e10s HTTP: caching.  r=jduell, sr=biesi
2010-06-23 23:55:19 -07:00
Jason Duell
386a098a89 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
Honza Bambas
35132a6213 Bug 569227 - Join HttpChannelChild with its TabChild, r=smaug 2010-06-18 12:49:28 +02:00
Ehsan Akhgari
3e874ca35e Bug 519928 - IFRAME inside designMode disables JavaScript, breaking current clickjacking defenses; r=Olli.Pettay
--HG--
extra : rebase_source : 7d01d90f59e60b63e64b96bb655937fe0d0c879a
2010-06-04 17:03:50 -04:00
Ehsan Akhgari
c06468921a Backed out changeset d1cbe16de6bf to fix oranges 2010-06-28 15:29:30 -04:00
Ehsan Akhgari
741c672888 Bug 519928 - IFRAME inside designMode disables JavaScript, breaking current clickjacking defenses; r=Olli.Pettay 2010-06-04 17:03:50 -04:00
Doug Turner
c158bede5e Backing out af6c00ca82d1 2010-06-26 00:32:19 -07:00
Doug Turner
bfa6e8dbc7 Backing out 1a916e3c1ad1 2010-06-26 00:31:31 -07:00
Benjamin Stover
0203e71bdf Bug 566738 - Add SetURITitle to IHistory. r=sdwilsh sr=bz 2010-06-25 22:53:41 -07:00
Benjamin Stover
08a9b89248 Bug 556400 - Implement asyncable VisitURI. r=sdwilsh sr=bz 2010-06-25 22:50:29 -07:00
Jesse Ruderman
ca6c2cc5c1 Improve crashtests.list bug-annotations 2010-06-04 14:24:16 -07:00
Jesse Ruderman
73e0f6b5f2 Add some crashtests and reftests
--HG--
extra : rebase_source : a167ccf140387fa50e3668422b5a74bea0527255
2010-06-17 13:21:24 -07:00
Benjamin Smedberg
9403279763 Bug 569644 - Query the plugin host directly when searching for MIME types, rather than using Gecko-Content-Viewer category manager registration, r=bz 2010-06-10 12:42:16 -04:00
Ehsan Akhgari
82451cbd20 Bug 571018 - Intermittent failure in docshell/base/crashtests/432114-2.html | assertion count 2 is more than expected 0 to 1 assertions; r=jruderman
--HG--
extra : rebase_source : 2b11ede67bd47e7ebe71116ae6e00eac600d3baa
2010-06-09 14:26:44 -04:00
Jonas Sicking
7b1e51be23 Bug 570258: Some more atom usage cleanup. r=jst 2010-06-08 16:25:27 -07:00
Ehsan Akhgari
c9c8c3c5b3 Bug 336104 - "ASSERTION: no frame, see bug #188946"; r=roc,dbaron 2010-05-21 16:36:42 -04:00
Jason Duell
6cd446aadb # User Michal Novotny <michal.novotny@gmail.com>
# Date 1272456176 -7200
Bug 549241 - Channel classifier should run in chrome process. r=biesi, sr=jst
2010-05-21 14:03:02 -07:00
L. David Baron
8687659006 Annotate reftest manifest with new assertion caused by bug 559996. (Bug 472557) 2010-05-17 11:29:53 -07:00
Timothy Nikkel
55ee16c88e Bug 559996. Add a slightly modified version of this crashtest to shake out some problems. 2010-05-15 13:29:43 -05:00
Mitchell Field
0fd15d94da 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
L. David Baron
c563e19a12 Annotate crashtest manifest with assertion count for additional assertion that showed up today. (Bug 472557) 2010-05-12 13:18:47 -07:00
Honza Bambas
e9d8638a31 Bug 536466, r=bz 2010-05-11 18:00:53 +02:00
Blair McBride
f0d1a7e4ef Bug 554007: New add-ons manager UI (docshell parts). r=bz 2010-04-29 10:54:32 -07:00
L. David Baron
c4eb38acd9 Annotate remainder of crashtest mainfests (all but one test) with the tests that are known to assert. (Bug 472557) 2010-05-06 09:28:01 -07:00
Boris Zbarsky
fb534f9674 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
Peter Van der Beken
ac35089169 Part 1 of fix for bug 560273 (Stop using DOM tearoffs from quickstubs) - add nsINode::GetBaseURI. r=sicking.
--HG--
extra : rebase_source : 5a07f12d9d13d92b796fd5f2cb182b069c3f87bf
2010-04-19 17:40:15 +02:00
Justin Lebar
9ba98bff56 Bug 554155 - history.pushState should fire onLocationChange only once. r=smaug 2010-05-02 10:31:07 +02:00
Dave Townsend
bfd56a86b8 Backout new add-ons manager due to Ts regression on OSX 10.5
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell/data/test_bug404024.xml => toolkit/mozapps/extensions/test/unit/data/test_bug404024.xml
rename : toolkit/mozapps/extensions/test/xpcshell/data/test_bug417606.xml => toolkit/mozapps/extensions/test/unit/data/test_bug417606.xml
rename : toolkit/mozapps/extensions/test/xpcshell/data/test_bug424262.xml => toolkit/mozapps/extensions/test/unit/data/test_bug424262.xml
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug404024.js => toolkit/mozapps/extensions/test/unit/test_bug404024.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug417606.js => toolkit/mozapps/extensions/test/unit/test_bug417606.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug424262.js => toolkit/mozapps/extensions/test/unit/test_bug424262.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug449027.js => toolkit/mozapps/extensions/test/unit/test_bug449027.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js => toolkit/mozapps/extensions/test/unit/test_bug455906.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug514327_3.js => toolkit/mozapps/extensions/test/unit/test_bug514327_3.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js => toolkit/mozapps/extensions/test/unit/test_bug541420.js
2010-05-01 11:04:44 -07:00
Jonas Sicking
b41c433cea Bug 562791: Add NS_TIME_FUNCTION and friends to content code. r=jst 2010-04-30 12:40:59 -07:00
Boris Zbarsky
9c2ad4b2aa Bug 562688 part 4. Change GetRootContent and the like to return Elements. r=jst, sr=sicking 2010-04-30 09:12:05 -04:00
Blair McBride
178190146a Bug 554007: New add-ons manager UI (docshell parts). r=bz 2010-04-29 10:54:32 -07:00
Mitchell Field
f544d71a9d Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov 2010-04-29 18:59:13 +02:00
Phil Ringnalda
c34e9394d6 Bug 518607 - Move the Troubleshooting Information page into toolkit so other apps like Thunderbird and SeaMonkey can use it, r=gavin 2010-02-20 19:36:46 -08:00
Brandon Sterne
2f9967b962 Bug 515460 - enforce CSP during frame redirects, r=jst, a=dholbert_sheriff 2010-04-23 12:51:59 -07:00
Timothy Nikkel
9166d4f4fe Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Taras Glek
49db2378ea Bug 516085 - replace the most frequent IOService getter with an efficient one r=biesi 2010-04-12 08:44:28 -07:00
Timothy Nikkel
54c2a7920d Backed out changeset ae2093359899 (Bug 553359) for tsvg_opacity regression. 2010-04-11 19:26:41 -05:00
Timothy Nikkel
b696838d2e Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Timothy Nikkel
0e4f04dc67 Merge back out of changeset b4fcd21cb6e5 (bug 553359) to try to fix tsvg_opacity regression. 2010-04-11 00:08:37 -05:00
Timothy Nikkel
1fccc50b36 Backed out changeset b4fcd21cb6e5 (bug 553359) to try to fix tsvg_opacity regression. 2010-04-11 00:07:52 -05:00
Craig Topper
25d5518e18 Bug 557416: Remove unnecessary includes and forward declarations of nsIPresShell. r=roc 2010-04-10 16:09:38 -04:00
Timothy Nikkel
046659cbfd Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Craig Topper
fd9001c409 Bug 554253 - Convert nsCOMPtr<nsPresContext> to nsRefPtr<nsPresContext>. r=roc
--HG--
extra : rebase_source : d828daca07188864d055f3d1a72f5217632eb358
2010-03-25 14:17:11 +01:00