511849 - nsBrowserInstance is no longer required

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mark Banner (:standard8)]

Attachment: The fix

I noticed this the other day - since the toolkit move, and SeaMonkey switched to being a MOZ_XUL_APP and Bug 451909 removed the old MOZ_XULL_APP code from nsBrowserInstance, the nsBrowserInstance class is effectively a no-op.

The main function used to kick the page cycler into action was startPageCycler
but that is now empty, save for setting the flag.

http://hg.mozilla.org/releases/mozilla-1.9.1/rev/d5e4a3e10202

So therefore we should just remove it and its initialisation code that is in browser.js. I've already done this for SeaMonkey (bug 511710).

I'll request reviews once bug 511242 is fixed as I have another patch there I would prefer not to bitrot (especially as I want that one to land on 1.9.1).

Comment 2

[:Gavin Sharp [email: [e-mail]]]

See the patches in bug 513507 for additional packages-static changes that are needed.

Comment 3

[Mark Banner (:standard8)]

Attachment: The fix v2

Revised patch including packages file updates. AFAIK we don't need to add to removed-files.in because all platforms now support a single or limited .xpt files.

Comment 4

[[e-mail]]

Comment on attachment 399061 [details] [diff] [review]
The fix v2

I didn't quite understand the bit about removed-files.in though.

Comment 5

[Mark Banner (:standard8)]

Attachment: comm-central package adjustments

I think this is the right set of changes on comm-central.

On Thunderbird & SeaMonkey on all platforms on non-1.9.1 the .xpt files are linked into a few (or just one) .xpt files, so we don't need to add it to removed-files.in.

For Sunbird I'm not convinced their Linux .xpt files on non-1.9.1 are linked together, so I've added it to their removed-files.in file.

Comment 6

[Mark Banner (:standard8)]

(In reply to comment #4)
> (From update of attachment 399061 [details] [diff] [review])
> I didn't quite understand the bit about removed-files.in though.

On 1.9.2 and later, the .xpt files are linked into one .xpt file when they are packaged. As that is the case, we don't need to add mozbrwsr.xpt to removed-files.in because it doesn't actually exist in the current packaged builds.

Comment 7

[Robert Kaiser]

Comment on attachment 399063 [details] [diff] [review]
comm-central package adjustments

r=me though I wonder if we even need to package it on 1.9.1 - and then, I actually, think we might need it in removed-files for SM/TB after all, as I think we don't link XPTs on Mac yet (FF also only started this recently on 1.9.2 and later).

Comment 8

[Mark Banner (:standard8)]

(In reply to comment #7)
> (From update of attachment 399063 [details] [diff] [review])
> r=me though I wonder if we even need to package it on 1.9.1 - and then, I
> actually, think we might need it in removed-files for SM/TB after all, as I
> think we don't link XPTs on Mac yet (FF also only started this recently on
> 1.9.2 and later).

Given where we are on 1.9.1, I don't see we really need to change it, it is a bit of dead weight, but IMHO it isn't going to make that much difference.

Comment 9

[Mark Banner (:standard8)]

Both patches checked in:

http://hg.mozilla.org/mozilla-central/rev/4d4979399774
http://hg.mozilla.org/comm-central/rev/42ed92ba8c9e

Comment 10

[[e-mail]]

Comment on attachment 399061 [details] [diff] [review]
The fix v2

>diff --git a/xpfe/browser/public/Makefile.in b/xpfe/browser/public/Makefile.in
>deleted file mode 100644
Oops, you forgot to remove this from toolkit-makefiles.sh :-(

Comment 11

[Phil Ringnalda (:philor)]

Removed in http://hg.mozilla.org/mozilla-central/rev/fb31c1bdf4dd