wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
125,812 Commits 1 Branch 166 Tags 1.2 GiB
f37a8ed52c
Commit Graph

152 Commits

Author SHA1 Message Date
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
9e3c169292 Fix up the chrome registry. I think the mc->e10s merge was bad 
--HG--
extra : rebase_source : a62f1db455d0c714ebb55e7ee3a61e1811eb1c45
 2010-06-07 15:49:12 -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
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
Doug Turner
3ad0032930 Merged with MC. Hand merged netwerk/protocol/http/src/nsHttpHandler.cpp 
also removed modules/plugin/default*
 2010-05-17 08:59:15 -07:00
Chris Jones
8e7f89a8f1 Remove extraneous semicolon that's upsetting the anal gccs. 2010-05-14 20:49:00 -05:00
Chris Jones
2877589e40 Merge missed nsChromeRegistry change from m-c and fix busted content-process XPCOM/chromium event loop. 2010-05-14 01:41:14 -05:00
Chris Jones
e4786c8d43 Followup to bug 528146 for dom/ipc, and revert chome registry merge. 
--HG--
rename : dom/ipc/ContentProcessThread.cpp => dom/ipc/ContentProcessProcess.cpp
rename : dom/ipc/ContentProcessThread.h => dom/ipc/ContentProcessProcess.h
 2010-05-13 18:44:53 -05:00
Chris Jones
9327ed8dcc Merged m-c 2010-05-13 18:04:53 -05:00
Doug Turner
e6e7f60241 Fixing bad merge / build bustage 2010-05-11 11:49:57 -07: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
Craig Topper
3e0e604d67 Convert some callers of methods that changed from returning already_AddRefed<T> to returning T* away from using unneeded nsCOMPtrs. (Bug 239008) r=dbaron 2010-05-17 21:00:40 -07:00
Oleg Romashin
8de514e284 Merged with mozilla-central 2010-04-07 06:59:04 -04:00
Michael Wu
bc96fd0840 Bug 552121 - Point chrome uris to the omnijar [5/7], r=bsmedberg 
--HG--
extra : rebase_source : 68bfe81be76b51d54bc977ace52562683817a99d
 2010-06-14 14:41:12 -07:00
Craig Topper
d02574b6b4 DeCOMtaminate nsIStyleSheet method signatures. (Bug 239008) r=dbaron 2010-05-12 13:18:47 -07:00
Craig Topper
cb8187eff9 Remove nsICSSStyleSheet and replace all uses with nsCSSStyleSheet. (Bug 239008) r=dbaron 2010-05-11 13:41:47 -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
Josh Matthews
c7ce3d7d88 Build fix for non-MOZ_IPC environments 2010-03-22 22:18:53 -07:00
Josh Matthews
c9c6966c80 Bug 542907 - "e10s: Chrome registry should be unified between parent and child" [r=benjamin] 2010-03-11 18:33:00 +13:00
Josh Aas
bcb41f783d More Carbon usage cleanup. b=550787 r=bsmedberg 2010-03-10 14:30:11 -05:00
Serge Gautherie
da3feb8c55 Bug 541671 - [SeaMonkey 2.1] xpcshell: test_bug519468.js fails; (Av1) Call checkForNewChrome(), s/TmpD/ProfD/. 
r=benjamin.
 2010-04-02 18:25:13 +02:00
Jonas Sicking
1a6c0165bf Bug 534136 Part 1: Make atoms keep a pointer to an nsStringBuffer rather than storing the data inline. r=bsmedberg 2010-03-08 07:44:59 -08:00
Zack Weinberg
2c3e543d1d Bug 544112 part 2: DeCOMtaminate and devirtualize nsCSSLoader. r=bzbarsky sr=dbaron 
--HG--
rename : layout/style/nsICSSLoader.h => layout/style/nsCSSLoader.h
 2010-03-02 13:00:53 -08:00
Zack Weinberg
1e69ee7cc3 Bug 544112 part 1: Make speculative and chrome style sheet loads go through the document object. Rearrange some C++ unit tests so they'll still link after part 2. r=bzbarsky sr=dbaron 
--HG--
rename : layout/html/tests/ParseCSS.cpp => layout/style/test/ParseCSS.cpp
rename : layout/html/tests/TestCSSPropertyLookup.cpp => layout/style/test/TestCSSPropertyLookup.cpp
 2010-03-02 13:00:39 -08:00
Ms2ger@gmail.com
a4005e2fd1 Bug 538362 - rename nsIDocument::GetPrimaryShell to nsIDocument::GetShell. r=smaug 2010-06-25 15:59:57 +02: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
benjamin@smedbergs.us
1a0cd7a153 Bug 391311 followup - if the chrome registry doesn't initialize correctly, don't crash on destruction, r=Mossop a=beltzner 2008-04-11 08:05:58 -07:00
benjamin@smedbergs.us
5c2bff725a Bug 292789 (the chrome registry part), add a contentaccessible flag for packages and expose it on nsIXULChromeRegistry, r=dtownsend sr=jst a=beltzner 2008-04-11 06:39:43 -07:00
reed@reedloden.com
ccfd227e98 Bug 292549 - "crash [@ nsFrame::BoxReflow] at start of page rendering -Trunk" (Don't initialize the chrome registry if JAR isn't up) [p=benjamin@smedbergs.us (Benjamin Smedberg [bsmedberg]) r=Mossop a1.9=beltzner] 2008-04-04 02:02:15 -07:00
dveditz@cruzio.com
db5f63ebc8 bug 417086 fix regression with ':' in chrome URI fragments, r/sr=bsmedberg, blocking-firefox3+ bug 415191 rdf/chrome version of bug 413250, r/sr=neil 2008-03-06 17:20:44 -08:00
neil@parkwaycc.co.uk
218ee15045 Fix nit in previous patch b=416531 r=Mano etc. 2008-02-22 15:35:01 -08:00
reed@reedloden.com
733ff1c078 Bug 416531 - "Use chrome overrides to display Aero style icons on Vista" (Fix cached chrome channels) [p=benjamin@smedbergs.us (Benjamin Smedberg [bsmedberg]) r=Mano a=blocking-firefox3+] 2008-02-21 02:57:16 -08:00
reed@reedloden.com
b976dc32c3 Bug 415367 - "ieTab extension not working due to use of ":" in chrome URIs" (adding test only) [p=ehsan.akhgari@gmail.com (Ehsan Akhgari [ehsan]) r+sr=dveditz] 2008-02-16 19:29:20 -08:00
dveditz@cruzio.com
5a990e8ded bug 415338 (follow-on to bug 413250) don't scan query parts of chrome URIs to not break addons (as inspired by similar Seamonkey regression) . r/sr=neil, a=mtscrehp 2008-02-02 11:50:09 -08:00
dveditz@cruzio.com
3b69b5c9ee bug 413250 additional patch to catch double escaped chrome URIs too. r/sr=bsmedberg, a=beltzner 2008-01-31 17:59:12 -08:00
dveditz@cruzio.com
3b8927006a bug 413250 fix chrome: URI scheme traversal. r=Neil, sr=bsmedberg 2008-01-24 22:57:52 -08:00
dtownsend@oxymoronical.com
1a8404475c Bug 401153: Provide resource:// substitutions for installed add-ons. r=bsmedberg, a=beltzner 2007-12-21 11:32:54 -08:00
mrbkap@gmail.com
fb11cb8ad9 Use two flags for filenames: "system" and "want native wrappers". bug 408859, r=jst sr+a=brendan 2007-12-19 19:11:02 -08:00
reed@reedloden.com
c10d21233c Bug 405368 - "Allow runtime overrides by Linux version for chrome" [p=ventnor.bugzilla@yahoo.com.au (Michael Ventnor) r=bsmedberg a1.9=beltzner] 2007-11-28 14:47:01 -08:00
reed@reedloden.com
33dce78fd4 Bug 403621 - "fix various ArrayEnumerator implementations" [p=dao@mozilla.com (Dão Gottwald) r=Mano a1.9=schrep] 2007-11-21 13:15:39 -08:00
reed@reedloden.com
441062dafe Bug 330447 - "remove " ." from "No chrome package registered" error message" [p=sgautherie.bz@free.fr (Serge Gautherie) r=gavin a1.9=damons] 2007-11-13 00:50:30 -08:00
reed@reedloden.com
955b9a5f8e Attempt to fix bustage on Mac caused by bug 397073. 2007-11-12 22:04:00 -08:00
reed@reedloden.com
6ccc0d514d Bug 397073 - "Allow runtime overrides by OS version for chrome" [p=Mossop r=bsmedberg a1.9=schrep] 2007-11-12 21:38:48 -08:00
reed@reedloden.com
612ab7f0b6 Bug 399707 - "Add inverse matching for string flags" [p=Mossop r=bsmedberg a1.9=damons] 2007-11-12 21:32:09 -08:00
dolske@mozilla.com
c00ea63c48 Bug 386283: startup warning at nsChromeRegistry.cpp, line 1249. r=benjamin, sr=biesi 2007-07-14 18:34:08 -07:00
jwalden@mit.edu
e3c4baccae Bug 348748 - Replace all instances of NS_STATIC_CAST and friends with C++ casts (and simultaneously bitrot nearly every patch in existence). r=bsmedberg on the script that did this. Tune in next time for Macro Wars: Episode II: Attack on the LL_* Macros. 2007-07-08 00:08:04 -07:00
dtownsend@oxymoronical.com
de9ce9c449 Testcase for bug 380398: appversion manifest flag is broken in certain situations. r=bsmedberg 2007-05-30 14:52:47 -07:00
Olli.Pettay@helsinki.fi
da84b4a799 Bug 378776, Need safe way to iterate a document's presshells, r+sr=bz 2007-05-22 14:45:03 -07:00
dtownsend@oxymoronical.com
eedb04d8a1 Bug 380398: appversion manifest flag has a broken length check. r=bsmedberg 2007-05-18 06:42:06 -07:00
dbaron@dbaron.org
85eb65ced4 Remove unused getKey callback from PLDHashTableOps/JSDHashTableOps. b=374906 r=bsmedberg 2007-03-27 08:33:38 -07:00
hg@mozilla.com
465265d0d4 Free the (distributed) Lizard! Automatic merge from CVS: Module mozilla: tag HG_REPO_INITIAL_IMPORT at 22 Mar 2007 10:30 PDT, 2007-03-22 10:30:00 -07:00