549ae22a9e
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
6e5944e4fe
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
3fed591ba3
m-c to e10 merge
2010-05-24 17:45:59 +03:00
fea6936df1
Merged m-c
2010-05-13 18:04:53 -05:00
7492065872
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
ddd12dbe18
Merge with m-c. no hand edits
2010-04-29 21:04:50 -07:00
899eb84928
Bug 534694 - Move the layout debug extension to layout/tools; r=ted,roc
...
--HG--
rename : extensions/layout-debug/Makefile.in => layout/tools/layout-debug/Makefile.in
rename : extensions/layout-debug/application.ini => layout/tools/layout-debug/application.ini
rename : extensions/layout-debug/chrome.manifest => layout/tools/layout-debug/chrome.manifest
rename : extensions/layout-debug/layoutdebug-prefs.js => layout/tools/layout-debug/layoutdebug-prefs.js
rename : extensions/layout-debug/makefiles.sh => layout/tools/layout-debug/makefiles.sh
rename : extensions/layout-debug/src/Makefile.in => layout/tools/layout-debug/src/Makefile.in
rename : extensions/layout-debug/src/nsDebugFactory.cpp => layout/tools/layout-debug/src/nsDebugFactory.cpp
rename : extensions/layout-debug/src/nsILayoutDebuggingTools.idl => layout/tools/layout-debug/src/nsILayoutDebuggingTools.idl
rename : extensions/layout-debug/src/nsILayoutRegressionTester.idl => layout/tools/layout-debug/src/nsILayoutRegressionTester.idl
rename : extensions/layout-debug/src/nsLayoutDebugCIID.h => layout/tools/layout-debug/src/nsLayoutDebugCIID.h
rename : extensions/layout-debug/src/nsLayoutDebugCLH.cpp => layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp
rename : extensions/layout-debug/src/nsLayoutDebugCLH.h => layout/tools/layout-debug/src/nsLayoutDebugCLH.h
rename : extensions/layout-debug/src/nsLayoutDebuggingTools.cpp => layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp
rename : extensions/layout-debug/src/nsLayoutDebuggingTools.h => layout/tools/layout-debug/src/nsLayoutDebuggingTools.h
rename : extensions/layout-debug/src/nsRegressionTester.cpp => layout/tools/layout-debug/src/nsRegressionTester.cpp
rename : extensions/layout-debug/src/nsRegressionTester.h => layout/tools/layout-debug/src/nsRegressionTester.h
rename : extensions/layout-debug/ui/Makefile.in => layout/tools/layout-debug/ui/Makefile.in
rename : extensions/layout-debug/ui/content/layoutdebug-overlay.xul => layout/tools/layout-debug/ui/content/layoutdebug-overlay.xul
rename : extensions/layout-debug/ui/content/layoutdebug.js => layout/tools/layout-debug/ui/content/layoutdebug.js
rename : extensions/layout-debug/ui/content/layoutdebug.xul => layout/tools/layout-debug/ui/content/layoutdebug.xul
rename : extensions/layout-debug/ui/jar.mn => layout/tools/layout-debug/ui/jar.mn
rename : extensions/layout-debug/ui/locale/en-US/layoutdebug-overlay.dtd => layout/tools/layout-debug/ui/locale/en-US/layoutdebug-overlay.dtd
rename : extensions/layout-debug/ui/locale/en-US/layoutdebug.dtd => layout/tools/layout-debug/ui/locale/en-US/layoutdebug.dtd
2010-04-23 15:03:22 -04:00
7bb880cfc7
Bug 566467 - fixed compilation with --disable-ipc. [r=ted]
...
(transplanted from 4153cd536a731cf51eb7b40693213b79b0fbe5ec)
--HG--
extra : transplant_source : AS%CDSjs%1C%F5%1E%B7%B4%06%93%21%3By%B0%FB%E5%EC
2010-05-21 07:21:00 -04:00
6126049649
merge with m-c.
2010-04-26 23:17:51 -07:00
458c305f0f
Bug 560147: Follow-up fixing non-libxul builds. This will include layers into thebes.dll, and ensure thebes.dll exposes the correct symbols. r=ted
2010-04-28 22:43:52 +02:00
5350023988
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
64be11b35e
Bug 558789 - Allow to build against system libevent [r=benjamin, r=cjones]
...
--HG--
extra : rebase_source : cd964ba40277ebd89dda8392c8a842ca9ef01bf8
2010-04-20 09:06:55 +02:00
2918f2e692
Merge mozilla-central
2010-04-16 01:34:35 -05:00
55aabe42b5
merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp.
2010-03-26 14:22:48 -07:00
cfef2dca56
Bug 553169: Implement InstallTrigger, the XPI content handler and confirmation for web triggered installs. r=robstrong, r=dveditz
2010-04-29 13:11:23 -07:00
6f886e44f9
Fix for bug 560199 (Link XPConnect and caps into layout). r=jst.
...
--HG--
extra : rebase_source : 5141822e9d560019ffc1e0cb0264782aa8aa7a99
2010-04-11 15:55:24 +02:00
69069feee2
Bug 544099 - Highly optimise -moz-box-shadow for common cases by allowing layout to specify an area where blurring is not needed r=roc,joe
...
--HG--
rename : gfx/thebes/src/gfxBlur.cpp => gfx/src/thebes/utils/gfxBlur.cpp
rename : gfx/thebes/public/gfxBlur.h => gfx/src/thebes/utils/gfxBlur.h
extra : rebase_source : d7ad7a1ee2ac9e25937133dba95f0f8d7347d612
2010-04-18 13:13:10 +10:00
f9f381c2e3
Bug 563462 - Remove Photon bits from toolkit/ r=Mossop
2010-05-12 14:31:24 -04:00
788fd0adf4
Bug 448375 - Only depend on dbus-glib when needed. Depend on dbus instead [r=benjamin]
2010-04-24 09:39:53 +02:00
37bf7a600b
Bug 551277 - Replace liboggplay YUV to RGB color conversion code - r=roc
2010-04-19 13:17:06 +12:00
3058b00e19
bug 553635 - link libimgicon into libxul in gtk builds. r=bsmedberg
2010-03-20 12:14:15 -04:00
8543260519
Bug 516522 - CPOW: Cross-Process (JavaScript) Object Wrapper. r=mrbkap r=bent sr=jst
2009-11-06 12:43:39 -08:00
02a3a11d33
Merge with mc
2010-03-08 10:09:55 -08:00
4dbb6dc7a8
Bug 550468 - Fix support for Pango font engine on Qt platform. r=karlt.
2010-03-06 15:29:55 +02:00
122766f8d7
Merge
2010-03-01 15:36:51 -08:00
b4affb74dd
Merge from mozilla-central
2010-02-22 21:31:18 -06:00
cb3531ba5d
Bug 441324, part 3: Configure and build changes for libmozalloc. r=bsmedberg
2010-03-03 23:02:57 -06:00
4b8146c17f
Bug 544250 - Implement different rendering backends for Qt mozilla port. r=jmuizelaar.
2010-02-19 19:46:54 -08:00
3aa2c14694
Bug 534425. Part 4: Implement nsDisplayList::Paint using layers. r=mats,sr=dbaron
2010-03-01 20:56:19 +13:00
1ede7f539b
Bug 552222 Drop MOZ_XPFE_COMPONENTS / --disable-xpfe-components. r=ted
2010-03-23 20:33:51 +00:00
34e3947015
bug 449292 - part 7 - implement gfxHarfBuzzShaper and provide pref to use this or platform back-end. r=jdaggett sr=roc
2009-10-07 18:16:52 +01:00
5158a6e2dd
Bug 551277. Backed out changeset f9a11b9b2b9f
2010-04-06 18:10:02 +12:00
e326281bb9
Bug 551277 - Implement software YCbCr conversion in layers, replacing liboggplay color conversion code - r=roc
...
--HG--
extra : rebase_source : 53b2c194aa6eb75a4751efdd83f066d3aeadf5d7
2010-04-06 12:07:39 +12:00
5a408883b5
Merge mozilla-central into electrolysis.
2010-02-09 21:22:09 -05:00
34f05ad210
Bug 543976 - Clean up Maemo defines. r=ted
2010-02-09 11:02:11 -08:00
ae9815018c
Bug 543079. Put system libs into OS_LIBS, not EXTRA_DSO_LDOPTS, when building libxul. r=ted
2010-02-09 12:09:06 -05:00
cde9d9ed96
Merge mozilla-central to electrolysis.
2010-01-07 22:11:14 -05:00
5f94eced9e
Re-add change accidentally removed during mozilla-central merge.
2009-12-21 12:24:06 -05:00
6f663c59a0
Merge mozilla-central to electrolysis
2009-12-21 10:22:07 -05:00
f164761fd9
Remove intl/uconv/ucvmath. Bug 483116, r=Masatoshi Kimura <YV03354@nifty.ne.jp>
2009-12-21 00:47:08 -08:00
588f9c3710
bug 529005: detect child process shutdowns vs. crashes, and expose this information to IPDL actors in a new |ActorDestroy(why)| interface. also ensure that subprotocol actors are notified of shutdown and cleaned up properly. r=bsmedberg r=bent
2009-12-03 02:16:28 -06:00
adf54bbb48
bug 525172: from IPDL specs generate .cpp files with method definitions instead of everything in .h files. r=bsmedberg
2009-12-03 02:16:09 -06:00
8aaa7248e8
Bug 522299 - Electrolysis: Get windowless plugins drawing on win32. r=jmuizelaar.
2009-12-01 15:05:26 -06:00
7e40d6c15f
Merge mozilla-central into electrolysis.
2009-11-19 12:41:46 -05:00
db5385a0a2
Merge from mozilla-central.
2009-11-06 09:54:28 -05:00
8b6f59e205
Bug 495674: Internet connection should be initiated if needed [r=biesi]
2009-11-18 10:20:45 -05:00
2e36838e6c
build fix
2009-10-29 01:55:27 -05:00
ee63070241
Electrolysis-plugin-only bookkeeping commit.
2009-12-15 20:33:05 -05:00
04c914e7a1
Don't reference IPC stuff when IPC is disabled in dlldeps-xul.cpp (hopefully will fix WinMo build).
2009-10-23 15:36:25 -04:00
1ddd6a47d6
Merge mozilla-central to electrolysis.
2009-10-20 12:08:28 -04:00
8fda4a36b6
Merge mozilla-central to electrolysis to pick up bug 515436.
2009-10-12 10:51:38 -04:00
8053393d5c
bug 518126, part 2: add infrastructure for C++ tests of IPDL-generated code. r=ted,bsmedberg
2009-10-06 13:02:26 -05:00
bb78c40ad1
Merge mozilla-central
2009-10-05 16:08:52 -07:00
6f1c8167d4
Backed out changeset 8cbc47eee659
2009-10-02 18:09:08 -05:00
2515107a6f
bug 441324: implement infallible ::operator new(), malloc() and friends. make |new Foo()| infallible, but leave |malloc()| fallible for the time being. r=blassey sr=bsmedberg,vlad
2009-10-01 21:50:09 -05:00
6c3f529f87
Merging mozilla-central once more to hopefully clear windows unit tests
2009-09-20 10:47:21 -07:00
fceecee8a4
Bug 495228 - Remove checks for mac MOZ_WIDGET_TOOLKIT, r=ted
2009-09-18 19:59:53 -07:00
7ea35a8a75
Bug 515578 - Kill some more xmlextras and webservices leftovers, r=ted
2009-09-18 19:59:52 -07:00
5eda952499
b=517559; remove runtime (startup) dependency on opengl32.dll, to fix Ts; r=mwsteele
2009-09-18 16:48:36 -07:00
4f7558fa2c
b=517557; remove --enable-canvas; r=ted
2009-09-18 16:48:35 -07:00
181f308c2e
Merge mozilla-central into Electrolysis.
2009-09-18 16:47:18 -04:00
236d65d30b
bug 521023: fix build bustage on Windows machines with ghetto dev environmants. r=ted
2009-10-07 13:58:41 -05:00
44a6cb73df
Bug 524083 libmozqcms, libmozcairo, libmozlixpixman are not in libxul's depends r=bsmedberg
2009-11-02 17:17:27 +08:00
4ca90fae1a
Bug 513924 - "remove tons of options from configure" [r=ted.mielczarek r=benjamin]
...
--HG--
extra : rebase_source : 2ca44f54f550507248b41c69c883090c389db419
2009-09-15 13:06:32 -04:00
a012e974e9
Bug 511290: Can't use standard file picker to upload files from user's Maemo File area [r=roc r=ted.mielczarek]
2009-10-15 14:38:10 -04:00
71a5587293
Bug 522126, part 3: Use POSIX-clock TimeStamp/TimeDuration implementation if configure.in says it's supported. r=luser
2010-01-07 11:21:33 -06:00
f123cf475c
comparing with ssh://hg.mozilla.org/mozilla-central
...
searching for changes
changeset: 38150:c823c17d12d2
user: Doug Turner <dougt@dougt.org>
date: Tue Feb 16 10:49:57 2010 -0800
summary: backing out 544250
2010-02-16 10:52:40 -08:00
9beecceb88
Bug 544250 - Implement different rendering backends for Qt mozilla port. r=jmuizelaar
2010-02-16 10:15:52 -08:00
e69f1e7331
Attempt to fix x86-64 build bustage by moving chromium_s after xpcom_core, r=ted
2010-02-11 16:09:41 -05:00
fe0b9938ed
b=513156; update Canvas 3D to implement WebGL (still disabled by default via configure); r=vlad
2009-09-02 17:47:49 -07:00
52304392d9
Rework ipcshell to become xpcshell
2009-08-28 16:16:19 -07:00
5e40a9c813
Rework chromium initialization, r=beast
2009-08-28 12:46:21 -07:00
8f00e422eb
Merge mozilla-central into Electrolysis
2009-08-26 12:15:27 -04:00
10336215f5
Fix build bustage
2009-08-25 16:39:30 -07:00
fd2302af3b
Bug 507218 - Expose the process type (chrome/content) to client code via XRE_GetProcessType and nsIXULRuntime, r=bent
2009-08-19 13:09:51 -04:00
e57dea9a05
Bug 512520 - remove Maemo geolocation providers. r=staurt
2009-08-25 15:08:56 -07:00
8b6dfa3638
Backing out bug 524083 - changeset 4bda2085ef8b. libxul builds are broken
2009-10-26 00:08:49 -07:00
abfbdf8128
Bug 524083 libmozqcms, libmozcairo, libmozlibpixman is not in libxul's depends r=benjamin
2009-10-26 14:28:21 +08:00
28fb767bd1
Followup to bug 398573 - remove REQUIRES from the tree since it is no longer used... automatically generated patch, rs=ted
2009-08-25 08:59:31 -07:00
e4afe98662
Bug 511326 Move libasound out of global OS_LIBS r=doublec
2009-08-21 10:08:18 +12:00
29a18e5ff3
Bug 457949 - no need for Stopwatch r=bsmedberg
...
--HG--
extra : rebase_source : 5cd3baecf54295012b28d42fc7bf4c9b34e12714
2009-08-28 11:03:51 -07:00
fdb74ffe70
Additional followup #3 to bug 398573 - remove more REQUIRES by fixing another bug in the script
2009-08-27 09:09:31 -07:00
c4ea86fa0e
Additional followup to bug 398573 - remove REQUIRES from the tree even when they are in makefile conditional blocks
...
--HG--
extra : rebase_source : cc65c34a414e6c67a5651fc9cf0b6bd709ebcdbd
2009-08-27 08:53:13 -07:00
3dd8206c84
Backed out changeset 7c0b5c2b3501
2009-10-13 16:20:11 -04:00
615edb63a2
Bug 511290: Can't use standard file picker to upload files from user's Maemo File area [r=roc r=ted]
2009-10-13 15:55:11 -04:00
93e1ae0620
Merge mozilla-central
2009-07-30 11:28:07 -07:00
00bac04909
Build and IPDL groundwork for the multi-process Jetpack API (bug 556846). r=bsmedberg
2010-06-25 08:00:35 -07:00
d7e4cb7fef
Merge mozilla-central into Electrolysis
...
--HG--
rename : modules/plugin/base/src/nsPluginHostImpl.cpp => modules/plugin/base/src/nsPluginHost.cpp
2009-07-20 09:36:23 -04:00
9c23ca0770
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
...
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-20 18:50:15 -07:00
d68a52239d
Because XRE_API hides function pointer declarations when XPCOM_GLUE is defined, don't use default values for function parameters
2009-07-16 12:23:33 -04:00
5d83a0f98b
Link against dbghelp.lib on Windows to satisfy requirements of chromium/src/base/debug_util_win.cc (SymInitialize etc). This means the build requires Windows XP at runtime (or the user has to install the debugging tools for Windows, but I'm pretty sure we're ok with dropping Windows 2000 support).
2009-07-16 11:41:19 -04:00
d93aefa911
add IPDL test harness and the mountains of code that entails. add |bool| type to IPDL. fix bugs in nascent async/sync channels.
2009-07-14 00:12:50 -05:00
74101c49a8
Adds the ipcshell application to test IPC
2009-07-11 02:33:10 -04:00
a6b2b59bb7
b=500472; flash activex shunt for Windows CE; r=jst
2009-07-16 14:13:29 -07:00
0b6d807330
Need to link with psapi.lib for GetProcessMemoryInfo (and skip -lrt on non-Linux)
2009-07-07 12:21:10 -04:00
c1211cb84c
Land the remote-tab code from tmp-electrolysis.
2009-06-30 16:39:22 -04:00
8919850d30
Plugins stuff: this code is equivalent to electrolysis-tmp revision 61cd9e89fd00, except that I had to merge forward a minor change to the plugin-loading code from Josh's cleanup.
2009-06-30 14:51:05 -04:00
897e6f190d
Build fixes: * enable RTTI by default when building with GCC to work around the tr1/functional error * link with -lrt * Tell chromium that it's always using wide wchar on Linux
2009-06-30 13:21:26 -04:00
b01e987259
Merge changes from mozilla-central to electrolysis
2009-06-30 12:04:18 -04:00
03a0a0cda0
Hook up the event loop changes and fix the build
...
--HG--
rename : ipc/chromium/src/base/file_version_info_linux.h.version => ipc/chromium/base/file_version_info_linux.h
2009-06-30 12:02:37 -04:00
Jason Duell
Doug Turner
Olli Pettay
Chris Jones
Ehsan Akhgari
Jacek Caban
Bas Schouten
Mike Hommey
Dave Townsend
Peter Van der Beken
Michael Ventnor
Rob Arnold
Chris Double
Ted Mielczarek
Ben Newman
Oleg Romashin
Robert O'Callahan
Mark Banner
Jonathan Kew
Benjamin Smedberg
Boris Zbarsky
Simon Montagu
Jim Mathies
Mark Finkle
Ben Turner
Phil Ringnalda
Vladimir Vukicevic
Ginn Chen
Mitchell Field
Mark Finkle
Mark Steele
Robin Bate Beorop
Doug Turner
Karl Tomlinson
Taras Glek
Joe Drew