ca1f1776fe
Merge mozilla-central to tracemonkey.
2010-07-27 13:09:04 -07:00
b8d6ec6280
Merge mozilla-central to tracemonkey.
2010-07-20 15:07:03 -07:00
7aae25faf9
Bug 563106 - Tie XPConnect to compartments. r=jorendorff/gal/jst
2010-07-19 13:36:49 -07:00
c7841d117d
Bug 575795 - Clean up the nsIScriptContext interface to the global object to be able to split the work that nsIScriptContext::InitContext does out. r=jst
2010-07-15 15:16:29 -07:00
dd51c79fca
Merge mozilla-central to tracemonkey.
2010-07-12 20:42:21 -07:00
24dea5b72b
Bug 578150: Protect against the docshell loosing its document before we've had time to notify on it. r=mrbkap
2010-07-12 14:50:07 -07:00
2fd899ed0f
Merge mozilla-central to tracemonkey.
2010-07-02 17:25:52 -07:00
20178f3b8a
Bug 574778 - Disable intrinsic sizing for chrome documents when enabling fullscreen mode. r=smaug.
2010-07-19 16:47:41 -05:00
03a6a23a43
Bug 572656 - Remove the UI language from the UA string and navigator.appVersion. r=bz
2010-07-19 22:18:11 +02:00
6e287b8de2
Bug 566480 - Make dragging the menubar drag the window on GTK themes where that should work (and also fix GTK resize drags to initialize drag better). r=karlt,dbaron,enn,dao
2010-07-17 10:11:54 +02:00
667b7dd28a
Backing out revision e1d443d63be5 (bug 558306) in an attempt to fix test orange.
2010-07-15 12:30:53 -04:00
7f26df0943
Bug 558306 part 3. Switch DOM timeout code to TimeDuration/TimeStamp. r=jst
2010-07-15 09:59:24 -04:00
c2767e78d4
Bug 579782 - Deal with a null context when closing the window. r=jst
...
--HG--
extra : rebase_source : d74e368d3a834fa47b6d912d35f0d9c6a0d60b7b
2010-07-21 17:17:35 -07:00
4bd66cc35a
Bug 581072. Fix the handling of long timeouts across timeout suspend/resume and add APIs to suspend/resume timeouts from trusted script. r=jst
2010-07-22 17:33:37 -04:00
0017422d5d
Bug 558306 part 3. Switch DOM timeout code to TimeDuration/TimeStamp. r=jst
2010-07-15 09:59:24 -04: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
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
3405a47131
Bug 574740 - Rename nsIIndexedDatabaseRequest to nsIIDBFactory
...
Update interface names per specification.
r=bent
--HG--
rename : dom/indexedDB/IndexedDatabaseRequest.cpp => dom/indexedDB/IDBFactory.cpp
rename : dom/indexedDB/IndexedDatabaseRequest.h => dom/indexedDB/IDBFactory.h
rename : dom/indexedDB/nsIIndexedDatabaseRequest.idl => dom/indexedDB/nsIIDBFactory.idl
2010-06-28 09:44:30 -07:00
93984b6736
m-c to e10 merge
2010-05-24 17:45:59 +03: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
2ed40cd772
Merged m-c
2010-05-13 18:04:53 -05:00
e9a8268fd1
Bug 563556 - Cleanup nsGlobalWindow's alert/confirm/prompt. r=jst
2010-05-13 15:26:10 -07:00
1aca4c8153
Bug 552822 - IPC remoting of geolocation prompt. r=olli/r=jdm
2010-05-13 10:44:51 -07:00
4334db65c2
Bug 553413 - 'Implement Asynchronous parts of the Indexed Database API.' p=sdwilsh+bent, r=jst.
2010-06-23 12:46:08 -07: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
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
5f1e23b8db
Bug 546270 followup: sync code paths for File|Print & window.print(), to handle no-default-printer case. r=roc
2010-05-19 10:44:51 -07:00
927111fb28
Bug 549682 - Port the message-manager API to mozilla-central, r=jst
2010-05-18 15:28:37 +03:00
1c104f5606
Backout Bug 549682
2010-05-18 13:10:47 +03:00
c719bc6e84
Bug 549682 - Port the message-manager API to mozilla-central, r=jst
...
--HG--
extra : rebase_source : 45b28a7762428193873a636fa7d5108607f9e4a3
2010-05-18 11:52:24 +03:00
69e0aca09c
Bug 534149. Give each nsGlobalWindow a unique ID and expose the IDs on nsIDOMWindowUtils. r=jst
2010-05-10 21:12:35 -04:00
bd6bf48e7a
Merged m-c
2010-04-27 01:53:06 -05:00
bd232d2cb8
Replace direct instantiations of nsRunnableMethod with calls to the templatized NS_NewRunnableMethod function (part 3/3 of bug 558498). r=dwitte sr=dbaron
2010-04-20 16:21:35 -07:00
0fca4edc6c
Bug 564277, fix up various focus ring issues for html elements, r=smaug
2010-06-21 08:37:34 -04:00
e599b170aa
Bug 571438 - MayHavePaintEventListener fails for non-e10s message manager, r=jst
2010-06-16 14:43:36 +03:00
754fb4784e
Bug 568975 - m-c message manager slowed down event handling a bit, r=jst
2010-06-16 14:42:42 +03:00
b729e295a5
Merged with mozilla-central
2010-04-22 20:22:26 -04:00
b627649b3d
Bug 418521, improve the way focus indicators are displayed to correlate better with system behaviour, add -moz-focusring property to apply only when focus rings should be drawn, r=dao,jmathies,dbaron sr=neil
2010-04-21 10:53:42 -04:00
8cafa44858
Merged with mozilla-central
2010-04-07 06:59:04 -04: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
9fcac63662
Fix guard object used as temporary. (Bug 555099) r=mrbkap
2010-03-26 10:12:39 -04:00
6c0f59f4a6
Bug 506041 Part 2: Correct misspellings in source code
...
r=timeless
2010-05-13 14:19:50 +02:00
fd9001c409
Bug 554253 - Convert nsCOMPtr<nsPresContext> to nsRefPtr<nsPresContext>. r=roc
...
--HG--
extra : rebase_source : d828daca07188864d055f3d1a72f5217632eb358
2010-03-25 14:17:11 +01:00
fb534f9674
Bug 562971. Include Element.h as mozilla/dom/Element.h and don't use 'using namespace' quite as much. r=jst
2010-05-05 14:18:05 -04:00
e9bd55387a
Bug 563487. removeEventListener on a Window shouldn't throw if there's not listener manager yet; just do nothing. r=smaug
2010-05-05 14:18:04 -04:00
ac35089169
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
Robert Sayre
Blake Kaplan
Jonas Sicking
Jim Mathies
Dão Gottwald
Michael Ventnor ext:(%2C%20L.%20David%20Baron%20%3Cdbaron%40dbaron.org%3E)
Boris Zbarsky
Doug Turner
Jason Duell
Shawn Wilsher
Olli Pettay
Chris Jones
Justin Dolske
Ben Turner
Ehsan Akhgari
Ms2ger@gmail.com
Martin Stransky
Ben Newman
Neil Deakin
Oleg Romashin
L. David Baron
Michael Kohler
Craig Topper
Peter Van der Beken