Commit Graph

202 Commits

Author SHA1 Message Date
Robert O'Callahan
163349d538 Bug 579262. Fix logic around mNeedsToUpdatePluginGeometry so we don't miss updating geometry for some plugins. r=tnikkel 2010-07-20 13:29:29 +12:00
Timothy Nikkel
eaf04d25f4 Bug 563878. Part 15. Fix GetOffsetTo callsites. r=mats 2010-07-18 21:23:48 -05:00
Craig Topper
dcd5047456 Bug 571946 - Let nsICSSRule::GetType return the type as a PRInt32 type instead of taking an outparam for that. r=bz 2010-07-18 16:39:20 +02:00
Robert O'Callahan
8ff43c1e7b Bug 564991. Part 29: Sort plugins so they get moved in the best order. r=karl 2010-07-16 09:08:08 +12:00
Robert O'Callahan
1df5a7ec56 Bug 564991. Part 27: Make plugin geometry changes asynchronous and make them happen as close to the final paint as possible. r=matspal,sr=vlad 2010-07-16 09:08:08 +12:00
timeless@mozdev.org
792133b46f Bug 577993 mark debug code in InsertFontFaceRule and nsStyleAnimation::ComputeDistance
r=dbaron

--HG--
extra : rebase_source : a8b1ed0732f8f06a192dbcc485dffe0bb10d4a50
2010-07-15 15:55:05 +03:00
Jonathan Kew
1341e3f276 bug 511339 - part 1 - implement -moz-font-feature-settings and -moz-font-language-override in CSS. r=dbaron 2010-07-13 21:30:42 +01:00
Timothy Nikkel
976046bf62 Bug 563878. Part 5. Rename nsIFrame::GetWindow(Offset) to GetNearestWidget. r=mats 2010-07-02 14:11:04 -05:00
Doug Turner
e72f127e78 Bug 576055 - MayHavePaintEventListener fails for e10s message manager. This was part of bug 549223, but somehow it was lost in a merge. r=dougt 2010-06-30 21:04:29 -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
Oleg Romashin
b8ab8239cd Auto-merge with m-c b51803f3fdef 2010-06-25 08:30:40 -04: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
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
Daniel Holbert
ed05c57d55 Bug 574750: Use size_t for counter, in loops over contents of an nsCSSValue::Array. r=bz 2010-06-25 12:38:57 -07: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
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
Timothy Nikkel
86591e5c58 Bug 553359. Address review comments. 2010-05-22 13:55:41 -05:00
L. David Baron
cfa59de4bb Don't bother with 16-bit reference count and index in nsCSSValue::Array. (Bug 574059) r=bzbarsky 2010-06-24 14:53:44 -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
Chris Jones
d53b8a18d0 Merged m-c 2010-04-27 01:53:06 -05:00
Ben Newman
941ed3332c Replace direct instantiations of nsRunnableMethod with calls to the templatized NS_NewRunnableMethod function (part 3/3 of bug 558498). r=dwitte sr=dbaron 2010-04-20 16:21:35 -07:00
Olli Pettay
fe69412640 Bug 571438 - MayHavePaintEventListener fails for non-e10s message manager, r=jst 2010-06-16 14:43:36 +03:00
Chris Jones
09869cfb77 Merge mozilla-central 2010-04-16 01:34:35 -05:00
Timothy Nikkel
ac0c03fe97 Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Oleg Romashin
8de514e284 Merged with mozilla-central 2010-04-07 06:59:04 -04:00
Doug Turner
c15f159231 merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp. 2010-03-26 14:22:48 -07:00
Timothy Nikkel
5337327603 Backed out changeset ae2093359899 (Bug 553359) for tsvg_opacity regression. 2010-04-11 19:26:41 -05:00
Timothy Nikkel
20d7ad6361 Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Craig Topper
c3fc5fa456 Bug 554253 - Convert nsCOMPtr<nsPresContext> to nsRefPtr<nsPresContext>. r=roc
--HG--
extra : rebase_source : d828daca07188864d055f3d1a72f5217632eb358
2010-03-25 14:17:11 +01:00
Boris Zbarsky
f7d7c95ec6 Bug 562971. Include Element.h as mozilla/dom/Element.h and don't use 'using namespace' quite as much. r=jst 2010-05-05 14:18:05 -04:00
Timothy Nikkel
b515e7c583 Merge back out of changeset 3a27158cbdd6 (bug 222436) to try to fix tsvg_opacity regression. 2010-04-11 00:11:52 -05:00
Timothy Nikkel
a79353a133 Backed out changeset 3a27158cbdd6 (bug 222436) to try to fix tsvg_opacity regression. 2010-04-11 00:11:26 -05:00
Timothy Nikkel
c24322509e Merge back out of changeset b4fcd21cb6e5 (bug 553359) to try to fix tsvg_opacity regression. 2010-04-11 00:08:37 -05:00
Timothy Nikkel
17be279bff Backed out changeset b4fcd21cb6e5 (bug 553359) to try to fix tsvg_opacity regression. 2010-04-11 00:07:52 -05:00
Craig Topper
d5dc8fa89d Bug 253889: Even more nsIPresShell deCOMtamination. r=roc 2010-04-10 16:15:22 -04:00
Timothy Nikkel
54602f07cb Bug 222436. Simplify nsPresContext::BidiEnabled. r=roc 2010-04-10 13:03:40 -05:00
Timothy Nikkel
2f82809725 Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Timothy Nikkel
51038eecce Bug 222436. Simplify nsPresContext::BidiEnabled. r=roc 2010-04-10 13:03:40 -05:00
Doug Turner
9e52c27932 merge from mozilla-central. no merges required 2010-03-23 02:53:35 -07:00
Markus Stange
5fb3e948bb Bug 508482 - Window activation status should be a pseudoclass (:-moz-window-inactive) instead of an attribute. r=dbaron, r+sr=jst 2010-03-17 18:10:57 +01:00
Markus Stange
4a997d3554 Backed out changeset e17c076aceea, bug 508482 (:-moz-window-inactive pseudoclass) because of test_righttoleft.xul test failures. 2010-03-17 20:03:53 +01:00
Markus Stange
f1f3037861 Bug 508482 - Window activation status should be a pseudoclass (:-moz-window-inactive) instead of an attribute. r=dbaron, r+sr=jst 2010-03-17 18:10:57 +01:00
Daniel Holbert
56c3c6778a Bug 537139 followup: Call RestyleForAnimation() instead of SMILOverrideStyleChanged(), to avoid triggering CSS Transitions from SMIL changes. r=dbaron 2010-03-11 22:03:49 -08:00
Jason Duell
a5f74621b1 Merge from mozilla-central (rev 783ef71b479e) to e10s tree; gets xpcshell working again. 2010-03-18 14:59:34 -07:00
Doug Turner
85bd4fb391 Merge with mc 2010-03-17 10:37:32 -07:00
Doug Turner
f295d7422b Merge 2010-03-12 15:20:36 -08:00
Doug Turner
d08632917d Merge with mc 2010-03-08 10:09:55 -08:00