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
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
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
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
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
Benoit Girard
4fe7201af4
Bug 528146: Run plug-in code on the thread that starts in main(). r=cjones
...
--HG--
rename : dom/plugins/PluginThreadChild.cpp => dom/plugins/PluginProcessChild.cpp
rename : dom/plugins/PluginThreadChild.h => dom/plugins/PluginProcessChild.h
rename : ipc/ipdl/test/cxx/IPDLUnitTestThreadChild.cpp => ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.cpp
rename : ipc/ipdl/test/cxx/IPDLUnitTestThreadChild.h => ipc/ipdl/test/cxx/IPDLUnitTestProcessChild.h
2010-05-10 23:18:00 -05:00
Doug Turner
8f97a20153
Merge with m-c. no hand edits
2010-04-29 21:04:50 -07:00
Mike Hommey
924b226213
Bug 368477 - Set $HOME with data from getpwuid if $HOME is not set. [r=benjamin]
...
--HG--
extra : rebase_source : eada90f268f55842d556a18a76845e944f1a553c
2010-04-29 07:19:50 +00:00
Michael Wu
a7bab5285a
Bug 552121 - Add omnijar API [2/7], r=bsmedberg
2010-05-21 10:58:32 -07:00
Ehsan Akhgari
a87b134220
Bug 560647 - add startup timeline instrumentation; r=vlad
2010-05-19 19:22:19 -04:00
Michael Wu
f7ea7a8b12
Bug 565142 - Support startup on Android, patch by vlad, blassey, alexp, and me. r=dougt
...
--HG--
extra : rebase_source : 1153c0a4fb1d73f29d8c9da78c66bf4bf21b8142
2010-06-03 18:16:20 -07:00
Mark Finkle
0204aa7bde
Bug 232691 - replace nsString() nsAutoString() and friends with EmptyC?String() (Maemo only bustage fix) [r=bz]
2010-05-18 13:41:42 -04:00
Edmund Wong
3f9353b789
Bug 232691 - replace nsString() nsAutoString() and friends with EmptyC?String(). r=jonas
2010-05-18 09:50:14 +02:00
Jesse Ruderman
f04ef428cb
Remove stray line breaks from NS_ERROR messages, since they interfere with log processing. rs=jst
...
--HG--
extra : rebase_source : 87421691da969e0ebe5fbfbc44cd8f18617d1351
2010-06-17 13:28:38 -07:00
Chris Jones
d53b8a18d0
Merged m-c
2010-04-27 01:53:06 -05:00
Doug Turner
ed6494b616
merge with m-c.
2010-04-26 23:17:51 -07:00
Vladimir Vukicevic
e3731a1e45
b=560647; basic start-to-end startup instrumentation and some fixes; r=bz a=coop
2010-04-26 11:13:03 -07:00
Doug Turner
b6a5b5d71c
Bug 561831 - Build bustage on qt in toolkit/xre. r=ted
...
--HG--
extra : rebase_source : 539baef0937ade25ced67b33efc2f474cbbb1fa7
2010-04-28 13:33:14 -07:00
Oleg Romashin
87c511839e
Merged with mozilla-central
2010-04-22 20:22:26 -04:00
Oleg Romashin
7a2ec023c4
Bug 553904 - Child tab process crashes on attempt to initialize child plugin process. r=bent.mozilla
2010-04-20 21:43:51 +03:00
Doug Turner
6c196f14e2
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
Mike Hommey
cd27a1692e
Bug 555894 - Don't use static strings when setting environment variables [r=vladimir, sr=benjamin]
...
--HG--
extra : rebase_source : 75e46dd8215cb761d4f96b441c05407d991d9d1b
2010-04-19 10:29:18 +02:00
Mike Hommey
80fbf8a463
Bug 538929 - Avoid creating XRE_SYS_LOCAL_EXTENSION_PARENT_DIR and NS_APP_PREFS_OVERRIDE_DIR with wrong permissions [r=benjamin]
...
--HG--
extra : rebase_source : 4074ffcab5a32e2e78eabf2e8614a652e575a3b0
2010-04-19 10:15:31 +02:00
Siddharth Agarwal
9da4e1201a
Bug 558918 - VC10: _set_sbh_threshold missing. r=bsmedberg.
...
This only affects debug builds on Windows 2000.
2010-04-20 00:47:54 +05:30
Chris Jones
09869cfb77
Merge mozilla-central
2010-04-16 01:34:35 -05:00
Jonathan Kew
6c0909b348
bug 559075 - add local autorelease pool to SetupMacApplicationDelegate to prevent startup leakage. r=josh
2010-04-13 21:37:07 +01:00
Oleg Romashin
8de514e284
Merged with mozilla-central
2010-04-07 06:59:04 -04:00
Oleg Romashin
e23374081a
Bug 554911 - mozilla-runtime process hang and not closed properly after closing fennec UI. r=dougt
2010-03-30 07:28:10 -04:00
Doug Turner
c15f159231
merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp.
2010-03-26 14:22:48 -07:00
Benjamin Smedberg
755c2ae337
Bug 570488 - Stop reading/writing xpti.dat and incrementally loading XPT files [1/2] r=Mossop
...
--HG--
extra : rebase_source : 9f28729c1032b516e8b950d29d80402e87759fda
2010-06-14 16:05:48 -07:00
Brad Lassey
4346c1fc9c
bug 565138 - Implement extloader backend for Android r=vlad
2010-06-14 15:04:16 -04:00
Kyle Huey
27bc0ae3e6
Backing out Bug 531886 to fix l10n builds.
2010-06-14 11:16:43 -07:00
Kyle Huey
1fd06013ed
Backed out changeset f7323647892a
2010-06-14 11:14:36 -07:00
Benedict Hsieh
e801a49643
Bug 531886 - [regression] *.mfasl fastload caches not invalidated after build / changing XUL/JS code. r=bsmedberg
2010-06-11 12:02:13 -07:00
Michael Kohler
9397418412
Bug 506041 Part 2: Correct misspellings in source code
...
r=timeless
2010-05-13 14:19:50 +02:00
Oleg Romashin
33ee0e3aa8
Bug 554768 - More fixes for Qt widget port. r=dougt
...
--HG--
extra : rebase_source : 5547b3dbc7c89e5821d46af4be2a09bef4af6eec
2010-03-25 20:33:31 -04:00
Josh Aas
401484723c
Require Mac OS X 10.6 at runtime for 64-bit builds. b=553429 r=bsmedberg
2010-03-25 12:07:50 -04:00
Dave Townsend
b454969d34
Bug 553169: Make the platform talk to the extension manager without using a custom interface. r=bsmedberg
2010-04-29 13:11:23 -07:00
Ginn Chen
9cd7837bf1
Bug 562045 Firefox failed to start on Solaris if /usr/bin/diff is used r=bsmedberg
2010-05-04 15:56:04 +08:00
Nickolay Ponomarev
ed75422f99
bug 369147, "Warning: unrecognized command line flag -foreground" on launch
...
r=josh
Don't add the '-foreground' flag to the list of command line arguments if we're not restarting,
since no-one outside of XRE_main knows how to handle it.
2010-04-17 13:50:17 +04:00
Chris Jones
926e2f746f
Bug 544936, part 4: Move some common code for dealing with minidumps and .extra files into nsExceptionHandler. r=ted
2010-03-24 16:22:01 -05:00
Smokey Ardisson
34bc3d456b
Add support for an old type of Apple event so that preview from Dreamweaver (<= CS4) works again. b=549680 r=josh
2010-03-24 13:33:04 -04:00
Rob Arnold
fd95e7b700
Bug 563462 - Remove Photon bits from toolkit/ r=Mossop
2010-05-12 14:31:24 -04:00
Mike Hommey
7ef93c2266
Bug 448375 - Only depend on dbus-glib when needed. Depend on dbus instead [r=benjamin]
2010-04-24 09:39:53 +02:00
Jonathan Kew
51608a2869
bug 559473 - use a longer-lived autorelease pool to try and resolve intermittent crash during widget destruction. r=smichaud,joshmoz
2010-04-21 09:29:38 +01:00
Oleg Romashin
494639846e
Bug 553904 - Child tab process crashes on attempt to initialize child plugin process. r=bent.mozilla
...
--HG--
extra : rebase_source : 2a018b5f9c74a713e493643e611b330e08e1afd8
2010-04-20 21:43:51 +03:00
Oleg Romashin
b6732fc4d3
Bug 564770 - provide graphics system parameter for child processes. r=dougt
2010-05-24 14:21:52 +02:00
Mark Finkle
3c1a31730b
Bug 557642 - An option should be added to disable auto-rotation [r=dougt]
2010-04-07 23:01:56 -04:00
Michael Wu
ede652e594
Bug 543150 - Eliminate platform.ini checking in XRE_main, r=bsmedberg
...
--HG--
extra : rebase_source : 66d7259ae79d9df6e68f00fb29d2766bc14128a8
2010-04-07 12:44:38 -07:00
Jim Mathies
f6dc2fd7ce
Bug 563381 - Sync AppUserModelID with plugin-container. r=bsmedberg.
2010-05-14 19:25:10 -05: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
Ben Newman
b3cb7ea79d
Bug 516522 - CPOW: Cross-Process (JavaScript) Object Wrapper. r=mrbkap r=bent sr=jst
2009-11-06 12:43:39 -08:00
Doug Turner
b6fe4bd112
today is two merge monday
2010-03-22 22:05:25 -07:00
Jim Mathies
a149cb14ad
Bug 545149 - Fix various issues with winless plugin context menus. r=bent.
2010-03-22 22:06:35 -05:00
Doug Turner
4956b23fb3
Merge with m-c
2010-03-18 21:53:17 -07:00
Chris Jones
ecaab71939
Backed out changeset bda8efa53512
2010-03-18 21:01:10 -05:00
Chris Jones
a9301cdf81
Bug 551392: Remove hack made unnecessary by unified build tiers. r=ted
2010-03-18 17:52:38 -05:00
Chris Jones
d7b8ead1aa
Bug 551392: Remove subprocess minidumps after they're grabbed to avoid spurious crash detection. r=ted
2010-03-18 17:52:36 -05:00
Doug Turner
85bd4fb391
Merge with mc
2010-03-17 10:37:32 -07:00
Doug Turner
16e2fd5fe7
Merge. manually merged. modules/plugin/test/testplugin/nptest.cpp, testing/xpcshell/head.js.
2010-03-10 19:13:35 -08:00
Doug Turner
d08632917d
Merge with mc
2010-03-08 10:09:55 -08:00
Oleg Romashin
b6226b7b19
Bug 549554 - MOZ_X_SYNC evn option does not work in MOZ_QT port, missing include. r=dougt
2010-03-08 19:28:15 +02:00
Oleg Romashin
0ebdd0b8fa
Bug 549554 - MOZ_X_SYNC evn option does not work in MOZ_QT port. r=dougt
2010-03-07 13:06:40 +02:00
Martin Stránský
42303779c0
Bug 237128 - Raise an alert window if a profile couldn't be loaded. ui-rjohnath, r=bsmedberg
2010-03-06 16:40:33 +01:00
Doug Turner
5daaf36bf1
Merge
2010-03-01 15:36:51 -08:00
Karl Tomlinson
0c4ca25ba9
resolve ambiguous call of overloaded ‘AppendInt(long unsigned int&)’ b=517133
2010-02-24 15:40:41 -08:00
Karl Tomlinson
c4c832b91b
b=517133 Get crash stats for X errors r=bsmedberg
2010-02-24 14:25:16 -08:00
Wolfgang Rosenauer
674a263a4f
Bug 547673 - Fix reading freed memory in XSMP handling. r=bsmedberg
2010-03-05 22:56:40 +01:00
Mark Banner
4296bc6a4a
Bug 550145 NS_APPSTARTUP_CONTRACTID should exist in nsToolkitCompsCID.h and not nsXPFEComponentsCID.h (kill nsXPFEComponentsCID.h). r=benjamin
2010-03-05 12:11:55 +00:00
Mike Kristoffersen
abdb2aa82c
Build bustage on Qt due to macro definition of malloc, realloc, etc. Most of this is just moving Qt #includes around. r=dougt
...
--HG--
extra : rebase_source : 9734e9e68754a6fc45bddbdc60bb5e898bb8cdb2
2010-03-04 13:51:42 -08:00
James Cook
2eda17d868
Bug 551149 - Compilation error on toolkit/xre/nsX11ErrorHandler.cpp. r=dougt
2010-03-17 08:31:49 +02:00
Oleg Romashin
bbad1c15f2
Bug 552013 - g_type_init required for conic initialization when building with Qt platform. r=dougt
2010-03-15 04:25:03 +02:00
Josh Aas
bcb41f783d
More Carbon usage cleanup. b=550787 r=bsmedberg
2010-03-10 14:30:11 -05:00
Karl Tomlinson
e81ca54c8f
resolve ambiguous call of overloaded ‘AppendInt(long unsigned int&)’ b=517133
...
--HG--
extra : rebase_source : bbe20660a15a645292bd802ab7e5d8db0124fbbd
2010-02-24 15:40:41 -08:00
Karl Tomlinson
6ed1f5d145
b=517133 Get crash stats for X errors r=bsmedberg
...
--HG--
extra : rebase_source : e9b2319a566ecb5a8a3cd6ba322df97e1ff3ffc8
2010-02-24 14:25:16 -08:00
Josh Aas
be159f2505
Require Mac OS X 10.5 on launch. b=548367 r=bsmedberg
2010-02-24 14:06:40 -08:00
Benedict Hsieh
8ccea46362
Bug 568348 - The extension manager should do extension install activities and write extensions.ini before the profile is started. r=Mossop
2010-06-11 12:02:44 -07:00
Josh Aas
e2b3518473
Simplify nsCommandLineServiceMac, make it easier to understand and faster. Remove unused code. b=542936 r=mstange r=bsmedberg
2010-06-08 18:26:12 -04:00
Phil Ringnalda
e560a670ad
Bug 552688 - Clean up .autoreg leftovers, r=bsmedberg
2010-03-13 00:03:27 -08:00
Zack Weinberg
54ad0fb73a
Bug 494117: Mechanically change 'ReParent' to 'Reparent' throughout the tree. r=bzbarsky
2010-04-01 23:07:43 -07:00
Mark Finkle
bdf7202871
Bug 541015 - Support rotating between portrait and landscape on N900 [r=karlt]
2010-04-01 09:58:42 -04:00
Oleg Romashin
b371b618cb
Bug 554911 - mozilla-runtime process hang and not closed properly after closing fennec UI. r=dougt
...
--HG--
extra : rebase_source : 5490b2acfe1980e372b7918cf36e8e771b2a0747
2010-03-30 07:34:37 -04:00
Chris Jones
49b89002de
Stub out OOP crashreporter on OS X. b=555714 r=josh
2010-03-30 13:32:53 -04:00
Benjamin Smedberg
3ad7eb7f3a
Merge mozilla-central into electrolysis.
2010-02-09 21:22:09 -05:00
Justin Dolske
0763c9dd9f
Bug 540532 - allow setting report submission preference via XPCOM. r=gavin, r=ted
2010-02-09 17:05:31 -08:00
Benjamin Smedberg
33745658c4
Merge mozilla-central into electrolysis
2010-02-09 11:39:28 -05:00
Tom Dyas
e1edb56dd0
Toolkit support for Mac OS X dock menu. b=415463 r=josh
2010-02-08 16:03:40 -06:00
Doug Turner
c5fb72ab64
Bug 543976 - Clean up Maemo defines. r=ted
2010-02-09 11:02:11 -08:00
Benjamin Smedberg
c4141662bb
Bug 516515 - Don't initialize XPCOM in plugin processes, r=cjones
...
--HG--
rename : ipc/glue/GeckoThread.cpp => ipc/glue/MozillaChildThread.cpp
rename : ipc/glue/GeckoThread.h => ipc/glue/MozillaChildThread.h
2010-01-31 22:19:21 -05:00
Benjamin Smedberg
6e31be0f2d
Merge mozilla-central into electrolysis.
2010-02-01 15:30:27 -05:00
Walter Meinl
4829f752d9
Bug 536343: Fix build bustage on OS/2 in nsSigHandles.cpp r=bsmedberg,dragtext
2010-01-30 07:48:32 -05:00
Chris Jones
6a65c0d728
Backout 8d0ad9632fd2
2010-01-26 20:09:04 -06:00
Chris Jones
7b53db6a22
Temporary debug spew for diagnosing Linux mochitest hang.
2010-01-22 12:53:18 -06:00
Oleg Romashin
959dec8b52
Bug 534644 - e10s: implement Qt ipc/chromium backend, part 2. r=benjamin.
2010-01-29 08:50:44 +02:00
Chris Jones
6daa8d74d4
bug 539552 - keep track of child process minidumps, offer pid based lookup API, write out .extra data in child minidump callback. r=ted,bsmedberg
2010-01-14 17:38:00 -05:00
Benjamin Smedberg
617c58608b
Merge mozilla-central to electrolysis.
2010-01-19 14:51:19 -05:00