Commit Graph

874 Commits

Author SHA1 Message Date
Jason Duell
ebaf20a075 bug 664860: Rename websockets mochi test. r=biesi
--HG--
rename : content/base/test/file_ws_basic_tests_wsh.py => content/base/test/file_websocket_basic_wsh.py
rename : content/base/test/test_ws_basic_tests.html => content/base/test/test_websocket_basic.html
2011-07-04 21:18:30 -07:00
Josh Matthews
79feb948a8 Bug 537787 - Update websocket test to use SpecialPowers. r=ctalbert try: -b do -p all -u mochitests -t none 2011-05-24 02:43:05 +03:00
Marco Bonardo
13b5cd08c3 Merge mozilla-inbound and mozilla-central 2011-07-02 10:39:08 +02:00
Kyle Huey
3d981011e9 Bug 661582: XHR.response should return a Blob, not a File. r=sicking 2011-06-30 14:42:15 -07:00
Matt Brubeck
27d39ad214 Back out 9fc0e6867256, 6947bbce9672, fb91a23bd158, a5870dd2ad7c, c3d3292fbd1e, 42f2aca1fde9 to fix Android failures on a CLOSED TREE 2011-07-01 11:20:52 -07:00
Marco Bonardo
d6c4314155 Merge last green changeset from mozilla-central to mozilla-inbound 2011-07-01 23:56:44 +02:00
Shawn Gong
552c301b28 Fixed bug 632255: implemented FileReader.readAsArrayBuffer() API. r=sicking 2011-06-30 17:50:44 -07:00
Jonas Sicking
08ce29756c Bug 649150: Make sure that all blobs and files sent using FormData have a filename in the encoded submission. r=mounir 2011-06-29 11:03:36 -07:00
Kyle Huey
e335bde887 Merge b-s to m-c 2011-06-30 18:10:40 -07:00
Kyle Huey
c0b3196c33 Bug 661582: XHR.response should return a Blob, not a File. r=sicking 2011-06-30 14:42:15 -07:00
Olli Pettay
209c56c874 Bug 666604 - Allow untrusted events to trigger a link, r=bz
--HG--
extra : rebase_source : e0b8510a039425c17a3d412241aa8f24df05558a
2011-06-30 14:52:11 +03:00
Josh Matthews
03e38d47bb Bug 553888 - Duplicate XHR request headers when following redirect. r=sicking 2010-03-22 14:52:35 +13:00
Joel Maher
3e18d9a843 Bug 664158 - move content/base/test/chrome/test_bug574596.html to mochitest-chrome. r=mats, a=test-only
--HG--
rename : content/base/test/test_bug574596.html => content/base/test/chrome/test_bug574596.html
2011-06-19 11:57:09 -04:00
Patrick McManus
b012dc160e bug 661036 - websockets allowed prohibited space character in protocol header, with test update r=biesi r=bsmith 2011-06-16 14:27:11 -04:00
Jonas Sicking
17ec46a39a Bug 659053 Part 1: Merge nsIDOM3Node into nsIDOMNode. Also removes Node.getFeature. r=peterv 2011-06-14 00:56:48 -07:00
Ted Mielczarek
a88f0715f0 merge m-c and b-s 2011-06-13 09:09:43 -04:00
Ted Mielczarek
c7f40506bf merge m-c to b-s 2011-06-10 12:58:21 -04:00
Wellington Fernando de Macedo
839d923f61 Bug 659559 - Speed up test_bug338583.html. r=smaug 2011-06-11 19:09:41 +02:00
Kyle Huey
2e0d728356 Merge m-c to b-s. 2011-05-31 15:29:32 -07:00
Mounir Lamouri
1ddcd22588 Bug 651902 - Make content/base/test/test_bug592366.html non flaky. r=hsivonen 2011-05-30 17:49:56 +02:00
Mitchell Field
5e5f1a616a Merge mozilla-central to build-system. 2011-05-29 14:10:30 +10:00
Kyle Huey
5b218f0873 Bug 656647: File constructor should take nsIFiles. r=sicking 2011-05-14 16:41:20 -07:00
Joel Maher
7317499f54 Bug 659315 - move content/base/test/*.xul to mochitest-chrome. r=jonas, a=test-only
--HG--
rename : content/base/test/test_bug339494.xul => content/base/test/chrome/test_bug339494.xul
rename : content/base/test/test_bug357450.xul => content/base/test/chrome/test_bug357450.xul
rename : content/base/test/test_bug571390.xul => content/base/test/chrome/test_bug571390.xul
2011-06-09 11:10:14 -04:00
Dão Gottwald
4e4ac318f3 Bug 658738 - remove event listeners in browser chrome tests 2011-06-07 16:45:26 +02:00
Kyle Huey
7c8feff73e Bug 661876: Fix tests to avoid using obsolete nsIDOMFile properties/methods. 2011-06-05 11:54:14 -07:00
Henri Sivonen
4fe663e3bc Bug 655701 - Remove test dependencies on the html5.parser.enable pref. r=ted.mielczarek. 2011-05-12 10:56:37 +03:00
Olli Pettay
5a3d01a7ee Bug 656218, document.activeElement should not throw, r=bz 2011-05-11 23:52:32 +03:00
Masatoshi Kimura
d304cf7c20 Bug 656253: Fix intermittent orange due to variables colliding. r=sicking 2011-05-11 11:06:47 -07:00
Mats Palmgren
3d592e7e8c Bug 638112 - Assertion failure: chars[length] == jschar(0). r=dbaron 2011-05-11 11:46:59 +02:00
Masatoshi Kimura
4d700c8562 Bug 649133: Implement xhr.mozResponse and xhr.mozResponseType. r=sicking 2011-05-10 16:18:55 -07:00
Jonas Sicking
75de75934d Bug 650493 Part 2: Simplify userdata by firing adoption handlers off of scriptrunners. r=smaug/peterv 2011-05-09 12:33:03 -07:00
Jonas Sicking
0e17979856 Bug 650493 Part 1: Simplify mutation events by firing all but DOMNodeRemoved off of script runners, and DOMNodeRemoved before starting any update batches or aquiring any state. r=smaug/peterv 2011-05-09 12:33:03 -07:00
Chris Pearce
ccae22ade2 Bug 650994 - Decode ogg packets lazily, timestamp them at demux time. r=doublec 2011-05-08 18:24:09 +12:00
Shawn Gong
d399113e9b Bug 658683: Make xhr.response not create a new ArrayBuffer every time it is accessed. r=sicking. Additional fixes by sicking, r=peterv 2011-05-23 18:09:28 -07:00
Mounir Lamouri
bbd24ff805 Back out bug 632255 and bug 658683 due to oranges on Windows Mochitest-1. 2011-05-24 15:45:53 +02:00
Shawn Gong
37f09837ec Bug 632255 - Implemented readAsArrayBuffer() for FileReader. r=sicking,bent. Additional fixes by sicking, r=peterv. a=sheriff. 2011-05-23 18:02:56 -07:00
Shawn Gong
e7ef1c6ccd Bug 658683: Make xhr.response not create a new ArrayBuffer every time it is accessed. r=sicking. Additional fixes by sicking, r=peterv 2011-05-23 18:09:28 -07:00
Jonas Sicking
4293ebbbed back out probably cause of orange. a=backout 2011-05-23 20:21:10 -07:00
Shawn Gong
fc7697ab0c Bug 632255 - Implemented readAsArrayBuffer() for FileReader. r=sicking,bent a=LandingQueue 2011-05-23 18:02:56 -07:00
Shawn Gong
6af29d61e1 Bug 658683: Make xhr.response not create a new ArrayBuffer every time it is accessed. r=sicking 2011-05-23 18:09:28 -07:00
Kyle Huey
db0b9d8ad8 Bug 553125: Use the structured clone algorithm for window.postMessage. r=bent 2011-05-23 11:53:31 -07:00
Kyle Huey
f2e72776ef Bug 657964: FileReader should throw when abort() is called and readystate is not LOADING. r=sicking 2011-05-23 13:04:45 -07:00
wfernandom2004@gmail.com
5963fbfd3b Bug 338583, implement EventSource, r=smaug,Ms2ger
--HG--
extra : rebase_source : 9dd6bbbc0d714fbafb2ed115c40cf7210b663b6a
2011-05-22 22:30:07 +01:00
Patrick McManus
c2f7522f58 bug 640003 - websockets, fixup tests for new server r=smaug r=biesi 2011-05-21 21:27:52 -04:00
Daniel Holbert
f3cc3a9d15 Merging cedar with mozilla-central. 2011-05-21 16:18:49 -07:00
Jonas Sicking
5a46947588 Add a test for bug 644069. r=bzbarsky 2011-05-20 16:21:27 -04:00
Kyle Huey
601d68ae79 Bug 648997: Implement BlobBuilder spec as MozBlobBuilder. r=sicking.
Note that there is one key difference between this implementation and the spec.  In this patch MozBlobBuilder.getBlob("content/type"); returns a Blob and clears the MozBlobBuilder.  In the spec the BlobBuilder is not cleared.  Thus,

let bb = new MozBlobBuilder();
MozBlobBuilder.append("foo");
let blob1 = MozBlobBuilder.getBlob("content/type");
// blob1 contains "foo"
MozBlobBuilder.append("bar");
let blob2 = MozBlobBuilder.getBlob("content/type");
// blob2 contains "bar", the spec says it should contain "foobar".

IMO, the spec behavior optimizes for the wrong case.  BlobBuilder will probably be used mostly as a one-shot API.  Additionally, the spec requires the BlobBuilder to hang on to potentially large amounts of memory between the getBlob() call and when the BlobBuilder is GCd.

These issues have been raised on the listserv.
2011-05-20 10:18:45 -07:00
Jonas Sicking
14b0c5d3de Back out another suspect just in case. CLOSED TREE. a=orange 2011-05-20 17:20:37 -07:00
Kyle Huey
0018d52058 Backed out changeset b8404a1d3153 2011-05-20 17:00:13 -07:00
Kyle Huey
7da7ee7e4b Bug 648997: Implement BlobBuilder spec as mozBlobBuilder. r=sicking.
Note that there is one key difference between this implementation and the spec.  In this patch mozBlobBuilder.getBlob("content/type"); returns a Blob and clears the mozBlobBuilder.  In the spec the BlobBuilder is not cleared.  Thus,

let bb = new mozBlobBuilder();
mozBlobBuilder.append("foo");
let blob1 = mozBlobBuilder.getBlob("content/type");
// blob1 contains "foo"
mozBlobBuilder.append("bar");
let blob2 = mozBlobBuilder.getBlob("content/type");
// blob2 contains "bar", the spec says it should contain "foobar".

IMO, the spec behavior optimizes for the wrong case.  BlobBuilder will probably be used mostly as a one-shot API.  Additionally, the spec requires the BlobBuilder to hang on to potentially large amounts of memory between the getBlob() call and when the BlobBuilder is GCd.

These issues have been raised on the listserv.
2011-05-20 10:18:45 -07:00
Shawn Gong
9fe184ef18 Bug 632255 - Implemented readAsArrayBuffer() for FileReader. r=bent,sicking 2011-05-20 10:17:28 -07:00
Joel Maher
6993636556 Bug 616999. Xpcshell manifest support; manifest files. r=ted, a=test-only 2011-05-20 11:54:01 -04:00
Masatoshi Kimura
ded3a051e0 Bug 649133 followup. Remove the 'moz' prefix on response/responseType, since Chrome has already shipped these unprefixed. r=sicking 2011-05-19 01:11:51 -04:00
Ms2ger
999f948236 Bug 529328 - Return undefined for out-of-bounds access through nsStringArraySH; r=smaug
This patch has no effect on CSSStyleDeclaration, as that never returns a void DOMString.
2011-05-30 13:35:52 +02:00
Ms2ger
3d548cfff7 Bug 611983 - Kill Document.createEntityReference; r=peterv 2011-05-29 10:33:35 +02:00
Jonas Sicking
5cf82091f0 Bug 588990: Remove lazy hashing of names to avoid walking full DOM. r=bz 2011-04-23 00:29:12 -07:00
Bjarne
6d9b57a589 Bug 648485 - Third attempt to fix intermittent failure in content/base/test/test_bug482935.html. r=ehsan 2011-04-20 21:42:09 +02:00
Ehsan Akhgari
9db49692dd Bug 650543 - Rewrite the test for bug 419132 to make it sane, and re-enable it; r=sicking 2011-04-16 19:39:42 -04:00
Ehsan Akhgari
9676a5023a Bug 492181 - test_plugin_freezing.html causes focus problems for the following test; r=roc 2011-04-16 19:39:43 -04:00
Ehsan Akhgari
680e9b757e Bug 649012 - Fix some flaky mochitests which rely on non-zero timeout values; rs=ted 2011-04-16 19:39:34 -04:00
Ehsan Akhgari
c1e4d5e196 Backed out changeset d407ee4dabcc because it causes some tests to go orange 2011-04-16 23:47:06 -04:00
Ehsan Akhgari
3938fc6c75 Bug 649012 - Fix some flaky mochitests which rely on non-zero timeout values; rs=ted 2011-04-16 19:39:34 -04:00
Kyle Huey
d0c0eab2e5 Bug 607114: Expose a File constructor to chrome script. r=sicking
--HG--
rename : content/canvas/test/image_yellow.png => content/base/test/chrome/fileconstructor_file.png
2011-04-13 19:41:34 -07:00
Jonas Sicking
913afe451c Bug 649672: Make File.slice arguments match Array.slice and prefix File.slice. r=khuey 2011-04-13 14:34:36 -07:00
Jonathan Kew
55114c659a merge backout of bug 585152 2011-04-13 14:35:39 +01:00
Jonathan Kew
20281c115e Backed out changeset 80451fb8f11c (bug 585152) as per discussion in the bug. 2011-04-13 14:35:06 +01:00
Mounir Lamouri
19e37abf7f Bug 648485 - Second try to fix intermittent failure in content/base/test/test_bug482935.html. r=ehsan 2011-04-12 15:50:25 -07:00
Paul Biggar
bc3d36f617 Bug 585152 - Reland Date.now() fractional changes, along with fixed tests. (r=jwalden,dolske,gavin, rs=jwalden)
For the tests, I put a Math.floor around anything which looked like it did string concatenation. In principal that was r+ by dolske and gavin, and jwalden r+ed the extension to the rest of the tests.

Backout policy: the jsdate.cpp changes can be backed out trivially. The test changes should backout cleanly, but we're not hosed if they don't.
2010-08-06 13:35:00 -07:00
L. David Baron
52ee86d378 Backout changeset b583111a88aa (bug 585152) for causing mochitest-browser-chrome orange on opt builds. 2011-04-12 01:29:41 -07:00
Paul Biggar
c0aeeea187 Bug 585152 - Reland Date.now() fractional changes, along with fixed tests. (r=jwalden,dolske,gavin, rs=jwalden)
For the tests, I put a Math.floor around anything which looked like it did string concatenation. In principal that was r+ by dolske and gavin, and jwalden r+ed the extension to the rest of the tests.

Backout policy: the jsdate.cpp changes can be backed out trivially. The test changes should backout cleanly, but we're not hosed if they don't.
2010-08-06 13:35:00 -07:00
Jonas Sicking
2fef5d7e2d Bug 645281: Don't assert if a CORS preflight response contains data. r=bz 2011-04-11 18:28:28 -07:00
Mounir Lamouri
78f5f9372e Bug 648485 - Trying to fix an intermittent failure in content/base/test/test_bug482935.html. r=ehsan 2011-04-11 16:55:16 -07:00
Christian Biesinger
040a8153c7 bug 643051 - document.cookie should only allow setting one cookie at a time
r=bz
2011-04-11 16:26:11 -07:00
Ms2ger
b502087317 Bug 604592 - Make Node.prefix readonly; r=smaug 2011-04-11 13:06:18 +02:00
Brandon Sterne
23fea2663f Tests for Bug 631040 - parse CSP default-src as equivalent to allow, r=jst,geekboy 2011-04-10 11:23:23 -07:00
Frédéric Wang
ded01a4e68 Update XML Entity Definitions for Characters - rang/lang (bug 603716); r=hsivonen,karlt 2011-04-08 11:56:43 -07:00
Peter Van der Beken
0ba34f47fc Fix for bug 626262 (Don't allow parent's ownerDocument to change during appendChild). r=bz.
--HG--
extra : rebase_source : a591ab1b85579ced5fc750253cf2204c5ca021f8
2011-02-07 15:36:16 +01:00
Simon Montagu
be96a9dc94 Remove UTF-32 encoder and decoder. Bug 604317, r=emk 2011-03-30 08:35:34 +02:00
Ehsan Akhgari
ca0a27ab24 Merge cedar into mozilla-central 2011-03-29 10:39:07 -04:00
Ms2ger
e1868789c3 Bug 628353 - Expose the DATA_CLONE_ERR constant on DOMException; r=jst 2011-03-28 23:32:11 -04:00
Jonas Sicking
c9ef093253 Bug 461066: Test for loadend firing correctly in CORS tests. r=smaug 2011-03-28 13:18:55 -07:00
Jonas Sicking
0647926fda Bug 644476 Part 1: Remove nsIXMLHttpRequest.openRequest now that it's equivalent to nsIXMLHttpRequest.open. r=smaug 2011-03-28 13:05:52 -07:00
Justin Lebar
776b8e6a2f Bug 585978 - Add SSE implementation of is-ascii check in nsTextFragment. r=derf,jst 2010-08-09 15:32:18 -07:00
Jonas Sicking
9dca224906 Bug 641706: Make SpecialPowers able to create a XHR object with full system powers. r=smaug 2011-03-17 09:19:13 -07:00
bjarne@runitsoft,com
d902fada99 Bug 482935 - Cancel() from OnStopRequest should not cause cache entry to be doomed; r=(dwitte, jduell). 2011-03-24 16:45:07 -04:00
Ehsan Akhgari
5553692d78 Merge mozilla-central into cedar 2011-03-24 10:54:50 -04:00
Phil Ringnalda
8031c780e6 Bug 628966 - test_bug428847.html (by way of file_bug428847-1.xhtml) loads http://www.mozilla.com/whatever.xsl over the network; r=sicking 2011-03-23 22:34:02 -04:00
Alex Vincent
6dbd14b725 Bug 635835 - Crash with nsTreeWalker::NextNode setting currentNode as JS object from chrome; r=sicking 2011-03-22 16:45:11 -04:00
Olli Pettay
01a16652cf Bug 461066 - Add support for XHR's loadend event, r=sicking
--HG--
extra : rebase_source : f4db116cdd195d0319189a5800ee991370649072
2011-03-24 15:22:03 +02:00
Brandon Sterne
429a96251a Bug 589457 - remove delay from test_x-frame-options response, r=ehsan, a=testonly 2011-03-17 09:21:13 -07:00
Phil Ringnalda
33ff68c875 Bug 641174 - Protect timer in script_bug602838.sjs from being eaten by GC, r=bz, a=test 2011-03-11 21:37:32 -08:00
Mounir Lamouri
29eb25883f Bug 621056 - Prevent the timer to be eaten alive by the GC. r=bz a=tests 2011-03-10 17:03:39 +01:00
Mounir Lamouri
4f4e2b1dc1 Bug 589502 - Don't use two images in content/base/test/test_bug421602.html to prevent race conditions. r=bz a=tests
Instead, use one image and finish the test if the load or error event happens.
If none of them happen, that means the test failed and it will properly time
out.
2011-03-09 19:43:02 +01:00
Bjarne Herland
befbd5cc3b Bug 634906: Allow Allow-Origin:null in CORS. r/a=sicking 2011-03-02 12:04:20 -08:00
Henri Sivonen
5bc865c4b0 Bug 636689 - Rename the HTML5 parser enablement pref and make it show in about:support. r+a=jst. 2011-02-25 18:23:02 +02:00
Mounir Lamouri
45af7761d9 Tests for bug 628938; r=smaug a=test-only 2011-02-23 17:14:44 +01:00
Doug Turner
ff1d41e7b6 Bug 631058 - Backing out changesets 0d43e33ce134 and 60d7b8a4c275. r=wes, a=backout-scary-stuff 2011-02-17 08:41:07 -08:00
Wes Johnston
39a572652e Bug 631058 - Part 2 -Only decode Only decode metadata for preload=metadata. This has the fix ups that cpearce requires. r=cpearce, a=blocking-fennec 2011-02-15 20:31:08 -08:00
Doug Turner
15b16004ce Backed out changeset 0000b936e5c6 2011-02-15 20:31:00 -08:00
Wes Johnston
d04cf02a60 Bug 631058 - Part 2 -Only decode Only decode metadata for preload=metadata. r=cpearce, a=blocking-fennec 2011-02-15 16:54:47 -08:00
Brandon Sterne
489b9b523d Bug 558431 - Make fetching CSP policy-uri asyn, r=jst, a=blocking-betaN 2011-02-15 09:05:02 -08:00
Doug Turner
cee16d2b7f Backed ou Johnston – Bug 631058 - Part 2 - Only decode metadata for preload=metadata. r=cpearce, a=blocking-fennec
changeset a8d213604ca6
2011-02-14 21:25:06 -08:00
Wes Johnston
1f8d9514ad Bug 631058 - Part 2 - Only decode metadata for preload=metadata. r=cpearce, a=blocking-fennec
--HG--
extra : rebase_source : 743cb30aea1bd8cb6e9a189b9142c5ef8abce964
2011-02-14 17:01:03 -08:00
Jonas Sicking
0d87556628 Bug 629982: Attempt to fix crashes due to too deep DOM trees by making GetBaseURI non-recursive. r=jst a=blocker 2011-02-10 23:47:00 -08:00
Justin Lebar
099591cc66 Bug 622088 - Make XHRs' referrers reflect changes to document's URI from history.push/replaceState. r=sicking, a=bz 2011-01-30 13:46:34 -08:00
Zack Weinberg
59157fdf7c Bug 631615: suppress CSS parser diagnostics in ParseSelectorString. r=dbaron a2.0=dbaron 2011-02-04 14:17:00 -08:00
Brandon Sterne
64d3a59630 Backed out changeset 9ce4d80efab6
Due to test failures, a=backout
2011-02-01 16:07:09 -08:00
Brandon Sterne
1a61fb546d Bug 558431 - make CSP policy-uri fetching asynchronous, r=jst, a=blocker 2011-02-01 15:17:06 -08:00
Jeff Walden
15fda24aa9 Bug 497869 - Future reserved words are syntax errors in strict mode. r=brendan 2011-01-22 17:46:22 -08:00
Jeff Walden
882117c5e3 Back out everything from the last several hours for turning into a disaster zone finally ending in total orange. r=return-to-sanity 2011-01-23 03:12:28 -08:00
Jeff Walden
0b1095570c Orange fixes, bad code using reserved words as identifiers. r=orange 2011-01-22 21:29:22 -08:00
Craig Topper
73b6ffbb8b Bug 625722 - Firefox freezes in Mozilla TreeWalker demo. r=sicking a=blocking2.0
--HG--
extra : rebase_source : 12a8f573fda08e2adcc613d12f2a1df07a0ef5ce
2011-01-15 11:00:50 -08:00
Jonathan Kew
ed55ace99d bug 607121 and bug 626180 - add sample non-Latin text to the test plugin description, to verify that we manage encodings properly. r+a=bsmedberg 2011-01-18 18:27:26 +00:00
Bjarne
8ac3bfeeb6 Bug 466080 - test for Make more things honor the LOAD_ANONYMOUS flag, r=jonas, a=test-only-change 2011-01-16 17:58:50 +01:00
Chris Jones
aff28173ab Bug 616841, part 3: "Localize" the messageManager JSContexts. r=smaug 2011-01-14 16:03:21 -06:00
tim.taubert@gmx.de
cf66bdab78 Bug 484396 - XMLHttpRequest.open throws exception on empty string url parameter, r=smaug, a=bz
--HG--
extra : rebase_source : 73ce4b9fca63e9fd16acac65739fc71603ec843e
2011-01-14 18:11:25 +02:00
Boris Zbarsky
700105b822 Bug 619220. Allow <base> elements that are not direct children of the <head>. r=sicking 2011-01-14 10:34:39 -05:00
Brandon Sterne
ee35395716 Bug 589457 - add debug logging to test with random orange, r=jst, a=DONTBUILD 2011-01-11 18:59:23 -08:00
Serge Gautherie
e8f8328986 Bug 621414 - mochitests-1: test_fileapi_slice.html logs 12 _very_ (too) long lines; (Av1a) Better differentiate check logs, Stop generating raw-binary and/or over-long log lines.
rs=jonas a=(test only).
2011-01-05 12:35:55 +01:00
Boris Zbarsky
862401c75d Bug 622246. Just get our target off the event instead of relying on the ESM, since the ESM doesn't actually do what we want here. r=smaug, a=blocker 2011-01-03 20:46:19 -06:00
Boris Zbarsky
2fec7e82d8 Bug 622117. Fix flag collision. r=smaug 2011-01-03 20:46:19 -06:00
Serge Gautherie
50251ff807 Bug 621347 - [SeaMonkey, WINNT 5.2, Debug] mochitests-1: intermittent "test_ws_basic_tests.html | Test timed out"; (Bv1) Add/Re-enable '.wasClean' checks from (bug 573227 ->) bug 572975.
r=Olli.Pettay a=(test only).
2011-01-03 14:56:40 +01:00
Serge Gautherie
002c3d2aac Bug 621347 - [SeaMonkey, WINNT 5.2, Debug] mochitests-1: intermittent "test_ws_basic_tests.html | Test timed out"; (Dv1a) testWebSocket4(): stop generating a 450 KiB log line from bug 562681.
r=Olli.Pettay a=(test only).
2010-12-30 08:32:33 +01:00
Boris Zbarsky
d089f0cfc2 Followup for bug 331959 to fix test orange. a=orange 2010-12-27 17:09:15 -06:00
Boris Zbarsky
853fd4d981 Bug 331959 and bug 127903. Make situations in which an anchor or submit control is nested inside another anchor and the inner thing is clicked trigger the inner thing, not both. r=smaug,gavin a=blocker 2010-12-27 14:42:10 -06:00
Serge Gautherie
0de654b121 Bug 621347 - [SeaMonkey, WINNT 5.2, Debug] mochitests-1: intermittent "test_ws_basic_tests.html | Test timed out"; (Av1) s/ok/is/ typo fix from bug 562681.
r=Olli.Pettay a=(test only).
2010-12-27 11:18:50 +01:00
Mounir Lamouri
a7db22e4cf Bug 590771 - Tests. r=sicking a=tests
--HG--
extra : rebase_source : 01a79b3592e61fc612c27e5218f0872c09d7f07d
2010-12-16 12:01:47 -08:00
Jonas Sicking
1926e406ed Bug 614583: Bail earlier when attempting to SetAttr when we don't have room for more attributes to avoid caching flags and attributes to get out of sync. r=jst a=blocker 2010-12-14 09:16:24 -08:00
Dão Gottwald
033b7bf086 Bug 618250 - Broken instanceof check in test_bug435425.html. r=sicking 2010-12-14 02:42:12 +01:00
Patrick McManus
6f686dee93 missed a test in 98d58c46e409 when disabling websockets. bug 616733. a=tests 2010-12-08 15:35:21 -08:00
Patrick McManus
725731c1fa Bug 616733: Disable websockets by default. r=peterv,jst a=beta8
Can be turned on by setting preference
network.websocket.override-security-block.  Websockets can only be used if
override-security-block and network.websocket.enabled are both set to true.

At a future time, with a more secure websocket protocol, the
override-security-block preference can be removed.

This action is based on the security concern over an HTTP cache
poisoning attack as described in
http://www.adambarth.com/experimental/websocket.pdf
2010-12-08 14:12:51 -08:00
Henri Sivonen
088379e8dd Bug 592366 - Do not execute scripts whose owner doc is not the doc of the inserter parser or not the owner doc at the time of starting the script load. r=jonas, a=blocking2.0-betaN. 2010-12-08 14:37:19 +02:00
Benjamin Smedberg
fc65836802 Bug 614015 - Add <browser>.messageManager property for both in-process and out-of-process tabs, r=gavin
--HG--
extra : rebase_source : f0419a400dc714bc52481959fc4712fdc50b5e88
2010-12-07 09:34:34 -05:00
Boris Zbarsky
244e009096 Bug 597345. Discard script preloads if the charset doesn't match. r=sicking, a=blocker 2010-12-07 08:54:50 -05:00
Ms2ger
7f800d51a7 Bug 613793 - Raise an exception when trying to append a child to a DocumentType; r=bzbarsky a=jst 2010-12-04 09:00:19 +01:00
Blake Kaplan
57a7d85970 bug 601803 - Support adopting a node cross-compartment. r=gal/jst, a=blocker 2010-11-15 17:21:25 -08:00
Boris Zbarsky
7f2bf265a9 Bug 605296 part 2. Make username/password stringify undefined to empty string. r=sicking, a=blocker 2010-11-30 13:18:15 -05:00
Boris Zbarsky
23c2b599dc Bug 614058. Fix regression in IsEqualNode. r=jst, a=blocker 2010-11-30 13:19:59 -05:00
Dave Townsend
7a0e0a5cd9 Backing out bug 614058, bug 609272, bug 478445, bug 499628, bug 605296, bug 608914 and bug 614724 due to potentially causing bug 615736 CLOSED TREE. a=backout 2010-12-01 11:01:56 -08:00
Dave Townsend
ad5534594c Backing out bug 605296 due to potentially causing bug 615736. a=backout 2010-12-01 10:57:14 -08:00
Boris Zbarsky
847733099f Bug 605296 followup: fix test to do the right thing on failure. a=orange 2010-11-30 16:19:40 -05:00
Boris Zbarsky
729bd9d4ac Bug 614058. Fix regression in IsEqualNode. r=jst, a=blocker 2010-11-30 13:19:59 -05:00
Boris Zbarsky
1a2b254c3a Bug 605296 part 2. Make username/password stringify undefined to empty string. r=sicking 2010-11-30 13:18:15 -05:00
Jonas Sicking
6948fc9a18 Bug 609030: Update createBlobURL/revokeBlobURL to it's final name. r=jst a=blocker 2010-11-23 00:50:55 -08:00
Henri Sivonen
be74c70467 Bug 606729 - Make sure a script with the src attribute is treated as an external script even if the value of the attribute is not a valid URL. r=jonas, a=blocking2.0-final. 2010-10-27 10:03:10 +03:00
Kyle Huey
9dd62aa901 Bug 602482: Update XHR forbidden headers to latest spec. r=sicking a=b:betaN
--HG--
rename : content/base/test/test_bug308484.html => content/base/test/test_xhr_forbidden_headers.html
2010-11-15 06:55:30 -05:00
Alex Vincent
17fbdcd463 b=601756 Tests for TreeWalker.nextSibling, previousSibling, as suggested by Traversal spec r=smaug a=test
--HG--
extra : rebase_source : c0119c7cd025ad199f2a1623843836eace58ea1c
2010-11-15 12:08:49 +13:00
Olli Pettay
9d39c329b9 Bug 608939 - XMLHttpRequest.statusText and getAllResponseHeaders shouldn't throw, r=sicking, a=sicking
--HG--
extra : rebase_source : 5dc42964f6a216c4f10127d0ad74fe52674601d7
2010-11-11 23:39:14 +02:00
Henri Sivonen
0e5c39fc7b Bug 599588 - Make scripts created by createContextualFragment() executable. r=jonas, a=blocking2.0-final.
--HG--
extra : rebase_source : cfe476ed6ac2b1ee4cc243034659290d1226bd42
2010-11-01 11:50:01 +01:00
Henri Sivonen
cf9b4bc5e6 Bug 602838 part 2 - Make script-created scripts (incl. scripts that have lost their parser-insertedness) default to .async=true. r=jonas, a=blocking2.0-beta8.
--HG--
extra : rebase_source : 8488bca56232504b1510e92b52f2567fa42eaf99
2010-10-27 15:04:09 +03:00
Henri Sivonen
0f8fe9dae5 Bug 602838 part 1 - Execute in insertion order script-inserted external scripts that have the async DOM attribute reporting false. r=jonas, a=blocking2.0-beta8.
--HG--
extra : rebase_source : bfbbf7cf783a1d50a52896e5fe540aa7e84b2e0c
2010-10-13 10:12:55 +03:00
Michael Wu
30098037eb Backed out changeset 090046fc6891 bug 482935 due to a=orange 2010-11-10 19:29:51 -08:00
bjarne@runitsoft.com
b9e7d659bd Bug 482935 - Cancel() from OnStopRequest should not cause cache entry to be doomed;
(Av1f) Allow content to be cached if it was loaded successfully.
r=(dwitte, jduell) a2.0=benjamin.
2010-11-11 01:02:15 +01:00
Ehsan Akhgari
056fc8aba7 Backed out changeset c85c2f1b0566 because of oranges on mochitest-1 2010-11-10 17:46:32 -05:00
bjarne@runitsoft.com
c6a0351901 Bug 482935 - Cancel() from OnStopRequest should not cause cache entry to be doomed;
(Av1e) Allow content to be cached if it was loaded successfully.
r=(dwitte, jduell) a2.0=benjamin.
2010-11-10 22:28:54 +01:00
Ms2ger
6e7b3e0366 Bug 600175 - Run scripts inside noembed, iframe and noframes elements. r=sicking a=jst 2010-10-22 23:29:41 +02:00
Brandon Sterne
350eae7241 Bug 589457 - fix random orange in X-Frame-Options test, r=jst, a=blocking2.0 2010-11-05 09:33:08 -07:00
Henri Sivonen
6b5b74d541 Bug 604660 - Make XSLT-inserted script execute in the insertion order. r=jonas, a=blocking2.0-beta7.
--HG--
extra : rebase_source : fde633f62de8b4ec5af5c85f21c01ed4781e06e3
2010-10-27 10:18:24 +03:00
Sid Stamm
304fdb34e1 Bug 548949 - make CSP parse hostless schemes properly, r=dveditz, a=jst 2010-10-28 15:59:30 -07:00
Ted Mielczarek
7837112f8a bug 607205 - fix setTimeout usage in test_bug373181.xhtml. a=testonly 2010-10-26 08:24:08 -04:00
Mounir Lamouri
08ab79dbaa Bug 605982 - mozMatchesSelector should raise a SYNTAX_ERR exception on invalid selectors. r+a=bz 2010-10-21 16:09:00 +02:00
Dan Witte
3b44c6986f Bug 595305 - Factor cookie third-party URI code into separate API. Tests. r=bent, a=betaN+ 2010-10-19 09:37:03 -07:00
Ms2ger
b1bed27299 Bug 567350 - Make getComputedStyle's second argument optional; r=bzbarsky a=jst 2010-10-16 13:54:47 +02:00
Brandon Sterne
4defdf0722 Bug 581226 - fix assertion: DoContent returned no listener?: 'abort || m_targetStreamListener', a=blocking2.0 2010-10-14 15:26:59 -07:00
Brandon Sterne
ed2ecaca2e Bug 561051 - make CSP frame-ancestors and X-Frame-Options work with viewSourceChannels, a=jst 2010-10-14 15:25:00 -07:00
Olli Pettay
d7f424353c Bug 599590 - Attrib.value can return empty for case-sensitive attributes after calling removeAttribute, r=sicking, a=jst
--HG--
extra : rebase_source : 3c2c925ae51aca7d32bc3021cbbf1a43735d2035
2010-10-14 17:07:20 +03:00
Blake Kaplan
29e85b9844 Merge mozilla-central into tracemonkey 2010-10-13 17:54:54 -07:00
Jonas Sicking
e7e13b2084 Bug 575946: Implement File.slice. r=khuey sr=biesi a=beltzner 2010-10-13 16:25:33 -07:00
Peter Van der Beken
63f5a338e8 bug 580128 - Disallow cross-compartment adoptNode. r=jst 2010-10-10 15:42:09 -07:00
Mats Palmgren
d77715b9b2 Flush frames after the event handler so that new nodes inserted into the Selection are visible. b=602231 r=bzbarsky a=blocking2.0:final 2010-10-11 00:07:00 +02:00
Jonas Sicking
466c50688d Bug 600809: Make HTMLBaseElement.href work properly. r=smaug a=blocker 2010-10-07 09:39:01 -07:00
Jonas Sicking
d7a84f66da Bug 599300: Make FileReader work correctly for empty files. r=smaug a=blocker 2010-10-07 09:36:23 -07:00
Mounir Lamouri
689e2af38f Bug 600471 - Listen to the new content when an attribute is attached to it. r=bz a=blocking-2.0 2010-10-07 12:05:33 +02:00
Mounir Lamouri
d996cdbbd1 Bug 600468 - Remove attribute's first child when the value is set to the empty string. r=bz a=blocking-2.0 2010-10-07 12:05:04 +02:00
Mounir Lamouri
b162eb42cb Bug 600466 - Actually remove child when .removeChild() is called on attributes. r=bz a=blocking-2.0 2010-10-07 12:04:25 +02:00
Mounir Lamouri
bf1b804104 Bug 598877 - nsDOMAttributes should update mChild when value is set. r=bz a=blocking-2.0 2010-10-07 12:04:07 +02:00
Kyle Huey
7d306fa717 Bug 599966: Null check argument of window.createBlobURL to avoid crashing. r=sicking a=blocking-beta-8
--HG--
rename : content/base/test/test_bug543870.html => content/base/test/test_mozfiledataurl.html
extra : rebase_source : 43ce51487370b415340cb18de74e5bf0e718067f
2010-10-02 04:24:41 -04:00
Kyle Huey
9e6bf3758e Bug 599367: Set content type on moz-filedata channels. r=sicking a=blocking-beta-8
--HG--
rename : content/base/test/file_bug543870_doc.html => content/base/test/file_mozfiledataurl_doc.html
rename : content/base/test/file_bug543870_img.jpg => content/base/test/file_mozfiledataurl_img.jpg
rename : content/base/test/file_bug543870_inner.html => content/base/test/file_mozfiledataurl_inner.html
rename : content/base/test/file_bug543870_text.txt => content/base/test/file_mozfiledataurl_text.txt
rename : content/base/test/test_bug543870.html => content/base/test/test_mozfiledataurl.html
extra : rebase_source : f297d67ba4c75ce711b643577c69386c93c03bf8
2010-10-02 03:32:49 -04:00
Jonas Sicking
dcce0d0b40 Bug 592829: Make parsing code able to deal with element creation failing. r=jst/peterv a=blocker 2010-10-04 18:25:44 -07:00
Jonas Sicking
b082869298 Bug 597301: Add support for access-control-expose-headers. r=jst a=blocker 2010-10-04 18:25:44 -07:00
Jonas Sicking
bdf59c33ee Bug 597301: Update CORS to latest spec. r=jst a=blocker 2010-10-04 17:41:07 -07:00
Sid Stamm
9d063f0436 Bug 594446 - CSP report-uri should accept relative URIs [r=jst a=blocking2.0: beta7+] 2010-09-23 15:38:47 -07:00
Henri Sivonen
62878d9b2f Bug 591981 - Make script-inserted inline scripts run right away, make script-inserted external scripts behave like async scripts and make document.write writing an inline script return at a predictable time. r=jonas, a=blocking2.0-beta7. 2010-09-01 14:41:12 +03:00
Jonas Sicking
5d3b067a49 Back out bug 591981 since it causes bug 599583. a=backout 2010-09-27 16:23:33 -07:00
Jonas Sicking
5bb7c320a3 Back out bug 592829 due to crash. a=backout 2010-09-22 16:38:39 -07:00
Jonas Sicking
446e859c8d Bug 592829: Don't crash if we fail to create an element during XML parsing. r=jst a=beta7blocker 2010-09-22 14:51:46 -07:00
Henri Sivonen
27395b2f77 Bug 591981 - Make script-inserted inline scripts run right away, make script-inserted external scripts behave like async scripts and make document.write writing an inline script return at a predictable time. r=sicking a=blocking2.0-beta7 2010-09-21 12:48:40 -07:00
Jonathan Kamens
c6b4ee3abf bug 564737 - plaintext serializer shouldn't take care of leading spaces in a block. tests by David :Bienvenu. r=laurentj sr+a=jst 2010-09-21 15:02:55 +02:00
Olli Pettay
2340a6d11e Bug 594767 - importNode fails when using a document created with createHTMLDocument, r=sicking, a=blocking
--HG--
extra : rebase_source : 9436d96adf3450db23ddbde74407e440fec51846
2010-09-21 12:17:18 +03:00
Jonas Sicking
f161eca3e2 Back out bug 591981 to see if it caused a performance regression. a=backout 2010-09-20 15:47:57 -07:00
Brandon Sterne
0b89e8b60a Bug 593387 - "Get Add-ons" pane is being restricted by X-FRAME-OPTIONS. r=bz a=b 2010-09-19 17:59:59 +02:00
Benedict Hsieh
21844dc918 Bug 582840: Remove nsIWebProgressListener(2) support from TabChild and TabParent. r=smaug a=blocker 2010-09-17 19:11:05 -07:00
Jonas Sicking
311e9b33da Bug 587931: Don't fire error if a <script> is canceled. r=mrbkap a=jst 2010-09-17 16:08:03 -07:00
Henri Sivonen
1e21e4e21a Bug 591981 - Make script-inserted inline scripts run right away, make script-inserted external scripts behave like async scripts and make document.write writing an inline script return at a predictable time. r=jonas, a=blocking2.0-beta7.
--HG--
extra : rebase_source : 3d30baa42025c2d5e63b39586671345ae87bb0b2
2010-09-01 14:41:12 +03:00
Olli Pettay
8bf6fff13a Bug 313646 - synchronous XMLHttpRequest does not fire readystatechange event, r=sicking, a=sicking 2010-09-17 12:30:35 +03:00
Jonas Sicking
fd2c9c0694 Bug 587931: Implement document.currentScript and beforescriptexecute/afterscriptexecute events. r=mrbkap a=sicking 2010-09-16 01:48:47 -07:00
Jonas Sicking
e5a72459b6 Bug 596385: Update syntax for getting an url for a File to latest spec. r=jst a=blocker 2010-09-15 15:52:49 -07:00
Oleg Romashin
39a1341d97 Backout changeset 7eb93fe05d3a. bug 582840 due to oranges 2010-09-15 15:02:29 -07:00
Benedict Hsieh
5eacfcb973 Bug 582840 - Remove nsIWebProgressListener(2) support from TabChild and TabParent. r=Olli.Pettay a=blocking2.0
--HG--
extra : rebase_source : 764765bb56a218ec4b9be106eda1227156bf5181
2010-09-15 11:04:48 -07:00
David Zbarsky
e5944a3eba Bug 499656. Make nsContentList have dual atoms (original case and lowercase) so that we can match non-HTML elements in HTML documents correctly. r=sicking 2010-08-31 19:47:00 -07:00
Kyle Huey
3b982c261f Test for Bug 578096. a=test-only 2010-09-09 22:43:22 -04:00
Kyle Huey
a846b63dba Bug 583863: Refactor <input> implementation to deal with files that aren't on the disk. r=sicking a=blocking-fennec
--HG--
extra : rebase_source : 2b3605042aea4e4c8273cdad5ec7f05af15959cc
2010-09-05 14:00:05 -04:00
Kyle Huey
73e9690f8f Backed out changeset af1365b24066 2010-09-05 11:32:57 -04:00
Kyle Huey
bde906120c Bug 583863: Refactor <input> implementation to deal with files that are not on the disk. r=sicking a=blocking-fennec 2010-09-05 09:09:04 -04:00
Ms2ger
f57e7fa2e6 Bug 592827 - Implement DOMImplementation.createHTMLDocument; r=jonas approval2.0=jonas 2010-09-04 13:38:07 +02:00
Jonas Sicking
6bae28a4f7 Test for bug 590812. r=jst a=test-only 2010-09-03 15:53:28 -07:00
Jonas Sicking
c813c38eaf Test for bug 590870. r=jst a=test-only 2010-09-03 15:53:28 -07:00
Jonas Sicking
7dffdc6069 Bug 568188: Reduce refcounting by making the id-table hold weak referenes. r=smaug a=jst 2010-09-01 15:48:24 -07:00
Timothy Nikkel
4e58616c08 Bug 591435. Fix tests that were relying on there being no paint suppression in subdocuments. r=roc 2010-09-01 15:44:48 -05:00
Sid Stamm
c3f669047a Bug 558429 - CSP should accept relative policy-uri's, r=dveditz, a=jst 2010-08-25 08:35:27 -07:00
Jonas Sicking
5656569763 Bug 546857 Part 6: Disable XUL for pages, unless user specifically opts in for domain. r=jst a=blocker 2010-08-19 16:12:46 -07:00
Timothy Nikkel
7e065871d5 Fix message in test. r=philor a=tests-only 2010-08-21 21:29:08 -05:00
Jonas Sicking
1efbd766ca Back out bug 546857 Part 6 due to talos failures. a=backout 2010-08-19 18:41:58 -07:00
Jonas Sicking
1a06bd84dd Bug 546857 Part 6: Disable XUL for pages, unless user specifically opts in for domain. r=jst a=blocker 2010-08-19 16:12:46 -07:00
Benjamin Stover
cc95e5a376 Bug 575731: Make test more stable in the face of various themes. r,a=sicking 2010-08-19 13:08:48 -07:00
Vladimir Vukicevic
c820f5632e b=572522; add experimental mozArrayBuffer to XHR; r=jst, a=bsmedberg 2010-08-14 10:52:19 -07:00
Jonas Sicking
93c3158ba6 Bug 582228. Speed up getting style attributes. r=bzbarsky@mit.edu, a=dbaron@mozilla.com 2010-08-12 23:03:23 -07:00
Zack Weinberg
d32d8b4b6e Bug 338679: mark style declarations immutable if they are stringified. r=bzbarsky a=dbaron 2010-08-02 15:40:35 -07:00
Zack Weinberg
a6b8c9b603 Bug 569719 part 16: Don't refcount declarations and data blocks; don't have style rules hold direct pointers to data blocks. r+a=dbaron 2010-07-23 11:00:52 -07:00
Robert Sayre
72e587294e Backed out changeset e393b9673207. ( Bug 573803 - add SSL WebSocket support to mochitest. r=ted ) 2010-07-29 13:13:11 -07:00
Jonathan Griffin
ed48fbc343 Bug 573803 - add SSL WebSocket support to mochitest. r=ted 2010-07-29 10:23:58 -07:00
wfernandom2004@gmail.com
d5782a9534 Bug 578276 - websocket test suite is pretty flaky, r=smaug, a=benjamin
--HG--
extra : rebase_source : 73af3b9a4c48ed1ac89895412bc9868156d6f12e
2010-07-21 19:05:56 +03:00
Brandon Sterne
d6c74984ec Bug 475530 - X-Frame-Options w/ redirect to about:blank, r=jst 2010-07-21 08:51:09 -07:00
Vivien Nicolas
e5affe632f Bug 568818 - sendSyncMessage fails with 'SyntaxError: JSON.parse' if one of the listeners did not return a value [r=smaug] 2010-07-15 16:33:35 +02:00
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
Robert Sayre
5f4da6447a Comment out part of the flakiness in the websocket test. 2010-07-12 21:48:19 -07:00
Robert Sayre
340287d9dc Merge. 2010-07-12 20:42:43 -07:00
Robert Sayre
38029f43fa Merge mozilla-central to tracemonkey. 2010-07-12 20:42:21 -07:00
Robert Sayre
26b9651489 Push more logging. 2010-07-12 19:31:20 -07:00
Robert Sayre
85521f51a9 add yet more debugging info to the websocket test. 2010-07-12 17:47:53 -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
3d8f394691 tweak error formatting in flaky test 2010-07-11 16:21:18 -07:00
Robert Sayre
b2fcd75b57 add logging data for websocket test failure. 2010-07-09 15:58:52 -07:00
Michael Kohler
dab190d2bc Bug 506041 - Correct misspellings in source code (Patch 3)
r=timeless

--HG--
extra : rebase_source : 1917c999a5865676ffb7ec3c2834c3e091bb64dc
2010-07-07 15:33:52 +02:00
L. David Baron
f2a1d900ab Backed out changeset f0d3b958d38d (bug 552523) for causing 137-140 mochitest failures on the two mochitest runs (both Windows) that have completed so far. 2010-07-02 18:15:13 -07:00
Sid Stamm
15ea2fb656 Bug 552523 - enable CSP active and report-only modes simultaneously, r=dveditz 2010-07-02 15:26:35 -07:00
wfernandom2004@gmail.com
4f2270ce12 Bug 575293 - Fire the close event on WS when establishing the connection fails, r=smaug
--HG--
extra : rebase_source : 04d8d8db2ebc6174757357de109c30c0fdb24bfd
2010-07-01 19:35:57 +03: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
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
5cac785da5 Bug 573422 - WebSocket .URL should be .url, r=sicking
--HG--
extra : rebase_source : 4dd3004568043ce8c3ec7e16f116de2639e3d6ee
2010-06-21 22:56:03 +03:00
Ehsan Akhgari
15f38d3100 Bug 365805 - Copy/paste lists should not add #; r=jst 2010-06-21 15:56:18 -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
wfernandom2004@gmail.com
abe089666e Bug 572975, bug 573227, websocket fixes, r=smaug
--HG--
extra : rebase_source : d9b5160666ce18344abb47634fa94405c9c2d070
2010-06-28 00:09:29 +03:00
Geoff Lankow
cc4019ac75 Bug 300992 - implement readystatechange event. r=smaug, sr=jst 2010-06-24 13:12:07 +12: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
ba7b7616e3 Make use of SkipInvisibleContent flag to skip invisible content in Selection.toString(). r=dbaron b=564967 2010-05-25 01:24:15 +02: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
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