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
c7973f9c79
Bug 571989 follow-up: remove mentions of removed directories from toolkit-makefiles.sh and elsewhere. r=dholbert
...
--HG--
extra : rebase_source : c6e387430e6b2292b0925fdb681819ba109568e7
2010-06-30 08:54:39 -07:00
bdb05f2495
On Windows and Mac, nsIFile.copyTo will fail if the file already exists. Use the .createUnique logic to create a unique name, but then remove it for the copy.
2010-06-29 23:24:09 -04:00
dfd8df1e8a
Fixes for more test failures from bug 568691 - the RTL tests dynamically register chrome which must be un-done: to do this, I register a manifest for the life of the app, but truncate it after this test is complete. The toolkit tag-autocomplete tests were failing because of a missing close-brace.
2010-06-27 17:04:45 -04:00
e15eaaca54
Fix a bunch of test failures caused by typos or other issues from bug 568691.
2010-06-27 14:03:05 -04: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
e358a123e2
Bug 574702: avoid initializing WindowDraggingUtils multiple times due to binding re-attachment (causes dragging jumpiness issues), r=enndeakin
2010-06-25 16:06:36 -04:00
caff3589e2
Bug 574230: PopupNotifications should indicate which anchor's notifications are being displayed, so that the consumer can show/hide the appropriate anchor element, r=dao
...
--HG--
extra : rebase_source : 8e856779d2355a5612d8bdf20c5fb75a3a88edb2
2010-06-25 12:05:45 -04:00
822ccb0789
Merge mozilla-central into the static-xpcom-registration branch.
2010-06-23 17:26:25 -04:00
2ea5d7e810
Bug 568691 fixups: alter mockObjects.js so that it registers its mock by contractID but doesn't replace the CID. Fix the generic classinfo not to assert when code asks for the class description (which is no longer implemented).
2010-06-23 15:18:13 -04:00
472a2979e7
Bug 565783: Eliminate bounce when scrolling tab bar. r=enndeakin,dolske
2010-06-23 10:28:12 -07:00
a08a79f3f4
Bug 572823, clear button open state when its popup is destroyed, r=neil
2010-06-21 08:37:35 -04:00
98103bb448
Bug 554810, use transparent resizer images, also fixes bugs 553752, 553796, 558201, 558203 and 563085, r=roc
2010-06-21 08:37:35 -04:00
17c5a5f186
whitespace cleanup after bug 555081
2010-06-29 17:11:49 +02:00
ed87cd6b53
Bug 575536 - Don't leak WindowDraggingElement into the global scope. r=enn
2010-06-29 17:09:32 +02:00
d65b7b93da
Bug 555081 - Add support for titlebar mouse interaction and address missing aero features. r=jmathies, smaug, vlad.
2010-06-28 01:04:05 -05:00
321694e97f
Bug 574861 - Windows should never be movable in fullscreen mode. r=enn
2010-06-26 16:49:15 +02:00
30028d7f0e
Bug 571640. Part 3. In window_browser_drop.xul make the html element draggable so drag and drop works. r=enndeakin
2010-06-25 16:51:17 -05:00
23c417301c
Bug 571640. Part 2. In test_findbar.xul use an image source node so we can start a drag. r=enndeakin
2010-06-25 16:51:17 -05:00
b5fc18f20b
Bug 571640. Part 1. Enhance synthesizeDrop to take a source element to start the drag on. r=enndeakin
2010-06-25 16:51:17 -05:00
9491e021f6
merge with mc
2010-06-30 10:50:45 -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
39a0145aea
Auto-merge with m-c b51803f3fdef
2010-06-25 08:30:40 -04:00
9c89be497e
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
85fd232cf1
Bug 573791 - Allow dragging the window with the empty space in the tab bar
...
r=Enn
2010-06-24 10:11:29 -07:00
ad9a008697
Bug 574227: don't stretch popup notification icons to full height, r=dtownsend
...
--HG--
extra : rebase_source : 2877c91789570db2f31467a218bb629dd1b571ad
2010-06-24 00:55:03 -04:00
f2e2f8381b
Bug 574228: PopupNotifications.show() secondaryActions argument should be optional, r=dtownsend
...
--HG--
extra : rebase_source : 2dd0050499632e00f238967fb4b5318e778196b7
2010-06-24 00:54:44 -04:00
c011332ae8
Bug 563730 - Implement pinTab, unpinTab. r=gavin
2010-06-24 16:29:02 +02: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
5a3f306961
Merge mozilla-central to tracemonkey.
2010-06-05 19:13:45 -04:00
349b408597
Bug 565943 - Intermittent timeout in test_bug253481.xul
2010-06-03 21:49:53 -04: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
578fc3cdd3
Bug 533592, part 1 - Remove uses of and support for xpcnativewrappers=no/yes in manifests. (The default has been yes for some time and we will now only have that behavior.) r=mrbkap.
...
--HG--
extra : rebase_source : 996d2abecb15f44293abd470a28a3fe2706e130e
2010-05-27 12:33:54 -07:00
2a3fb0fb81
Merge mozilla-central to tracemonkey.
2010-05-24 09:05:39 -07:00
8550fb091a
Bug 564091: Fix spelling of nonexistent across the tree. r=timeless
...
--HG--
extra : rebase_source : 4f15f7fd6f90926b77d136be83af7f22c5ffa830
2010-05-23 12:26:15 -07: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
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
308150b6d1
Bug 513162 - nsAttrValue margin parsing and chromemargin chrome tests. r=smaug, gavin.
2010-06-24 21:01:07 -05:00
51f395c646
Bug 513162 - Add tests for client coordinates of subframes. r=sdwilsh.
2010-06-24 21:01:06 -05:00
e66cbb615d
Bug 513162 - Fix for intermittent failure in test_titlebar.xul, due to left over focus listener. r=sdwilsh.
2010-06-24 21:01:06 -05:00
5c4ba8e9ce
Bug 377624 - "Implement the accept attribute for the form and file upload controls form "image/*"" [r=enndeakin,roc]
2010-05-19 22:28:01 -04:00
f074891823
Bug 554873, improve waitForFocus to check for about:blank pages, r=mak
2010-05-18 09:31:03 -04:00
22d6de21e3
On the theory that changeset 31fbc861bcb9 did not intend to back out the piece of changeset eb49e81b9f4d that touched this test, I'm going to put it back, and hope that it might fix some random orange (bug 572954).
2010-06-19 16:17:18 -07:00
Benjamin Smedberg
Zack Weinberg
Felipe Gomes
Gavin Sharp
Frank Yan
Neil Deakin
Dão Gottwald
Timothy Nikkel
Doug Turner
Oleg Romashin
Markus Stange
Jason Duell
Robert Sayre
Ehsan Akhgari
Olli Pettay
Jason Orendorff
Michael Kohler
Chris Jones
Jim Mathies
Mounir Lamouri
L. David Baron