387211 - Use NS_IMPL_ISUPPPORTS macros where possible

Status: RESOLVED FIXED

(Core :: Widget, defect)

Description

[Mats Palmgren (inactive)]

Followup from bug 385750 comment 9:

[e-mail]   2007-07-05 04:14:58 PDT
On the normal refcounted objects (nsMenuBoxObject and nsDeviceContextSpec*)
can't we replace that handwritten code with the NS_IMPL_ISUPPPORTS macros?

Comment 1

[Mats Palmgren (inactive)]

Attachment: Patch rev. 1

I removed some *_INHERITED stuff when there wasn't an interface added.
I don't see the point of _INHERITED0 other than to disambiguate
between multiple super classes that has nsISupport.
Please correct me if I'm wrong.

I also changed ADDREF/RELEASE/QI macros to ISUPPORTS and removed
explicit QueryInterface() methods where possible.

Regarding the removal of NS_IMPL_QUERY_INTERFACE2 in
widget/src/cocoa/nsDragService.mm
widget/src/photon/nsDragService.cpp
The two interfaces given to the macro are those implemented by the
super class (nsBaseDragService) so this is AFAICT equivalent to 
NS_IMPL_QUERY_INTERFACE_INHERITED0 which again can be removed.

I tested the patch on all three tier-1 platforms and it seems to
work correctly.

Comment 2

[[e-mail]]

Comment on attachment 271331 [details] [diff] [review]
Patch rev. 1

>-class nsMenuBoxObject : public nsIMenuBoxObject, public nsBoxObject
>+class nsMenuBoxObject : public nsBoxObject, public nsIMenuBoxObject
> {
> public:
>-  NS_DECL_ISUPPORTS
>+  NS_DECL_ISUPPORTS_INHERITED
Nice :-)

Comment 3

[[e-mail]]

Comment on attachment 271331 [details] [diff] [review]
Patch rev. 1

Waldo's patch bitrotted this so I couldn't properly test it but I'm sure it's OK :-)

Comment 4

[Mats Palmgren (inactive)]

Attachment: Patch rev. 1

Yeah, there were a couple of static_cast conflicts in removed code.
This is the updated patch - no need to re-review.

Comment 5

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 271681 [details] [diff] [review]
Patch rev. 1

sr=dbaron.  Sorry for the delay.

Comment 6

[Mats Palmgren (inactive)]

Checked in to trunk at 2007-08-07 08:18 PDT.

-> FIXED