corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
189,658 Commits 1 Branch 0 Tags
4751e18f613a9f901b96622b1ef8505e4df8d3f5
Commit Graph

564 Commits

Author SHA1 Message Date
Timothy Nikkel
69e644de71 Bug 563878. Part 5. Rename nsIFrame::GetWindow(Offset) to GetNearestWidget. r=mats 2010-07-02 14:11:04 -05:00
Doug Turner
3fcff4106a 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
8fec9c6ba6 Merging with mozilla-central. Manually merged: content/canvas/src/nsCanvasRenderingContext2D.cpp ipc/ipdl/Makefile.in toolkit/toolkit-tiers.mk toolkit/xre/nsEmbedFunctions.cpp 2010-06-28 16:33:19 -07:00
Oleg Romashin
3f1b0882a6 Auto-merge with m-c b51803f3fdef 2010-06-25 08:30:40 -04:00
Jason Duell
329d95e7d9 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).
 2010-06-22 17:33:57 -07:00
Doug Turner
2f64431802 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
 2010-06-07 13:38:02 -07:00
Daniel Holbert
1c62ea87f0 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
e1686ed450 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Doug Turner
d4bb7736d1 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
d161b29832 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
 2010-05-11 11:09:54 -07:00
Timothy Nikkel
e45d2a8841 Bug 553359. Address review comments. 2010-05-22 13:55:41 -05:00
L. David Baron
27074f4840 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
33ca7d0f34 Bug 549682 - Port the message-manager API to mozilla-central, r=jst 2010-05-18 15:28:37 +03:00
Olli Pettay
d1c80ff1d4 Backout Bug 549682 2010-05-18 13:10:47 +03:00
Olli Pettay
98c0be01b2 Bug 549682 - Port the message-manager API to mozilla-central, r=jst 2010-05-18 11:52:24 +03:00
Chris Jones
0a54d2d5c7 Merged m-c 2010-04-27 01:53:06 -05:00
Ben Newman
b4d3ccac07 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
5e8d95b7aa Bug 571438 - MayHavePaintEventListener fails for non-e10s message manager, r=jst 2010-06-16 14:43:36 +03:00
Chris Jones
67b02de57a Merge mozilla-central 2010-04-16 01:34:35 -05:00
Timothy Nikkel
cf886418a3 Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Oleg Romashin
93e412b1c9 Merged with mozilla-central 2010-04-07 06:59:04 -04:00
Doug Turner
28cfa9d63f 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
823a2e9f49 Backed out changeset ae2093359899 (Bug 553359) for tsvg_opacity regression. 2010-04-11 19:26:41 -05:00
Timothy Nikkel
f5b02612f1 Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Craig Topper
9ba803bea7 Bug 554253 - Convert nsCOMPtr<nsPresContext> to nsRefPtr<nsPresContext>. r=roc 2010-03-25 14:17:11 +01:00
Boris Zbarsky
cd27fc6a1c 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
da37d914bd 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
be00f78d47 Backed out changeset 3a27158cbdd6 (bug 222436) to try to fix tsvg_opacity regression. 2010-04-11 00:11:26 -05:00
Timothy Nikkel
77fdbe3bd5 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
a90d87d454 Backed out changeset b4fcd21cb6e5 (bug 553359) to try to fix tsvg_opacity regression. 2010-04-11 00:07:52 -05:00
Craig Topper
1e97f7aa59 Bug 253889: Even more nsIPresShell deCOMtamination. r=roc 2010-04-10 16:15:22 -04:00
Timothy Nikkel
7f511829fe Bug 222436. Simplify nsPresContext::BidiEnabled. r=roc 2010-04-10 13:03:40 -05:00
Timothy Nikkel
32e004438d Bug 553359. Cache whether the PresContext is chrome or not. r=bzbarsky 2010-04-10 13:03:40 -05:00
Timothy Nikkel
5889a9360b Bug 222436. Simplify nsPresContext::BidiEnabled. r=roc 2010-04-10 13:03:40 -05:00
Doug Turner
0a3e544581 merge from mozilla-central. no merges required 2010-03-23 02:53:35 -07:00
Markus Stange
d0cb573e65 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
8e573045c0 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
56f855c121 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
0055964be5 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
96aa5fcd00 Merge from mozilla-central (rev 783ef71b479e) to e10s tree; gets xpcshell working again. 2010-03-18 14:59:34 -07:00
Doug Turner
bb21f5ce3a Merge with mc 2010-03-17 10:37:32 -07:00
Doug Turner
560dc37411 Merge 2010-03-12 15:20:36 -08:00
Doug Turner
8160dff0bb Merge with mc 2010-03-08 10:09:55 -08:00
Jonas Sicking
6859a5ac8e Bug 534136 Part 2: Use 16bit-char buffers inside atoms. r=bz sr=mrbkap 2010-03-08 07:45:00 -08:00
Doug Turner
d9d6fc223c Merge 2010-03-01 15:36:51 -08:00
Olli Pettay
9f0ec7eff7 Bug 549223 - [E10s] MozAfterPaint events aren't activated when event listener is added to tabChildGlobal, r=bsmedberg 2010-03-01 16:47:27 +02:00
Daniel Holbert
b8a7d58160 Bug 540090: Add method nsIDocument::HasAnimationController, to let us check for active SMIL animation without triggering lazy construction. r=roc 2010-03-02 23:09:51 -08:00
Michael Ventnor
de43c1d4fb Bug 542361 - Fix and remove the GetUsedX assertions r=roc 2010-03-02 11:57:43 +10:00
Daniel Holbert
c6f482add7 Bug 537139: Prevent SMIL animation from triggering CSS transitions. r=dbaron 2010-03-01 11:31:45 -08:00
Jonas Sicking
6dd0651989 Bug 545059: Remove unneeded/non-working bidi.controlstextmode pref. r=smontagu 2010-02-24 21:58:17 -08:00