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
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
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
Honza Bambas
424bc30c44
Bug 569227 - Join HttpChannelChild with its TabChild, r=smaug
2010-06-18 12:49:28 +02: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
93849c0c9f
bustage fix for non-IPC
2010-05-25 11:58:38 +03:00
Olli Pettay
58b4f71840
m-c to e10 merge
2010-05-24 17:45:59 +03:00
Ehsan Akhgari
717347a6c6
Bug 567020 - Intermittent timeout in 343889-1.html, leading to the crashtest suite being aborted; r=jst
...
(transplanted from 44439c29d5b22d2b5da8b8ee86c270b18dc922fc)
--HG--
extra : transplant_source : DC%9C%29%D5%B2-%2B%5D%A8%B8%EE%86%C2p%B1%8D%C9%22%FC
2010-06-04 13:28:19 -04:00
Robert Sayre
91c79aee06
Merge tracemonkey to mozilla-central.
2010-05-24 16:27:35 -07: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
Robert Sayre
855a6ca0a4
Get rid of some js_AllocStack usage.
2010-05-24 10:23:47 -07:00
Michael Kohler
5f19df86e0
Bug 564091: Fix spelling of nonexistent across the tree. r=timeless
...
--HG--
extra : rebase_source : 4f15f7fd6f90926b77d136be83af7f22c5ffa830
2010-05-23 12:26:15 -07:00
Mounir Lamouri
06ad5cda45
Bug 551846. <select> size should default to 4 when 'multiple' attribute is present. r=smaug, sr=jst
2010-05-24 09:36:49 +12: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
df0addb92f
Bustage fix (Bug 548847)
2010-05-17 15:14:31 +03: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
e4786c8d43
Followup to bug 528146 for dom/ipc, and revert chome registry merge.
...
--HG--
rename : dom/ipc/ContentProcessThread.cpp => dom/ipc/ContentProcessProcess.cpp
rename : dom/ipc/ContentProcessThread.h => dom/ipc/ContentProcessProcess.h
2010-05-13 18:44:53 -05:00
Chris Jones
9327ed8dcc
Merged m-c
2010-05-13 18:04:53 -05:00
Henri Sivonen
2250d7a27c
Bug 534071 - Treat carriage returns as tab-like whitespace in layout. r=roc.
2010-05-12 10:57:12 +03:00
Daniel Holbert
733a6070b2
Bug 574049: Remove unused variable 'tabChildC'. r=smaug
2010-06-23 17:30:57 -07: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
80133c9a6d
Bug 520189 - Correct the component IDs
2010-06-23 16:03:20 -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
Ginn Chen
709634168d
Bug 569319 typedef caused mangled name mismatch for AddIDTargetObserver r=bz
2010-06-23 17:31:35 +08: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
Ehsan Akhgari
f58add9d96
Bug 336104 - "ASSERTION: no frame, see bug #188946 "; r=roc,dbaron
2010-05-21 16:36:42 -04:00
Jason Duell
84b443f1c0
# User Michal Novotny <michal.novotny@gmail.com>
...
# Date 1272456176 -7200
Bug 549241 - Channel classifier should run in chrome process. r=biesi, sr=jst
2010-05-21 14:03:02 -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
Jeff Walden
a8ac2fc31a
Bug 565604 - Typed-array properties don't work when accessed from an object whose prototype is a typed array. r=vlad
...
--HG--
extra : rebase_source : 6ac630f7a9d2cb04a9a996c2a675be41130ea2b1
2010-05-19 14:25:20 -07:00
Brandon Sterne
bcab21793a
Bug 515460 - enforce CSP during image redirects, r=joe
2010-05-20 13:08:02 -07:00
L. David Baron
92628a7652
Update assertion annotations in reftest/crashtest manifests now that bug 563536 is fixed. (Bug 472557)
2010-05-20 07:44:56 -07: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
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