Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-29 03:44:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
386a098a89
gecko-dev/toolkit
History
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
..
components Bug 565599 unused variable nsNavHistoryContainerResultNode::mAsyncEnabled 2010-06-22 02:01:39 +02:00
content Merge from m-c. 2010-06-22 17:33:57 -07:00
crashreporter Bug 567497 - "Files executed via download manager cause Win7 compatibility mode to permanently apply to firefox.exe and not downloaded file" [r=ted] 2010-05-24 09:55:00 -04:00
library Merge from m-c. 2010-06-22 17:33:57 -07:00
locales Bug 563168: Blocklist service warns of bad add-ons, but nothing is listed. r=robstrong 2010-05-06 12:57:58 -07:00
mozapps Fix review comment for Bug 569058 - Upgrade NSIS version to 2.45 or later (PCA complains when installer is cancelled on Windows 7). overrides.nsh changes. r=jmathies 2010-06-21 18:25:14 -07:00
obsolete Bug 523693 Inline spell checker shouuld be a module r=gavin (new/renamed files) 2009-10-28 11:19:03 +00:00
profile Use Unicode paths instead of native paths for profile directory on platforms where native paths are not UTF-8. Bug 534854, r=ted 2010-02-23 12:19:15 +02:00
spatial-navigation Bug 557620 - Implement <input type="tel">. r=smaug,dolske,dao sr=sicking 2010-05-12 09:17:07 +02:00
system Bug 515460 - enforce CSP during image redirects, r=joe 2010-05-20 13:08:02 -07:00
themes Bug 553482 - "Add icons for buttons in download progress XBL binding" [r=Mossop] 2010-05-30 23:50:00 -04:00
xre Merge from m-c. 2010-06-22 17:33:57 -07:00
empty-file
Makefile.in Bug 549637: don't build toolkit and toolkit/components separately, r=ted 2010-03-02 10:11:01 -08:00
toolkit-makefiles.sh Merge from m-c. 2010-06-22 17:33:57 -07:00
toolkit-tiers.mk Merge from m-c. 2010-06-22 17:33:57 -07:00