Commit Graph

1180 Commits

Author SHA1 Message Date
Doug Turner
a8d2b069bc Bug 571166 - merge from e10s to m-c. r=various. sr=bz. CLOSED TREE. 2010-06-30 23:27:52 -07:00
Doug Turner
c92986c46a Merge from mc 2010-06-29 14:39:57 -07: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
Ehsan Akhgari
731ad4df41 Merge backout of changeset d1cbe16de6bf 2010-06-28 15:29:45 -04:00
Ehsan Akhgari
fb10e0a996 Backed out changeset d1cbe16de6bf to fix oranges 2010-06-28 15:29:30 -04:00
Ehsan Akhgari
47e64b8ff4 Bug 574558 - Part 3: Handle frame reconstruction duirng nsTextEditorState::SetValue gracefully; r=roc 2010-06-28 14:04:37 -04:00
Ehsan Akhgari
11dcb95e1d Bug 574558 - Part 1: Pass the correct content to ContentChanged; r=roc 2010-06-28 14:04:37 -04:00
Oleg Romashin
b8ab8239cd Auto-merge with m-c b51803f3fdef 2010-06-25 08:30:40 -04:00
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
Ms2ger
efa1edce8f Bug 573357 - Use the HTMLElement interface for more elements. r=jonas 2010-06-30 23:11:45 +02: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
Phil Ringnalda
bcd7a93200 Crash [@ MaybeSetForm] with html5.enable == false and <form><legend> 2010-06-06 16:49:00 -05:00
Ehsan Akhgari
1c4e5eae5f Bug 519928 - IFRAME inside designMode disables JavaScript, breaking current clickjacking defenses; r=Olli.Pettay
--HG--
extra : rebase_source : 7d01d90f59e60b63e64b96bb655937fe0d0c879a
2010-06-04 17:03:50 -04:00
Ehsan Akhgari
4ba6d6114b Bug 519928 - IFRAME inside designMode disables JavaScript, breaking current clickjacking defenses; r=Olli.Pettay 2010-06-04 17:03:50 -04:00
Peter Van der Beken
26a0e0161a Fix for bug 571981 ("ASSERTION: Got the wrong answer from the custom method call" with frameset root). r=bz.
--HG--
extra : rebase_source : 84ed582dcec4f32644e549a1030df9b7ee64bb85
2010-06-17 17:17:25 +02:00
Olli Pettay
f48d7a4a08 Bug 574089 - Optimize ::GetInnerHTML, r=jst
--HG--
extra : rebase_source : 3ed1549eaa96d3ff3fe6bf2bb2562dd9e68fcc17
2010-06-26 23:39:56 +03:00
Daniel Holbert
8b5c173803 Bug 573895: Disable MSVC warning that's spammed when we pass empty string to the macros NS_[DECLARE|IMPL]_NEW_HTML_ELEMENT. r=jst 2010-06-26 14:58:01 -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