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
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
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
b80392e005
Backout bug 564967.
2010-05-21 18:26:33 +02:00
Mats Palmgren
e3676dc03d
Make use of SkipInvisibleContent flag to skip invisible content in Selection.toString(). r=dbaron b=564967
2010-05-21 18:02:04 +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
Brandon Sterne
bcab21793a
Bug 515460 - enforce CSP during image redirects, r=joe
2010-05-20 13:08:02 -07: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
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
Doug Turner
ed6494b616
merge with m-c.
2010-04-26 23:17:51 -07:00
Olli Pettay
7c96db375c
Bug 573227, disable .wasClean tests
2010-06-19 20:39:53 +03:00
Olli Pettay
93add93aa6
Bug 573227, disable .wasClean tests
2010-06-19 19:39:38 +03:00
Olli Pettay
25b058bf0b
Bug 573227, disable .wasClean tests
...
--HG--
extra : rebase_source : 1c5e42ee6f80e94c40c212cf4b20caba0fdf7806
2010-06-19 19:25:00 +03:00
Olli Pettay
f514eb1df7
Bug 562681, disable failing tests
2010-06-19 15:13:18 +03:00
Olli Pettay
75898ffc0b
Bug 562681, increase test timeout
2010-06-19 14:20:31 +03:00
Olli Pettay
f304beafd1
Bug 562681, disable one test
2010-06-19 12:15:06 +03:00
wfernandom2004@gmail.com
f8e8fddd2c
Bug 562681, tests and small fixes, r=smaug
...
--HG--
extra : rebase_source : 0b4bb2f3c4b11101a0d97b546549c605297639c4
2010-06-18 23:48:42 +03:00
Olli Pettay
3cbeff1c30
Bug 562681, still few more tests
...
--HG--
extra : rebase_source : 6df90075366b2c7cd0b08de0d5d2e0f10aa68267
2010-06-18 11:29:15 +03:00
Olli Pettay
fb266ae68d
Bug 562681, add few more tests
...
--HG--
extra : rebase_source : 56149b462b52cf7ebb417143d0b9aa350c922daa
2010-06-18 11:13:46 +03:00
Olli Pettay
98068a032f
Some basic WS tests
...
--HG--
extra : rebase_source : 8d700930e3856b464e138782c501d3c4d617be2a
2010-06-18 00:30:13 +03:00
jgriffin@mozilla.com
0ae022ac6b
bug 570789, simple mochitest for websockets
...
--HG--
extra : rebase_source : e7523ef6e268b92d0e10ce7c530067fb69d97c0f
2010-06-17 21:38:29 +03:00
Jonathan Griffin
c9007c876b
Bug 570789. Remove some test files from the Makefile that were added mistakenly in previous patch.
2010-06-16 22:42:00 -07:00
Jonathan Griffin
ff0b54f0da
Bug 570789. Add WebSocket support to mochitest. r=ted
...
--HG--
extra : rebase_source : 2e33d054a13824d1a7e527777383820946684c3f
2010-06-16 22:38:55 -07:00
Mats Palmgren
f5cdcbb5d5
Call EnsureTextRun() and null-check GetTextRun() return value before using it. b=560780 r=roc
2010-04-28 19:47:23 +02:00
Henri Sivonen
9190145851
Adjust test for bug 515401 - Make test_bug515401.html pass with the HTML5 parser enabled. (orange fix)
2010-04-28 15:53:20 +03:00
Doug Turner
6c196f14e2
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
Chris Jones
09869cfb77
Merge mozilla-central
2010-04-16 01:34:35 -05:00
Olli Pettay
f61e2208ef
Bug 557892 - Crash [@ nsGenericElement::SetAttr], r=sicking
...
--HG--
extra : rebase_source : 55eae64fcad1d2ad4343b5ac0e70a26e67021722
2010-04-15 14:07:30 +03:00
Mats Palmgren
dcb7d49aa0
Test for bug 558726.
2010-04-14 16:55:21 +02:00
Geoff Lankow
9f6ee2918a
Skip -moz-user-select=none only when copying. Follow-up to bug 166235. b=558726 r=roc
2010-04-14 16:55:16 +02:00
Oleg Romashin
8de514e284
Merged with mozilla-central
2010-04-07 06:59:04 -04:00