Commit Graph

263 Commits

Author SHA1 Message Date
Doug Turner
a73902aba6 Merge with mc 2010-06-29 20:10:23 -07:00
Benjamin Stover
8150bfd360 Backout of bugs 575908, 566738, and 556400 2010-06-29 17:34:52 -07:00
Doug Turner
c92986c46a Merge from mc 2010-06-29 14:39:57 -07:00
Benjamin Stover
41fbf65971 Bug 566738 - Add SetURITitle to IHistory r=sdwilsh, sr=bz 2010-06-29 14:12:41 -07:00
Benjamin Stover
86673a511e Bug 556400 - Implement asyncable VisitURI. r=sdwilsh, sr=bz 2010-06-29 13:58:36 -07:00
Jason Duell
e7064f2be4 # 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
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
Honza Bambas
424bc30c44 Bug 569227 - Join HttpChannelChild with its TabChild, r=smaug 2010-06-18 12:49:28 +02:00
Ehsan Akhgari
1c4e5eae5f 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
fb10e0a996 Backed out changeset d1cbe16de6bf to fix oranges 2010-06-28 15:29:30 -04:00
Ehsan Akhgari
4ba6d6114b Bug 519928 - IFRAME inside designMode disables JavaScript, breaking current clickjacking defenses; r=Olli.Pettay 2010-06-04 17:03:50 -04:00
Doug Turner
26297a1c2a Backing out af6c00ca82d1 2010-06-26 00:32:19 -07:00
Doug Turner
d4af2b4341 Backing out 1a916e3c1ad1 2010-06-26 00:31:31 -07:00
Benjamin Stover
785d263fb3 Bug 566738 - Add SetURITitle to IHistory. r=sdwilsh sr=bz 2010-06-25 22:53:41 -07:00
Benjamin Stover
44b838b62d Bug 556400 - Implement asyncable VisitURI. r=sdwilsh sr=bz 2010-06-25 22:50:29 -07:00
Jason Duell
84b443f1c0 # 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
Mitchell Field
6ad77bd6db 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
Honza Bambas
7caac1e81b Bug 536466, r=bz 2010-05-11 18:00:53 +02:00
Boris Zbarsky
f7d7c95ec6 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
abd7f913e0 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
Benjamin Smedberg
80b423e0a0 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
Jonas Sicking
1489785d0c Bug 570258: Some more atom usage cleanup. r=jst 2010-06-08 16:25:27 -07:00
Justin Lebar
809707c50c Bug 554155 - history.pushState should fire onLocationChange only once. r=smaug 2010-05-02 10:31:07 +02:00
Jonas Sicking
26eb9625c3 Bug 562791: Add NS_TIME_FUNCTION and friends to content code. r=jst 2010-04-30 12:40:59 -07:00
Boris Zbarsky
04027a9479 Bug 562688 part 4. Change GetRootContent and the like to return Elements. r=jst, sr=sicking 2010-04-30 09:12:05 -04:00
Mitchell Field
9818f00bf2 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
Brandon Sterne
33ffc0b09f Bug 515460 - enforce CSP during frame redirects, r=jst, a=dholbert_sheriff 2010-04-23 12:51:59 -07:00
Timothy Nikkel
ac0c03fe97 Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Taras Glek
b1eaf1cf2d Bug 516085 - replace the most frequent IOService getter with an efficient one r=biesi 2010-04-12 08:44:28 -07:00
Timothy Nikkel
5337327603 Backed out changeset ae2093359899 (Bug 553359) for tsvg_opacity regression. 2010-04-11 19:26:41 -05:00
Timothy Nikkel
20d7ad6361 Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Timothy Nikkel
17be279bff Backed out changeset b4fcd21cb6e5 (bug 553359) to try to fix tsvg_opacity regression. 2010-04-11 00:07:52 -05:00
Timothy Nikkel
2f82809725 Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Craig Topper
c3fc5fa456 Bug 554253 - Convert nsCOMPtr<nsPresContext> to nsRefPtr<nsPresContext>. r=roc
--HG--
extra : rebase_source : d828daca07188864d055f3d1a72f5217632eb358
2010-03-25 14:17:11 +01:00
Philipp von Weitershausen
d4bf31c763 Bug 503832. Visiting a new fragmentid (scrolling to named anchor) should set the title of the page in the global history for the url with that anchor. r=bzbarsky 2010-03-08 19:30:02 -05:00
Mark Banner
097d74cbdf Bug 545407 Remove code that disables DNS pre-fetching for APP_TYPE_MAIL/EDITOR docshells (in favour of letting it be managed by app specific policies). r=bzbarsky 2010-03-10 10:30:23 +00:00
Julian Seward
e6be817578 Bug 549236. Initialize these variables, so we don't use uninitialized values later. r=bzbarsky 2010-03-09 15:37:22 -05:00
Boris Zbarsky
4ba91335f4 Backed out changeset dc835fb21c0c (bug 503832) on suspicion of causing a Tsspider regression.
--HG--
extra : rebase_source : b15b7bbd372fcbd768e653e89049804fed9070c8
2010-03-09 09:35:14 -05:00
Philipp von Weitershausen
8004b896f5 Bug 503832. Visiting a new fragmentid (scrolling to named anchor) should set the title of the page in the global history for the url with that anchor. r=bzbarsky 2010-03-08 19:30:02 -05:00
timeless@mozdev.org
9bc4f65120 Bug 522214 Crash when setting null on charset [@ strlen | nsDependentCString::nsDependentCString(char const*)]
r=bz
2010-02-28 17:28:54 +02:00
Shawn Wilsher
2fd7f20bd1 Bug 461199 (Part 17) - Remove no longer needed code from webshell and docshell.
r=bz
sr=sicking
2009-12-15 16:04:18 -08:00
Neil Deakin
65465d8068 Bug 528491, combine nsFocusController and nsWindowRoot, r=jst,sr=smaug 2010-02-20 11:07:03 -05:00
Timothy Nikkel
92355591c8 Bug 545593. Remove nsViewManager::Enable/DisableRefresh. r=roc 2010-02-18 13:23:23 -06:00
Shawn Wilsher
412f4ad210 Backed out changeset af29773ebf66 2010-02-18 10:01:13 -08:00
Shawn Wilsher
f4c5449fdd Bug 461199 (Part 17) - Remove no longer needed code from webshell and docshell.
r=bz
sr=sicking
2009-12-15 16:04:18 -08:00
Timothy Nikkel
53fe3ff52d Backed out changeset 93c7b23284b8 (Bug 545593) for causing Md oth failures on linux. 2010-02-12 16:46:04 -06:00
Timothy Nikkel
73241cb6bc Bug 545593. Remove nsViewManager::Enable/DisableRefresh. r=roc
--HG--
extra : rebase_source : 963053b0f3d5712308b53c665dddcedae08a2b21
2010-02-11 18:14:59 -06:00
Jae-Seong Lee-Russo
1ca2b10fe5 Bug 530382. Replace PR_MIN/PR_MAX with NS_MIN/NS_MAX in docshell. r=jst 2010-02-09 12:09:06 -05:00
Jae-Seong Lee-Russo
513e9cf886 Bug 517553: Remove '=='/'!=' 'PR_FALSE'/'PR_TRUE' 2010-02-07 10:52:43 -05:00
Sid Stamm
f9be5dbbdb Bug 515458 - "(CSP) Implement frame ancestor check" [r=jst ui-r=johnath] 2010-02-05 14:08:27 -06:00