617539 - get rid of _MOZILLA_2_0_BRANCH interfaces on trunk after we branch

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Timothy Nikkel (:tnikkel)]

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.

Comment 3

[Benjamin Smedberg]

Attachment: nsIWidget, rev. 1

Comment 4

[Benjamin Smedberg]

Attachment: nsIDOMWindowUtils, rev. 1

Comment 5

[Benjamin Smedberg]

Attachment: nsIPlugin*, rev. 1

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.

Comment 6

[Benjamin Smedberg]

These all passed tryserver.

Comment 7

[Jim Mathies [:jimm]]

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.

Comment 8

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 518480 [details] [diff] [review]
nsIDOMWindowUtils, rev. 1

You need to rev the nsIDOMWindowUtils iid.

r=me with that.

Comment 9

[Benjamin Smedberg]

Attachment: nsIDOMNSDocument, rev. 1

Comment 10

[Benjamin Smedberg]

Attachment: nsIDOMNSHistory, rev. 1

Comment 11

[Benjamin Smedberg]

Attachment: nsIContentPrefService, rev. 1

Comment 12

[Benjamin Smedberg]

Attachment: nsIFocusManager, rev. 1

Comment 13

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Comment on attachment 519668 [details] [diff] [review]
nsIDOMNSDocument, rev. 1

Thanks!

Comment 14

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Comment on attachment 519668 [details] [diff] [review]
nsIDOMNSDocument, rev. 1

Oh, but you do need to rev the nsIDocument iid

Comment 15

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

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!

Comment 16

[Benjamin Smedberg]

Attachment: nsIDocShell, rev. 1

Comment 17

[Benjamin Smedberg]

Attachment: nsIContentViewer, rev. 1

Comment 18

[Benjamin Smedberg]

Attachment: nsIDOMHTMLSelectElement, rev. 1

Comment 19

[Benjamin Smedberg]

Attachment: nsIDOMWebGLRenderingContext, rev. 1

Comment 20

[Benjamin Smedberg]

Attachment: nsIFrameLoader, rev. 1

Comment 21

[Benjamin Smedberg]

Attachment: nsIMenuBoxObject, rev. 1

Comment 22

[Benjamin Smedberg]

Attachment: nsIAppStartup, rev. 1

Comment 23

[Benjamin Smedberg]

Attachment: nsIRadioGroupContainer, rev. 1

Comment 24

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Comment on attachment 519760 [details] [diff] [review]
nsIContentViewer, rev. 1

r=me if you rev the iid.

Comment 25

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 519759 [details] [diff] [review]
nsIDocShell, rev. 1

r=me

Comment 26

[Boris Zbarsky [:bzbarsky]]

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.

Comment 27

[Boris Zbarsky [:bzbarsky]]

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.

Comment 28

[Benjamin Smedberg]

Attachment: mobile-browser changes, rev. 1

Comment 29

[Benjamin Smedberg]

http://hg.mozilla.org/mozilla-central/rev/66b1dae86e99 - nsIDOMWindowUtils
http://hg.mozilla.org/mozilla-central/rev/4751ff283ab4 - nsIHTMLEditor
http://hg.mozilla.org/mozilla-central/rev/ee51cd544882 - nsIDOMNSDocument
http://hg.mozilla.org/mozilla-central/rev/9722ce9b7c3d - nsIFocusManager
http://hg.mozilla.org/mozilla-central/rev/c2e52bd90993 - nsIContentPrefService
http://hg.mozilla.org/mozilla-central/rev/82218ad4a475 - nsIDOMHistory
http://hg.mozilla.org/mozilla-central/rev/4b3e51d80e8f - nsIContentViewer
http://hg.mozilla.org/mozilla-central/rev/fde85fc5f878 - nsIDOMHTMLSelectElement
http://hg.mozilla.org/mozilla-central/rev/ec57c96251e9 - nsIDOMWebGLRenderingContext
http://hg.mozilla.org/mozilla-central/rev/8090e860a533 - nsIFrameLoader
http://hg.mozilla.org/mozilla-central/rev/b9b31e5840b7 - nsIMenuBoxObject
http://hg.mozilla.org/mozilla-central/rev/3e2d1dd1962e - nsIAppStartup
http://hg.mozilla.org/mozilla-central/rev/e9ab3e8d4303 - nsIWidget

Still remaining: nsIEditor, nsIRadioGroupContainer, nsIPresShell, nsIPlugin* (we might skip this because of delibxulification), and nsIScreen.

Comment 30

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Attachment: nsIPresShell

Comment 32

[Robert O'Callahan (:roc) (email my personal email if necessary)]

http://hg.mozilla.org/mozilla-central/rev/0dc8fb9d0bc3 - nsIPresShell

Comment 33

[Johnny Stenback (:jst)]

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

Comment 34

[(no longer active)]

Attachment: nsIEditor

Comment 35

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Comment on attachment 525083 [details] [diff] [review]
nsIEditor

Please land this before we branch :-)

Comment 36

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

And land attachment 518481 [details] [diff] [review] along with it? :)

Comment 37

[(no longer active)]

http://hg.mozilla.org/mozilla-central/rev/3aebb305dee5
http://hg.mozilla.org/mozilla-central/rev/a7ba826ccbdf

Comment 38

[(no longer active)]

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).

Comment 39

[(no longer active)]

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...

Comment 40

[Josh Aas]

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.

Comment 41

[Steven Michaud [:smichaud] (Retired)]

The patch for this bug contains a mistake that triggered bug 651177.

Comment 42

[Ed Morley [:emorley]]

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?

Comment 43

[Ed Morley [:emorley]]

Attachment: nsIMarkupDocumentViewer, rev. 1

Comment 44

[Ed Morley [:emorley]]

Attachment: nsIScreen, rev. 1

Comment 45

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Comment on attachment 535965 [details] [diff] [review]
nsIScreen, rev. 1

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

Comment 46

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Comment on attachment 535962 [details] [diff] [review]
nsIMarkupDocumentViewer, rev. 1

http://hg.mozilla.org/projects/cedar/rev/102449094763

Comment 47

[(no longer active)]

(In reply to comment #46)
> Comment on attachment 535962 [details] [diff] [review] [review]
> nsIMarkupDocumentViewer, rev. 1
> 
> http://hg.mozilla.org/projects/cedar/rev/102449094763

http://hg.mozilla.org/mozilla-central/rev/102449094763

Comment 48

[Ed Morley [:emorley]]

Comment on attachment 535965 [details] [diff] [review]
nsIScreen, rev. 1

Fails try; breaking out to bug 672166 to resolve.

Comment 49

[Ed Morley [:emorley]]

Attachment: nsIRadioGroupContainer, rev. 1.1

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)

Comment 50

[Mounir Lamouri (: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 :)

Comment 51

[Ed Morley [:emorley]]

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

Comment 52

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Comment on attachment 546514 [details] [diff] [review]
nsIRadioGroupContainer, rev. 1.1

http://hg.mozilla.org/integration/mozilla-inbound/rev/1ed3d5d62d91

Comment 53

[(no longer active)]

Comment on attachment 546514 [details] [diff] [review]
nsIRadioGroupContainer, rev. 1.1

http://hg.mozilla.org/mozilla-central/rev/1ed3d5d62d91

Comment 54

[Ed Morley [:emorley]]

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