d0f35f6883
Remove @status FROZEN and @status UNDER_REVIEW. r=bsmedberg
...
--HG--
extra : rebase_source : 7fab31a6b7898e05ff828482390846cc9ce2854d
2010-07-02 10:27:06 -04:00
9e28ed1f7d
Bug 576610 - Fix Android packaging with data driven compreg, r=vlad
2010-07-02 13:20:24 -07:00
b12eec77e4
Bug 564991. Part 6: Make BasicLayers support retained ThebesLayer contents. r=cjones,sr=vlad
2010-03-04 10:37:04 +13:00
a677e5bf91
Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691.
2010-07-01 11:55:57 -04:00
e17740e1ab
Merge mozilla-central to the bug 568691 branch.
...
--HG--
rename : gfx/public/nsITheme.h => gfx/src/nsITheme.h
2010-06-30 14:23:23 -04:00
6269858b35
Bug 575866 - Move GeckoInputConnection class into its own file, r=blassey
2010-06-29 21:13:44 -07:00
88738a4fea
Bug 573741 - Remove mComposing and let gecko keep track of composition state, r=blassey
2010-06-29 21:11:43 -07:00
29e089defb
Merge mozilla-central into the branch for bug 568691, including fixup of the new jetpack binary module.
2010-06-25 19:41:09 -04:00
4c0c23a8e3
Bug 574120 - Add IPC support to android embedding code, r=blassey
2010-06-25 13:12:03 -07:00
822ccb0789
Merge mozilla-central into the static-xpcom-registration branch.
2010-06-23 17:26:25 -04:00
0df0345c66
Merge mozilla-central into the "branch" for but 568691. The omnijar XPT/component/chrome registration was removed during this merge, and will be re-added to the component manager shortly.
...
--HG--
rename : content/base/public/nsIChromeRegistry.idl => chrome/public/nsIChromeRegistry.idl
2010-06-21 11:41:42 -04:00
0b5ca686bf
Bug 568691 - Fix up gtkmozembed for static XPCOM registration
2010-06-12 20:50:29 -04:00
170f5492c4
Bug 573800 - Coalesce soft KB shows/hides on Android, r=vlad
2010-06-22 17:11:02 -07:00
585347c343
bug 573669 - Suspend Gecko's event loop when onPause() is called by Android r=vlad
2010-06-22 11:22:31 -04:00
42a421267e
bug 567858 - Allow installation to SD card in Android 2.2 r=blassey
2010-06-22 10:42:28 -04:00
6ebe6803b1
Bug 567945 Android agent needs to build in mozilla-central r=ted
2010-06-21 14:26:55 -07:00
a7e67d32ad
Bug 568691 part B - mechanical changes to in-tree binary modules needed to get them building and registering correctly. After this patch, xpcshell appears to work.
2010-06-10 14:11:40 -04:00
0978149cf3
Backed out changeset db6f8068e9a5
2010-06-29 17:49:21 +02:00
c81affe35c
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedgerg
2010-06-29 17:14:36 +02:00
9b07aa174a
Bug 575421 - Improve 2D drawing path on Android, r=vlad
2010-06-28 23:42:28 -07:00
14eed6ac2e
Bug 456502 - nsFind::Find() calls StripChars() on a non-ASCII char. r=bsmedberg
2010-06-27 19:33:38 +02:00
5f25830c9f
b=573181; clean up render path on Android and prepare for GL layers rendering; r=mwu
2010-06-25 17:52:37 -07:00
9491e021f6
merge with mc
2010-06-30 10:50:45 -07:00
e280f83489
Bug 561457 - Fennec/e10s: Content process crash on shutdown [@nsDocShellTreeOwner::RemoveChromeListeners]. r=olli
2010-06-29 17:06:28 -07:00
840b7d952b
Merge from mc
2010-06-29 14:39:57 -07:00
e5c86fcd42
Merging with mozilla-central. Manually merged: content/canvas/src/nsCanvasRenderingContext2D.cpp ipc/ipdl/Makefile.in toolkit/toolkit-tiers.mk toolkit/xre/nsEmbedFunctions.cpp
...
--HG--
rename : gfx/thebes/src/gfxSharedImageSurface.cpp => gfx/thebes/gfxSharedImageSurface.cpp
rename : gfx/thebes/public/gfxSharedImageSurface.h => gfx/thebes/gfxSharedImageSurface.h
2010-06-28 16:33:19 -07:00
9c89be497e
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
4170a7ca93
bug 574412 - Add Logging to android life cycle callbacks r=mwu
2010-06-24 15:00:42 -04:00
e9ace04a4c
Merged again from m-c to get latest bits and avoid deleted branch issue.
2010-06-22 17:57:09 -07:00
386a098a89
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
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
2538039097
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04:00
93984b6736
m-c to e10 merge
2010-05-24 17:45:59 +03:00
2a3fb0fb81
Merge mozilla-central to tracemonkey.
2010-05-24 09:05:39 -07:00
b32027fed6
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
01e9dabdad
Backed out changeset b37bdb032fe7
2010-05-24 10:53:05 +12:00
0417d4868e
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
5da1b58f01
Merge mozilla-central to tracemonkey
2010-05-17 13:55:37 -04:00
cfd298a40d
Merged with MC. Hand merged netwerk/protocol/http/src/nsHttpHandler.cpp
...
also removed modules/plugin/default*
2010-05-17 08:59:15 -07:00
9bcbb60643
Bug 548847 - [E10s] forward modal (chrome) dialogs from content to chrome, r=jst
2010-05-17 14:25:22 +03:00
25ff9e8518
Bug 456229 - Implement <input type="search">. r=smaug sr=sicking
2010-05-17 12:20:22 +02:00
20c2e464f7
Backed out changeset efa8719a93d2
2010-05-21 16:34:23 +12:00
6391e1262a
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
576c1b9813
Bug 515460 - enforce CSP during image redirects, r=joe
2010-05-20 13:08:02 -07:00
db9d404619
Bug 560647 - add startup timeline instrumentation; r=vlad
2010-05-19 19:22:19 -04:00
154e6a9d62
Bug 474058 - Drop support for window.directories. r=jst
...
--HG--
extra : rebase_source : f0ee7974097fcc9db75b2928dae9b58cc3d8859b
2010-05-19 19:53:08 +02:00
bd24a96b5c
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
cb048d56cb
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
bba1a46bca
Bug 568249 - Support geolocation on Android, r=dougt
2010-06-04 14:14:43 -07:00
ae8f3c61f8
Bug 572605 - Handle intents/links from other apps while Fennec is already running, r=mwu
2010-06-18 10:42:51 -07:00
Mitchell Field
Michael Wu
Robert O'Callahan
Benjamin Smedberg
Brad Lassey
Matt Brubeck
Clint Talbert
Dão Gottwald
Saint Wesonga
Vladimir Vukicevic
Doug Turner
Josh Matthews
Jason Duell
Oleg Romashin
Olli Pettay
Robert Sayre
Mounir Lamouri
Brandon Sterne
Ehsan Akhgari
Ms2ger@gmail.com