Doug Turner
4719dd0705
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
Jason Duell
e7064f2be4
# User Michal Novotny <michal.novotny@gmail.com>
...
# Date 1277056918 -7200
Bug 537164 - e10s HTTP: caching. r=jduell, sr=biesi
2010-06-23 23:55:19 -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
Johnny Stenback
660ac78445
Merge of backout of fix for bug 572609. CLOSED TREE
2010-06-21 22:41:52 -07:00
Johnny Stenback
b5ac9ee398
Backed out changeset 82a21d443b5e
2010-06-21 22:39:53 -07:00
Johnny Stenback
63e3022e0d
Fixing bug 572614. Eliminate double hash lookups in document.getElementById(). r=jonas@sicking.cc
2010-06-21 19:59:37 -07:00
Johnny Stenback
6268e31519
Fixing bug 572609. Use faster version of GetElementById() from our C++ code. r=jonas@sicking.cc
2010-06-21 19:58:50 -07:00
Mounir Lamouri
8ec44938fc
Bug 568515 - xmp and plaintext element should be considered as HTMLElement, not HTMLSpanElement, r=sicking
2010-06-22 02:02:07 +02:00
Ms2ger
bb9993f59f
Bug 573340 - Remove unused declaration of nsGenericHTMLElement::Shutdown. r=jst
2010-06-22 14:44:36 +02:00
Josh Matthews
670215298c
Bug 564382 - Remove CPOWs from PContentProcess tree. r=olli
2010-06-17 14:10:14 -07:00
Oleg Romashin
a4467eb490
Bug 568632 - rename MozGetShmemContent to MozGetAsyncContext. r=joe
2010-06-08 13:27:24 -04: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
Ehsan Akhgari
5e0ac612eb
Bug 534785 - fix build bustage
...
(transplanted from 2875f9a693ae9c60cc07b0caf42451760ed6c657)
--HG--
extra : transplant_source : %28u%F9%A6%93%AE%9C%60%CC%07%B0%CA%F4%24Qv%0E%D6%C6W
2010-06-05 16:17:42 -04: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
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
Mounir Lamouri
a821ae13af
Bug 456229 - Implement <input type="search">. r=smaug sr=sicking
2010-05-17 12:20:22 +02:00
Mounir Lamouri
4b22b4cebf
Bug 456229 - tests for <input type="search">. r=smaug
2010-05-17 12:20:20 +02:00
Mounir Lamouri
c42409c3af
Bug 565538 - Add tests for the mozIsTextField API. r=ehsan
2010-05-17 12:20:15 +02:00
Chris Jones
9327ed8dcc
Merged m-c
2010-05-13 18:04:53 -05:00
Johnny Stenback
841261676e
Fixing bug 572609. Use faster version of GetElementById() from our C++ code. r=jonas@sicking.cc
2010-06-23 14:35:57 -07:00
Ehsan Akhgari
fafab966e3
Bug 572642 - Part 1: Allow comments, and disallow styles when pasting CF_HTML content; r=roc
2010-06-23 14:40:08 -04:00
Ehsan Akhgari
814b9f0c25
Bug 573527 - Correct the test for bug 404320; r=roc
2010-06-23 14:40:08 -04:00
Ms2ger
27a3b29543
Implement the figure element. r=jst+timeless+ehsan (Bug 573356)
2010-06-23 10:08:56 -07:00
Ivan Enderlin ext:(%2C%20Mounir%20Lamouri%20%3Cmounir.lamouri%40gmail.com%3E%2C%20Ms2ger%20%3Cms2ger%40gmail.com%3E)
4164b0645e
Implement the mark element. r=jonas+timeless (Bug 485377)
2010-06-23 10:08:56 -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
Peter Van der Beken
7f4e72d2de
Back out fixes for bug 560462 to fix orange.
...
--HG--
extra : rebase_source : afe96ede6fc605c656b746f6388d6144886b18ed
2010-05-11 19:20:03 +02:00
Chris Jones
509f3d2bfc
Backed out changeset eef17c173aaa
2010-05-13 17:24:30 -05:00
Peter Van der Beken
00ea1d430a
Try to fix orange from e2c5f6be2148
...
--HG--
extra : rebase_source : 148d9a1eef794af433373002effd47c12cce6e1c
2010-05-11 18:27:44 +02:00
Ehsan Akhgari
f58add9d96
Bug 336104 - "ASSERTION: no frame, see bug #188946 "; r=roc,dbaron
2010-05-21 16:36:42 -04:00
Doug Turner
8f97a20153
Merge with m-c. no hand edits
2010-04-29 21:04:50 -07:00
Neil Deakin
05e0d343e5
Bug 554635, followup fix to test as these objects are now focusable
2010-04-29 11:15:52 -04:00
Neil Deakin
b712f94f3c
Bug 554635, change default tabindex on object elements to 0, so that child documents can be focused, r=jonas
2010-04-29 10:14:05 -04:00
Mounir Lamouri
7dcf697f62
Bug 566983 - Intermittent failure in test_bug546995-4.html; r=ehsan
2010-05-21 14:13:09 -04:00
Justin Wood
21a58b5a03
Bustage fix for Bug 563668, correct typo.
2010-05-19 22:49:09 -04:00
Mounir Lamouri
13711c7774
Bug 563668 - "Be able to know if a form control is an input element or a button element from nsIFormControl" [r=bzbarsky]
2010-05-19 22:30:04 -04:00
Mounir Lamouri
ec44e2fb46
Bug 562932 - [Test Part] "Implement control attribute for label element" [r=sicking]
2010-05-19 22:28:10 -04:00
Mounir Lamouri
6b57ca1497
Bug 562932 - "Implement control attribute for label element" [r=sicking sr=smaug]
2010-05-19 22:28:10 -04:00
Mounir Lamouri
8fce62a6c6
Bug 377624 - [Test Part] "Implement the accept attribute for the form and file upload controls form "image/*"" [r=sicking, feedback=ehsan]
2010-05-19 22:28:08 -04:00
Mounir Lamouri
ee179078cc
Bug 546995 - Implement autofocus attribute. r=sicking, sr=smaug
...
--HG--
extra : rebase_source : b0f233cae75aa9182d6587b6d66d4cbebea1126c
2010-05-19 19:52:17 +02:00
Ehsan Akhgari
15c2238119
Bug 564461 - Change content editable count from a script runner; r=jst
2010-05-12 18:21:24 -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
Craig Topper
00d9a2b835
Bug 566808 - "DeCOMtaminate nsIStyleRule method signatures" [r=dbaron]
...
(transplanted from 9a7be1835b530c72a46069a5c3951b80b16804a3)
--HG--
extra : transplant_source : %9A%7B%E1%83%5BS%0Cr%A4%60i%A5%C3%95%1B%80%B1h%04%A3
2010-05-19 22:28:00 -04:00
Mounir Lamouri
0ca4165c8b
Bug 565904 - "HTMLOptGroupElement and HTMLOptionElement are not form controls but are listed in nsIFormControl" [r=smaug]
...
(transplanted from 8406214f84c8164c7b2583af1d2e8f2be522e75e)
--HG--
extra : transplant_source : %84%06%21O%84%C8%16L%7B%25%83%AF%1D.%8F%2B%E5%22%E7%5E
2010-05-27 06:51:00 -04:00
Mounir Lamouri
d51cd6c01d
Bug 565611 - ""ASSERTION: How did that happen?: 'form == aThisForm'" with <legend>" [r=bz, sr=smaug]
...
(transplanted from 0c87f407797d0bc7353049a52f5c705fc1d4ae67)
--HG--
extra : transplant_source : %0C%87%F4%07y%7D%0B%C750I%A5/%5Cp_%C1%D4%AEg
2010-05-19 16:33:00 -04:00
Mounir Lamouri
08963e09d2
Bug 569955 - Add a test to make sure that autofocus on input elements does not work if they don't have a frame; r=ehsan
2010-06-04 13:25:54 -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
Peter Van der Beken
a3f0b9002e
Fix for bug 560462 (Use fast unwrapping for more quickstubs) - add non-addrefing GetElementById and GetBody, add nsContentList-returning GetElementsByTagName(NS) and GetElementsByName. r=jst.
2010-04-19 17:41:38 +02:00