Commit Graph

215 Commits

Author SHA1 Message Date
Luke Wagner
ed7ada6b7e Missed a cset (33addcc556b8) in backout 2010-08-16 22:38:05 -07:00
Luke Wagner
59422fe649 Backout 33addcc556b8 to c8bb41305006 (at the request of mrbkap) 2010-08-16 21:37:37 -07:00
Blake Kaplan
1ac4791c74 Bug 586157 - Deal with setting __proto__ on outer windows. r=jst 2010-08-13 17:05:18 -07:00
Blake Kaplan
3e81f7fd38 Bug 586083 - Make the outer window not be a global object. r=jst 2010-08-10 15:00:26 -07:00
Blake Kaplan
df5c4b507a Bug 585224 - Move the location object to the inner window (though still parenting the JS object to the outer). r=jst 2010-08-06 17:17:33 -07:00
Robert Sayre
ca10e5d657 Merge mozilla-central to tracemonkey. 2010-08-06 15:41:41 -07:00
Blake Kaplan
47dec9bca0 Bug 584260 - Delay creating the outer window JS object until the last possible second. r=jst 2010-07-26 18:08:26 -07:00
Blake Kaplan
8ddb90ded3 Bug 574975 - Split inner/outer scriptable helpers, make the outer window not global. r=jst. 2010-08-01 17:39:35 -07:00
Robert Sayre
55a8586519 Merge mozilla-central to tracemonkey. 2010-07-27 13:09:04 -07:00
Robert Sayre
1b744a7685 Merge mozilla-central to tracemonkey. 2010-07-20 15:07:03 -07:00
Blake Kaplan
de74d9d8f4 Bug 563106 - Tie XPConnect to compartments. r=jorendorff/gal/jst 2010-07-19 13:36:49 -07:00
Blake Kaplan
44fa338e2b 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
Robert Sayre
38029f43fa Merge mozilla-central to tracemonkey. 2010-07-12 20:42:21 -07:00
Jonas Sicking
9e951a5914 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
Robert Sayre
70fc03b113 Merge mozilla-central to tracemonkey. 2010-07-02 17:25:52 -07:00
Jim Mathies
77adb219fa Bug 574778 - Disable intrinsic sizing for chrome documents when enabling fullscreen mode. r=smaug. 2010-07-19 16:47:41 -05:00
Dão Gottwald
afad16ca0b Bug 572656 - Remove the UI language from the UA string and navigator.appVersion. r=bz 2010-07-19 22:18:11 +02:00
Michael Ventnor ext:(%2C%20L.%20David%20Baron%20%3Cdbaron%40dbaron.org%3E)
d512b62fb4 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
Boris Zbarsky
e303576a7b Backing out revision e1d443d63be5 (bug 558306) in an attempt to fix test orange. 2010-07-15 12:30:53 -04:00
Boris Zbarsky
060404cd82 Bug 558306 part 3. Switch DOM timeout code to TimeDuration/TimeStamp. r=jst 2010-07-15 09:59:24 -04:00
Blake Kaplan
97dcf454d5 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
Boris Zbarsky
537c1dce54 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
Boris Zbarsky
f804ac1643 Bug 558306 part 3. Switch DOM timeout code to TimeDuration/TimeStamp. r=jst 2010-07-15 09:59:24 -04:00
Felipe Gomes
8d9b3f1877 Bug 508906. Add experimental MozTouch events. r=smaug,jimm 2010-08-02 15:34:54 +02:00
Doug Turner
901e02b2de 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
Doug Turner
4719dd0705 Automerge w mozilla-central 2010-06-24 14:06:13 -07:00
Jason Duell
d194b9d486 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
Doug Turner
ded51c1c5f 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
Shawn Wilsher
8f3f92a5f4 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
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Doug Turner
3ad0032930 Merged with MC. Hand merged netwerk/protocol/http/src/nsHttpHandler.cpp
also removed modules/plugin/default*
2010-05-17 08:59:15 -07:00
Chris Jones
9327ed8dcc Merged m-c 2010-05-13 18:04:53 -05:00
Justin Dolske
c4ae810daf Bug 563556 - Cleanup nsGlobalWindow's alert/confirm/prompt. r=jst 2010-05-13 15:26:10 -07:00
Doug Turner
74337a6b6a Bug 552822 - IPC remoting of geolocation prompt. r=olli/r=jdm 2010-05-13 10:44:51 -07:00
Ben Turner
a283994c5f Bug 553413 - 'Implement Asynchronous parts of the Indexed Database API.' p=sdwilsh+bent, r=jst. 2010-06-23 12:46:08 -07:00
Doug Turner
fe405e740c 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
Doug Turner
8f97a20153 Merge with m-c. no hand edits 2010-04-29 21:04:50 -07:00
Ehsan Akhgari
a87b134220 Bug 560647 - add startup timeline instrumentation; r=vlad 2010-05-19 19:22:19 -04:00
Ms2ger@gmail.com
98d48c313e Bug 474058 - Drop support for window.directories. r=jst
--HG--
extra : rebase_source : f0ee7974097fcc9db75b2928dae9b58cc3d8859b
2010-05-19 19:53:08 +02:00
Martin Stransky
d8bf1bcb53 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
Olli Pettay
078f01ee1d Bug 549682 - Port the message-manager API to mozilla-central, r=jst 2010-05-18 15:28:37 +03:00
Olli Pettay
ebdab93b4c Backout Bug 549682 2010-05-18 13:10:47 +03:00
Olli Pettay
af68dc73cd 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
Boris Zbarsky
326e6cd9f3 Bug 534149. Give each nsGlobalWindow a unique ID and expose the IDs on nsIDOMWindowUtils. r=jst 2010-05-10 21:12:35 -04:00
Chris Jones
d53b8a18d0 Merged m-c 2010-04-27 01:53:06 -05:00
Ben Newman
941ed3332c 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
Neil Deakin
847d6ce201 Bug 564277, fix up various focus ring issues for html elements, r=smaug 2010-06-21 08:37:34 -04:00
Olli Pettay
fe69412640 Bug 571438 - MayHavePaintEventListener fails for non-e10s message manager, r=jst 2010-06-16 14:43:36 +03:00
Olli Pettay
cb4704d113 Bug 568975 - m-c message manager slowed down event handling a bit, r=jst 2010-06-16 14:42:42 +03:00
Oleg Romashin
87c511839e Merged with mozilla-central 2010-04-22 20:22:26 -04:00