Henri Sivonen
e985ea0186
Bug 560256 - Ignore document.write() from external scripts when there is no proper insertion point. r=jonas.
2010-06-19 09:38:41 +03:00
Boris Zbarsky
bec14b24a7
Bug 577309 part 1. Fix the assertion in IsRootOfAnonymousSubtree to not fire on default insertion point content. r=sicking
2010-07-15 00:38:19 -04:00
Robert Sayre
38029f43fa
Merge mozilla-central to tracemonkey.
2010-07-12 20:42:21 -07:00
Mats Palmgren
2cc4e040ea
Make it possible to drag a non-selectable node again. b=574596 r=dbaron
2010-07-12 22:24:25 +02:00
Robert Sayre
34b4182b78
Merge mozilla-central to tracemonkey.
2010-07-08 18:15:52 -07:00
Neil Rashbrook
a50cec31b6
Follow up to bug 568691 - Fix some of the static windows build bustage that is due to various dependencies in layour widget and chrome. r=roc.
2010-07-08 09:01:28 -07:00
Robert Sayre
70fc03b113
Merge mozilla-central to tracemonkey.
2010-07-02 17:25:52 -07:00
Benjamin Smedberg
ab295cd35f
Bug 576540 - nsContentUtils::Init is getting the image loader module, which is initializing the graphics module before they expect to be initialized. This breaks the chain by lazily initializing the image loader and image cache from contentutils, r=joe sr=bz
...
--HG--
extra : rebase_source : cb612418b6e4be90bace1e69f5ff9432496687f7
2010-07-02 17:15:52 -04:00
Mitchell Field
eb1e793da7
Remove @status FROZEN and @status UNDER_REVIEW. r=bsmedberg
...
--HG--
extra : rebase_source : 7fab31a6b7898e05ff828482390846cc9ce2854d
2010-07-02 10:27:06 -04:00
Benjamin Smedberg
a249678c04
Final merge and landing of bug 568691 and dependent bugs to mozilla-central on a CLOSED TREE.
...
* bug 568691, register XPCOM components statically using manifests. r=mossop, with some test and build stuff r=vlad,sdwilsh
* bug 573557, rename categories with spaces to use hypens. r=jst
* bug 573739, Don't get the private browsing service during layout module initialization, r=ehsan
This initial merge does not include some work planned to land imminently:
* The extension manager still restarts. I need to solve a problem re-reading default preferences from extensions.
* MOZ_OMNIJAR is broken: there is a patch which I need to update in bug 568691.
* I will concurrently land a mobile-browser fix for component registration, but it may require some additional packaging changes.
2010-07-01 14:26:25 -04:00
wfernandom2004@gmail.com
e875574fed
Bug 575701 - build warning in nsDOMEventTargetWrapperCache.cpp
...
--HG--
extra : rebase_source : 7a70347e3eda412bb64020fd23a29c6cae1e17c2
2010-07-01 19:34:51 +03:00
Benjamin Smedberg
4d172dd53d
Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691.
2010-07-01 11:55:57 -04:00
Benjamin Smedberg
a2833452f8
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
Benjamin Smedberg
63c0077443
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
Benjamin Smedberg
762def30bb
Merge mozilla-central into the static-xpcom-registration branch.
2010-06-23 17:26:25 -04:00
Ehsan Akhgari
80133c9a6d
Bug 520189 - Correct the component IDs
2010-06-23 16:03:20 -04:00
Benjamin Smedberg
45af085fff
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
Olli Pettay
41b6035eee
Bug 568955 - Optimize nsDOMEvent::SetEventType, r=sicking
...
--HG--
extra : rebase_source : e98c945ce5e7b494bd2046efd6dc7b8379fabc51
2010-06-22 21:12:12 +03:00
Olli Pettay
5cac785da5
Bug 573422 - WebSocket .URL should be .url, r=sicking
...
--HG--
extra : rebase_source : 4dd3004568043ce8c3ec7e16f116de2639e3d6ee
2010-06-21 22:56:03 +03:00
Benjamin Smedberg
80b423e0a0
Bug 569644 - Query the plugin host directly when searching for MIME types, rather than using Gecko-Content-Viewer category manager registration, r=bz
2010-06-10 12:42:16 -04:00
Olli Pettay
8f81d70abb
Bug 566024 - Add a 'global' messageManager, r=jst
2010-06-10 12:26:19 +03:00
Olli Pettay
f48d7a4a08
Bug 574089 - Optimize ::GetInnerHTML, r=jst
...
--HG--
extra : rebase_source : 3ed1549eaa96d3ff3fe6bf2bb2562dd9e68fcc17
2010-06-26 23:39:56 +03:00
Ms2ger
991ef5697d
Bug 566776 - Some nsINode methods defined in nsGenericElement.cpp return nsnull as an nsresult. r=jst
2010-05-20 10:41:00 -04: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
Oleg Romashin
b8ab8239cd
Auto-merge with m-c b51803f3fdef
2010-06-25 08:30:40 -04:00
Doug Turner
4719dd0705
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
Jason Duell
1b0fefc8aa
Merged again from m-c to get latest bits and avoid deleted branch issue.
2010-06-22 17:57:09 -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
Josh Matthews
670215298c
Bug 564382 - Remove CPOWs from PContentProcess tree. r=olli
2010-06-17 14:10:14 -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
Oleg Romashin
b36fb69349
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04:00
Olli Pettay
58b4f71840
m-c to e10 merge
2010-05-24 17:45:59 +03:00
Mats Palmgren
4915b380e1
Bug 39098 - Elements with visibility:hidden, visibility:collapse, or display:none get copied to the clipboard. r=dbaron
2010-05-25 01:24:15 +02: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
Olli Pettay
61c8ca96ee
Bug 548847 - [E10s] forward modal (chrome) dialogs from content to chrome, r=jst
2010-05-17 14:25:22 +03:00
Chris Jones
9327ed8dcc
Merged m-c
2010-05-13 18:04:53 -05: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
Jim Mathies
dfb12206b9
Bug 513162 - Add 'top, right, bottom, left' margin support in nsAttrValue. r=smaug.
2010-06-24 21:01:07 -05:00
Mats Palmgren
fb69d7564f
Backout bug 39098 due to Tinderbox orange.
2010-05-21 18:28:39 +02:00
Mats Palmgren
96b6a1a45d
Bug 39098 - Elements with visibility:hidden, visibility:collapse, or display:none get copied to the clipboard. r=dbaron
2010-05-21 15:52:07 +02:00
Mounir Lamouri
6b57ca1497
Bug 562932 - "Implement control attribute for label element" [r=sicking sr=smaug]
2010-05-19 22:28:10 -04:00
Ehsan Akhgari
a87b134220
Bug 560647 - add startup timeline instrumentation; r=vlad
2010-05-19 19:22:19 -04:00
Ehsan Akhgari
d051ffeaed
Bug 534785 - Move the ownership of editor and selection controller from the text frame to the content node; r=roc,jst sr=roc
...
(transplanted from 2437636244f39bbdc7d20b062e2c978b9d85c239)
--HG--
rename : layout/reftests/forms/placeholder/placeholder-14.html => layout/reftests/forms/placeholder/placeholder-18.html
extra : transplant_source : %247cbD%F3%9B%BD%C7%D2%0B%06.%2C%97%8B%9D%85%C29
2010-04-21 16:17:41 -04:00
Jonas Sicking
0a93bbb190
Bug 564863: Speed up id/name handling by letting elements register/unregister themselves. r=smaug
2010-06-03 18:09:20 -07:00
Jonas Sicking
c46348bf73
Bug 564591: Speed up BindToTree/UnbindFromTree by only doing accesskey related work if the accesskey attribute is set. r=smaug
2010-06-03 18:08:57 -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
Vladimir Vukicevic
b99bb96c47
b=561168; convert canvas to use layers for rendering; r=roc,bas
2010-05-17 21:04:22 -07:00