b2c88178e3
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
93984b6736
m-c to e10 merge
2010-05-24 17:45:59 +03:00
2ed40cd772
Merged m-c
2010-05-13 18:04:53 -05:00
0dc0f3273e
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
c88906d971
Merge with m-c. no hand edits
2010-04-29 21:04:50 -07:00
1b26141a44
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
ffacce1072
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
609671cd8d
merge with m-c.
2010-04-26 23:17:51 -07:00
853793da4f
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
9a784d5dfd
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
a3c2b24aa1
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
8cd39f1f00
Merge mozilla-central
2010-04-16 01:34:35 -05:00
19845bed4d
merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp.
2010-03-26 14:22:48 -07:00
1525faa802
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
df91a46a76
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
3e049f0588
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
13ef0df01c
Bug 563462 - Remove Photon bits from toolkit/ r=Mossop
2010-05-12 14:31:24 -04:00
c8d89d57be
Bug 448375 - Only depend on dbus-glib when needed. Depend on dbus instead [r=benjamin]
2010-04-24 09:39:53 +02:00
ef03b912fb
Bug 551277 - Replace liboggplay YUV to RGB color conversion code - r=roc
2010-04-19 13:17:06 +12:00
8f38c0f6dc
bug 553635 - link libimgicon into libxul in gtk builds. r=bsmedberg
2010-03-20 12:14:15 -04:00
bb75ed49d1
Bug 516522 - CPOW: Cross-Process (JavaScript) Object Wrapper. r=mrbkap r=bent sr=jst
2009-11-06 12:43:39 -08:00
6b387f5757
Merge with mc
2010-03-08 10:09:55 -08:00
6fc8159e23
Bug 550468 - Fix support for Pango font engine on Qt platform. r=karlt.
2010-03-06 15:29:55 +02:00
c741a38e65
Merge
2010-03-01 15:36:51 -08:00
66e2a2f448
Merge from mozilla-central
2010-02-22 21:31:18 -06:00
90e5b2265a
Bug 441324, part 3: Configure and build changes for libmozalloc. r=bsmedberg
2010-03-03 23:02:57 -06:00
41619292af
Bug 544250 - Implement different rendering backends for Qt mozilla port. r=jmuizelaar.
2010-02-19 19:46:54 -08:00
f9507c5457
Bug 534425. Part 4: Implement nsDisplayList::Paint using layers. r=mats,sr=dbaron
2010-03-01 20:56:19 +13:00
2483c49b52
Bug 552222 Drop MOZ_XPFE_COMPONENTS / --disable-xpfe-components. r=ted
2010-03-23 20:33:51 +00:00
4d94fbf7a0
Bug 551277. Backed out changeset f9a11b9b2b9f
2010-04-06 18:10:02 +12:00
987e0e6294
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
8015642d58
Merge mozilla-central into electrolysis.
2010-02-09 21:22:09 -05:00
7892aabac9
Bug 543976 - Clean up Maemo defines. r=ted
2010-02-09 11:02:11 -08:00
3e75949842
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
120b9003b7
Merge mozilla-central to electrolysis.
2010-01-07 22:11:14 -05:00
96ee9be6b0
Re-add change accidentally removed during mozilla-central merge.
2009-12-21 12:24:06 -05:00
19c038b0b2
Merge mozilla-central to electrolysis
2009-12-21 10:22:07 -05:00
681d9954dd
Remove intl/uconv/ucvmath. Bug 483116, r=Masatoshi Kimura <YV03354@nifty.ne.jp>
2009-12-21 00:47:08 -08:00
c47450d9a7
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
677d4b14f9
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
705471067a
Bug 522299 - Electrolysis: Get windowless plugins drawing on win32. r=jmuizelaar.
2009-12-01 15:05:26 -06:00
d74c6776f3
Merge mozilla-central into electrolysis.
2009-11-19 12:41:46 -05:00
1d97bbb36a
Merge from mozilla-central.
2009-11-06 09:54:28 -05:00
83b31eb1d1
Bug 495674: Internet connection should be initiated if needed [r=biesi]
2009-11-18 10:20:45 -05:00
2b842a190f
build fix
2009-10-29 01:55:27 -05:00
c827f3a584
Electrolysis-plugin-only bookkeeping commit.
2009-12-15 20:33:05 -05:00
6aff9ddf72
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
9ae75c423f
Merge mozilla-central to electrolysis.
2009-10-20 12:08:28 -04:00
960781ec85
Merge mozilla-central to electrolysis to pick up bug 515436.
2009-10-12 10:51:38 -04:00
74559ddca4
bug 518126, part 2: add infrastructure for C++ tests of IPDL-generated code. r=ted,bsmedberg
2009-10-06 13:02:26 -05:00
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
Benjamin Smedberg
Boris Zbarsky
Simon Montagu
Jim Mathies
Mark Finkle