Closed Bug 617539 Opened 9 years ago Closed 8 years ago

get rid of _MOZILLA_2_0_BRANCH interfaces on trunk after we branch

Categories

(Core :: General, defect)

defect
Not set

Tracking

()

RESOLVED FIXED

People

(Reporter: tnikkel, Assigned: benjamin)

References

Details

Attachments

(19 files, 2 obsolete files)

22.70 KB, patch
jimm
: review+
Details | Diff | Splinter Review
13.84 KB, patch
bzbarsky
: review+
Details | Diff | Splinter Review
36.85 KB, patch
jst
: review+
Details | Diff | Splinter Review
7.32 KB, patch
sicking
: review+
Details | Diff | Splinter Review
3.73 KB, patch
smaug
: review+
Details | Diff | Splinter Review
6.82 KB, patch
Gavin
: review+
Details | Diff | Splinter Review
3.65 KB, patch
smaug
: review+
Details | Diff | Splinter Review
4.64 KB, patch
bzbarsky
: review+
Details | Diff | Splinter Review
3.78 KB, patch
sicking
: review+
Details | Diff | Splinter Review
6.48 KB, patch
smaug
: review+
Details | Diff | Splinter Review
4.48 KB, patch
jrmuizel
: review+
Details | Diff | Splinter Review
6.79 KB, patch
bzbarsky
: review+
Details | Diff | Splinter Review
3.22 KB, patch
enndeakin
: review+
Details | Diff | Splinter Review
6.06 KB, patch
mossop
: review+
Details | Diff | Splinter Review
4.83 KB, patch
mfinkle
: review+
Details | Diff | Splinter Review
18.16 KB, patch
tnikkel
: review+
Details | Diff | Splinter Review
4.99 KB, patch
roc
: review+
Details | Diff | Splinter Review
7.44 KB, patch
smontagu
: review+
mounir
: checkin+
Details | Diff | Splinter Review
9.37 KB, patch
emorley
: review+
mounir
: feedback+
Ms2ger
: checkin+
Details | Diff | Splinter Review
We've had to add a number of _MOZILLA_2_0_BRANCH interfaces to avoid IID changes. We should get rid of them on trunk once we branch for real.
Depends on: post2.0
Depends on: 611101
Duplicate of this bug: 611101
Duplicate of this bug: 638548
Assignee: nobody → benjamin
Attachment #518479 - Flags: review?(jmathies)
Attachment #518480 - Flags: review?(bzbarsky)
Because of ill-conceived %{C++ blocks in nsIPluginHost, the vtables were ending up incorrect, so I had to do a slight bit more surgery for this one.
Attachment #518481 - Flags: review?(jst)
These all passed tryserver.
Comment on attachment 518479 [details] [diff] [review]
nsIWidget, rev. 1

In nsIWidget.h you can remove the old transparency method UpdatePossiblyTransparentRegion as well. UpdateTransparentRegion replaces it.
Attachment #518479 - Flags: review?(jmathies) → review+
Comment on attachment 518480 [details] [diff] [review]
nsIDOMWindowUtils, rev. 1

You need to rev the nsIDOMWindowUtils iid.

r=me with that.
Attachment #518480 - Flags: review?(bzbarsky) → review+
Attachment #519668 - Flags: review?(jonas)
Attachment #519676 - Flags: review?(Olli.Pettay)
Attachment #519677 - Flags: review?
Attachment #519677 - Flags: review? → review?(gavin.sharp)
Attachment #519678 - Flags: review?(Olli.Pettay)
Attachment #519677 - Flags: review?(gavin.sharp) → review+
Attachment #519676 - Flags: review?(Olli.Pettay) → review+
Attachment #519678 - Flags: review?(Olli.Pettay) → review+
Comment on attachment 519668 [details] [diff] [review]
nsIDOMNSDocument, rev. 1

Thanks!
Attachment #519668 - Flags: review?(jonas) → review+
Comment on attachment 519668 [details] [diff] [review]
nsIDOMNSDocument, rev. 1

Oh, but you do need to rev the nsIDocument iid
Comment on attachment 519677 [details] [diff] [review]
nsIContentPrefService, rev. 1

Oh, this actually revs the IID on the wrong interface (nsIContentPrefObserver instead of nsIContentPrefService) - need to fix that!
Attachment #519759 - Flags: review?(bzbarsky)
Attachment #519760 - Flags: review?(jonas)
Attachment #519762 - Flags: review?(Olli.Pettay)
Attachment #519764 - Flags: review?(jmuizelaar)
Attachment #519765 - Flags: review?(bzbarsky)
Attachment #519766 - Flags: review?
Attachment #519766 - Flags: review? → review?(enndeakin)
Attachment #519767 - Flags: review?(dtownsend)
Attached patch nsIRadioGroupContainer, rev. 1 (obsolete) — Splinter Review
Attachment #519768 - Flags: review?(bzbarsky)
Attachment #519767 - Flags: review?(dtownsend) → review+
Attachment #519762 - Flags: review?(Olli.Pettay) → review+
Comment on attachment 519760 [details] [diff] [review]
nsIContentViewer, rev. 1

r=me if you rev the iid.
Attachment #519760 - Flags: review?(jonas) → review+
Attachment #519766 - Flags: review?(enndeakin) → review+
Comment on attachment 519759 [details] [diff] [review]
nsIDocShell, rev. 1

r=me
Attachment #519759 - Flags: review?(bzbarsky) → review+
Comment on attachment 519765 [details] [diff] [review]
nsIFrameLoader, rev. 1

Nix the interface from the idl file too?   And rev the nsIFrameLoader iid.

r=me with those two changes.
Attachment #519765 - Flags: review?(bzbarsky) → review+
Comment on attachment 519768 [details] [diff] [review]
nsIRadioGroupContainer, rev. 1

r=me, but please coordinate with Mounir: he has a bunch of changes to this code too.
Attachment #519768 - Flags: review?(bzbarsky) → review+
Attachment #519764 - Flags: review?(jmuizelaar) → review+
Attachment #521573 - Flags: review?(mark.finkle)
Attachment #521573 - Flags: review?(mark.finkle) → review+
Attachment #522286 - Flags: review?(tnikkel) → review+
Duplicate of this bug: 645844
Whiteboard: not-ready-for-cedar
Comment on attachment 518481 [details] [diff] [review]
nsIPlugin*, rev. 1

Duh, I reviewed this when the request was made, but clearly forgot to mark it :( r=jst
Attachment #518481 - Flags: review?(jst) → review+
Attached patch nsIEditorSplinter Review
Attachment #525083 - Flags: review?(roc)
Comment on attachment 525083 [details] [diff] [review]
nsIEditor

Please land this before we branch :-)
Attachment #525083 - Flags: review?(roc) → review+
http://hg.mozilla.org/mozilla-central/rev/0d60751c978e (nsIContentUtils_MOZILLA_2_0_BRANCH)

This patch is a straight backout of http://hg.mozilla.org/mozilla-central/rev/5e1f1bb2bb87 which added that class for the mere sake of non-libxul builds (which are now history).
Josh, should I back http://hg.mozilla.org/mozilla-central/rev/3aebb305dee5 out?  Benjamin said that he left this unlanded on purpose because you had a pending patch to remove these entirely...
Don't back it out, the removal patch of mine won't be in FF5 and I have to update it anyway. I'd prefer to have the MOZILLA_2_0_BRANCH stuff gone now. Thanks for landing it.
The patch for this bug contains a mistake that triggered bug 651177.
Blocks: 651117
Blocks: 651177
No longer blocks: 651117
No longer blocks: 651177
Depends on: 651177
According to MXR, there is now just the following remaining...
- nsIRadioGroupContainer (dealt with by Attachment #519768 [details] [diff], pending comment 27)
- nsIMarkupDocumentViewer
- nsIScreen
- A leftover from nsIDOMWindowUtils, presume it can be taken out too?
http://mxr.mozilla.org/mozilla-central/source/layout/ipc/test-ipcbrowser-content.js#8

Presume it's ok for me to work on nsIMarkupDocumentViewer and nsIScreen / no one else is currently doing them?
Attachment #535962 - Flags: review?(smontagu)
Attached patch nsIScreen, rev. 1 (obsolete) — Splinter Review
Attachment #535965 - Flags: review?(roc)
Comment on attachment 535965 [details] [diff] [review]
nsIScreen, rev. 1

Review of attachment 535965 [details] [diff] [review]:
-----------------------------------------------------------------
Attachment #535965 - Flags: review?(roc) → review+
Attachment #535962 - Flags: review?(smontagu) → review+
Attachment #535962 - Flags: checked-in+ → checkin+
Depends on: 664543
Depends on: 664979
Depends on: 672166
Comment on attachment 535965 [details] [diff] [review]
nsIScreen, rev. 1

Fails try; breaking out to bug 672166 to resolve.
Attachment #535965 - Attachment is obsolete: true
Attachment #535965 - Flags: review+
Depends on: 672172
Other than the dependant bugs, nsIRadioGroupContainer is the last interface needing to be dealt with here (according to MXR at least), so have updated the existing patch so this can be closed.

Is bsmedbergs patch updated to tip, carrying forwards bz's r+

Mounir, can you confirm this is ok to land please? (see comment 27)
Attachment #519768 - Attachment is obsolete: true
Attachment #546514 - Flags: review+
Attachment #546514 - Flags: feedback?(mounir)
Comment on attachment 546514 [details] [diff] [review]
nsIRadioGroupContainer, rev. 1.1

Review of attachment 546514 [details] [diff] [review]:
-----------------------------------------------------------------

I indeed have some patches touching nsIRadioGroupContainer but given that they still haven't landed, I will take the burden of the merge instead of delay this more.

Thanks for refreshing the patch Ed :)
Attachment #546514 - Flags: feedback?(mounir) → feedback+
Comment on attachment 546514 [details] [diff] [review]
nsIRadioGroupContainer, rev. 1.1

Great, thanks Mounir :-)

Passed try:
http://dev.philringnalda.com/tbpl/?tree=Try&rev=6ef91a400cf4
Attachment #546514 - Flags: checkin?
Keywords: checkin-needed
Whiteboard: not-ready-for-cedar
Now that bug 672166 has landed, believe we're all done here (comment remnant being dealt with in that bug):
http://mxr.mozilla.org/mozilla-central/search?string=MOZILLA_2&case=1
Status: NEW → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.