c1b97654d7
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
b05c9d3e71
bug 574412 - Add Logging to android life cycle callbacks r=mwu
2010-06-24 15:00:42 -04:00
8b09ed7151
Merged again from m-c to get latest bits and avoid deleted branch issue.
2010-06-22 17:57:09 -07:00
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
d97ac3be80
Bug 573800 - Coalesce soft KB shows/hides on Android, r=vlad
2010-06-22 17:11:02 -07:00
34cb4428a7
Bug 567945 Android agent needs to build in mozilla-central r=ted
2010-06-21 14:26:55 -07:00
a0d6fb4166
bug 573669 - Suspend Gecko's event loop when onPause() is called by Android r=vlad
2010-06-22 11:22:31 -04:00
927ab80f30
bug 567858 - Allow installation to SD card in Android 2.2 r=blassey
2010-06-22 10:42:28 -04: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
91d5a62423
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04:00
3fed591ba3
m-c to e10 merge
2010-05-24 17:45:59 +03:00
c1d8e8dd2e
Merge mozilla-central to tracemonkey.
2010-05-24 09:05:39 -07:00
e969ef6689
Bug 564993. Part 5: Change ThebesLayer painting to be callback-based; move layer tree construction to FrameLayerBuilder. r=Bas,mats,sr=vlad
2010-05-21 15:20:48 +12:00
703f96671b
Backed out changeset b37bdb032fe7
2010-05-24 10:53:05 +12:00
e12a4be3a0
Bug 564993. Part 5: Change ThebesLayer painting to be callback-based; move layer tree construction to FrameLayerBuilder. r=Bas,mats,sr=vlad
2010-05-21 15:20:48 +12:00
58f0e99f4d
Merge mozilla-central to tracemonkey
2010-05-17 13:55:37 -04:00
6f853bbfda
Merged with MC. Hand merged netwerk/protocol/http/src/nsHttpHandler.cpp
...
also removed modules/plugin/default*
2010-05-17 08:59:15 -07:00
7f07f5a977
Bug 548847 - [E10s] forward modal (chrome) dialogs from content to chrome, r=jst
2010-05-17 14:25:22 +03:00
397561047a
Bug 456229 - Implement <input type="search">. r=smaug sr=sicking
2010-05-17 12:20:22 +02:00
1c2c867ca0
Backed out changeset efa8719a93d2
2010-05-21 16:34:23 +12:00
12b0f2fcbe
Bug 564993. Part 5: Change ThebesLayer painting to be callback-based; move layer tree construction to FrameLayerBuilder. r=Bas,mats,sr=vlad
2010-05-21 15:20:48 +12:00
94471e070d
Bug 515460 - enforce CSP during image redirects, r=joe
2010-05-20 13:08:02 -07:00
cb3b3e8e7b
Bug 560647 - add startup timeline instrumentation; r=vlad
2010-05-19 19:22:19 -04:00
d1af9263c1
Bug 474058 - Drop support for window.directories. r=jst
...
--HG--
extra : rebase_source : f0ee7974097fcc9db75b2928dae9b58cc3d8859b
2010-05-19 19:53:08 +02:00
d9df8728e1
Bug 565904 - "HTMLOptGroupElement and HTMLOptionElement are not form controls but are listed in nsIFormControl" [r=smaug]
...
(transplanted from 8406214f84c8164c7b2583af1d2e8f2be522e75e)
--HG--
extra : transplant_source : %84%06%21O%84%C8%16L%7B%25%83%AF%1D.%8F%2B%E5%22%E7%5E
2010-05-27 06:51:00 -04:00
3f9a268b69
Bug 565611 - ""ASSERTION: How did that happen?: 'form == aThisForm'" with <legend>" [r=bz, sr=smaug]
...
(transplanted from 0c87f407797d0bc7353049a52f5c705fc1d4ae67)
--HG--
extra : transplant_source : %0C%87%F4%07y%7D%0B%C750I%A5/%5Cp_%C1%D4%AEg
2010-05-19 16:33:00 -04:00
fa98381437
Bug 568249 - Support geolocation on Android, r=dougt
2010-06-04 14:14:43 -07:00
ca6d867bdd
Bug 572605 - Handle intents/links from other apps while Fennec is already running, r=mwu
2010-06-18 10:42:51 -07:00
736c6f6527
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
7a226dd549
bug 572249 - flush prefs on android app pause r=mwu
2010-06-17 17:33:15 -04:00
9355cc39f4
bug 571138 - Workaround not having PR_GetLibraryFilePathname r=mwu
2010-06-17 17:33:12 -04:00
19c4ba4f84
Bug 563274 - Overhaul nsIPrompt-related prompting code. r=gavin, sr=bs
...
--HG--
rename : toolkit/content/commonDialog.css => toolkit/components/prompts/content/commonDialog.css
rename : toolkit/content/commonDialog.js => toolkit/components/prompts/content/commonDialog.js
rename : toolkit/content/commonDialog.xul => toolkit/components/prompts/content/commonDialog.xul
rename : toolkit/content/selectDialog.js => toolkit/components/prompts/content/selectDialog.js
rename : toolkit/content/selectDialog.xul => toolkit/components/prompts/content/selectDialog.xul
2010-06-16 17:06:17 -07:00
07b7c6359e
Bug 564097 - Move prompts.properties into commonDialog.properties. r=gavin, sr=bs
2010-06-16 17:06:15 -07:00
e7932c2c70
Bug 568927 - Hide task on window minimize on Android, r=mwu,alexp
2010-06-16 10:20:54 -07:00
8ee5049518
bug 565138 - Implement extloader backend for Android r=vlad
2010-06-14 15:04:16 -04:00
a4dd60cb56
Bug 560643 - Add a special jsval type to XPIDL. Part 2, manual IDL cleanup. r+sr=jst.
...
--HG--
extra : rebase_source : 9529caa471dd4de9ddc9cedbab38922f9398011e
2010-05-12 08:19:22 -05:00
5063fb7171
Bug 557620 - Implement <input type="tel">. r=smaug,dolske,dao sr=sicking
2010-05-12 09:17:07 +02:00
fb3aad7f31
Bug 559537 - Under VS2010, fatal error occurs at atlcore.h. r=ted
2010-05-12 09:13:28 +02:00
1122c69800
Part 1 of fix for bug 560273 (Stop using DOM tearoffs from quickstubs) - add nsINode::GetBaseURI. r=sicking.
...
--HG--
extra : rebase_source : 5a07f12d9d13d92b796fd5f2cb182b069c3f87bf
2010-04-19 17:40:15 +02:00
9f7df8fbac
Bug 563114 - Remove nsINonBlockingAlertService. r=karlt, r=bsmedberg, sr=roc
2010-05-04 17:41:07 -07:00
4f010b3864
Bug 569948 - Remove NS_InitEmbedding because it was obsoleted long ago by XRE_InitEmbedding and it's a footgun, r=mfinkle sr=dougt
2010-06-08 11:34:30 -04:00
f2e02db786
Bug 260911 - fix 'hierarchy' misspellings. r=timeless
...
--HG--
extra : rebase_source : ea5fb9d2228966f1bd4eb10d8b5839988a758eaf
2010-04-29 21:01:11 +02:00
3d1b2b634a
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
91eefdbd21
Fix bug 532730. r=jst sr=sicking
...
--HG--
extra : rebase_source : 0188a1388b4c82a55d29a54e08c91568b1ff817f
2010-04-27 15:39:52 -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
6d277a77df
Bug 346485 - "Implement output element" [r=smaug,hsivonen,mrbkap,timeless,roc sr=jst]
2010-04-26 03:42:00 -04:00
25f9e2f9c3
Bug 561408 - "STL/XPCOM_GLUE build error in embedding/tests/winEmbed" [r=cjones] [a=dholbert_sheriff]
2010-04-23 10:50:00 -05:00
6964434bc1
Backed out changeset 7432d20f5b86
2010-04-23 16:34:06 +12:00
be21d8caff
Bug 346485. Implement HTML5 <output> element. r=smaug,hsivonen,mrbkap,sr=jst
2010-04-23 14:43:23 +12:00
0a2e06e4bb
Bug 557060: Interpose _Throw() on MSVC and centralize pseudo-throw code in mozalloc. r=ehsan sr=bsmedberg
2010-04-20 15:12:02 -05:00
Doug Turner
Brad Lassey
Jason Duell
Michael Wu
Clint Talbert
Matt Brubeck
Oleg Romashin
Olli Pettay
Robert Sayre
Robert O'Callahan
Mounir Lamouri
Brandon Sterne
Ehsan Akhgari
Ms2ger@gmail.com
Jesse Ruderman
Justin Dolske
Jason Orendorff
Edmund Wong
Peter Van der Beken
Benjamin Smedberg
Michael Kohler
Mitchell Field
Blake Kaplan
Bas Schouten
Chris Jones