Commit Graph

667 Commits

Author SHA1 Message Date
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
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
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
Ehsan Akhgari
80133c9a6d Bug 520189 - Correct the component IDs 2010-06-23 16:03:20 -04: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
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
Boris Zbarsky
9f46f37b84 Backed out changeset 90d627f2471e (bug 564979) because it broke mochitests. 2010-05-17 14:59:49 -04:00
Boris Zbarsky
f830440dab Bug 564979. Get rid of nsINode::GetSibling and just use GetNext/PreviousSibling instead. r=peterv, sr=sicking 2010-05-17 14:18:25 -04:00
Boris Zbarsky
e98cd67374 Bug 564574. Pass the first appended node to ContentAppended. r=jst, sr=sicking 2010-05-10 21:12:34 -04:00
Boris Zbarsky
6d68f7887f Bug 564432 part 2. Give nsINode a first-child pointer r=jst, sr=sicking 2010-05-10 21:12:34 -04:00
Boris Zbarsky
2a6505321c Bug 564432 part 1. Give nsINode next/previous sibling pointers. r=jst, sr=sicking 2010-05-10 21:12:33 -04:00
Doug Turner
ed6494b616 merge with m-c. 2010-04-26 23:17:51 -07:00
wfernandom2004@gmail.com
eac77c5f8b Bug 562681, websockets (protocol v76), r=smaug
--HG--
extra : rebase_source : 3fd1b153d688eba6fa6ffb499bc704dd9ca2a3c2
2010-06-17 21:36:01 +03:00
wfernandom2004@gmail.com
7b192188c1 Bug 472529, websockets (protocol v75), r=smaug+biesi
--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
extra : rebase_source : 44e45b23f85ec0095677233cdbd970c33b0c87b4
2010-06-17 21:34:24 +03:00
wfernandom2004@gmail.com
e1b3b326b5 Bug 472529, websockets (content patch)
--HG--
extra : rebase_source : 831a44f14acffa793cd3814d40a0d44bf152decb
2010-06-17 14:27:52 +03:00
Boris Zbarsky
8f5ac05aaf Bug 479655 part 2. Add element restyle flags. r=dbaron, sr=jst 2010-06-18 12:23:04 -04:00
Boris Zbarsky
f4cb58ddb5 Bug 479655 part 1.5. Free up two more element bits. r=jst 2010-06-18 12:23:04 -04:00
Peter Van der Beken
6fe7a598df Fix for bug 558973 ("ASSERTION: Nodes that are not documents, document fragments or elements can't be parents!"). r=jst.
--HG--
extra : rebase_source : 6d9f76e94457823bb425f546053f4d24e80aec5c
2010-04-15 10:28:57 +02:00
Blake Kaplan
453d23ad35 Fix bug 532730. r=jst sr=sicking
--HG--
extra : rebase_source : 0188a1388b4c82a55d29a54e08c91568b1ff817f
2010-04-27 15:39:52 -07:00
Justin Lebar
0897480e5e Bug 496275 - Expose JS API for modifying page's selection. r=mats, sr=jst 2010-04-28 19:47:23 +02:00
Oleg Romashin
87c511839e Merged with mozilla-central 2010-04-22 20:22:26 -04:00
Doug Turner
6c196f14e2 Automerge with mc. no manual changes 2010-04-21 03:31:13 -07:00
Neil Deakin
ceb1712f98 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
Chris Jones
09869cfb77 Merge mozilla-central 2010-04-16 01:34:35 -05:00
Oleg Romashin
8de514e284 Merged with mozilla-central 2010-04-07 06:59:04 -04:00
Ehsan Akhgari
a7ebcd12b9 Back out the editor lazy inititialization patches (bug 221820) to try to solve the orange in bug 557689 2010-04-06 21:08:58 -04:00
Doug Turner
c15f159231 merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp. 2010-03-26 14:22:48 -07:00
Benedict Hsieh
dfa9ca21a4 Bug 51470 - [E10s] The tab browser should inform the chrome process during navigation. r=smaug,
sr=bsmedberg
2010-03-26 11:39:39 -07:00
Timothy Nikkel
d0c1cab2a9 Bug 553366. When flushing, make sure to flush external documents too. r=bzbarsky 2010-04-10 13:03:40 -05:00