Bug 523111 - DOMEvent implementations should inherit first the base class, r=jwatt, sr=jst

--HG--
extra : rebase_source : 81cba369792644a99f42c1901dbf04196d007d53

content/events/src/nsDOMBeforeUnloadEvent.h

@@ -42,8 +42,8 @@
 #include "nsIDOMBeforeUnloadEvent.h"
 #include "nsDOMEvent.h"
 
-class nsDOMBeforeUnloadEvent : public nsIDOMBeforeUnloadEvent,
+class nsDOMBeforeUnloadEvent : public nsDOMEvent,
-                               public nsDOMEvent
+                               public nsIDOMBeforeUnloadEvent
 {
 public:
   nsDOMBeforeUnloadEvent(nsPresContext* aPresContext, nsEvent* aEvent)

content/events/src/nsDOMDragEvent.h

@@ -45,8 +45,8 @@
 class nsIContent;
 class nsEvent;
 
-class nsDOMDragEvent : public nsIDOMDragEvent,
+class nsDOMDragEvent : public nsDOMMouseEvent,
-                       public nsDOMMouseEvent
+                       public nsIDOMDragEvent
 {
 public:
   nsDOMDragEvent(nsPresContext* aPresContext, nsInputEvent* aEvent);

content/events/src/nsDOMKeyboardEvent.h

@@ -42,8 +42,8 @@
 #include "nsIDOMKeyEvent.h"
 #include "nsDOMUIEvent.h"
 
-class nsDOMKeyboardEvent : public nsIDOMKeyEvent,
+class nsDOMKeyboardEvent : public nsDOMUIEvent,
-                           public nsDOMUIEvent
+                           public nsIDOMKeyEvent
 {
 public:
   nsDOMKeyboardEvent(nsPresContext* aPresContext, nsKeyEvent* aEvent);

content/events/src/nsDOMMessageEvent.h

@@ -50,8 +50,8 @@
  * See http://www.whatwg.org/specs/web-apps/current-work/#messageevent for
  * further details.
  */
-class nsDOMMessageEvent : public nsIDOMMessageEvent,
+class nsDOMMessageEvent : public nsDOMEvent,
-                          public nsDOMEvent
+                          public nsIDOMMessageEvent
 {
 public:
   nsDOMMessageEvent(nsPresContext* aPresContext, nsEvent* aEvent)

content/events/src/nsDOMMouseScrollEvent.h

@@ -41,8 +41,8 @@
 #include "nsIDOMMouseScrollEvent.h"
 #include "nsDOMMouseEvent.h"
 
-class nsDOMMouseScrollEvent : public nsIDOMMouseScrollEvent,
+class nsDOMMouseScrollEvent : public nsDOMMouseEvent,
-                              public nsDOMMouseEvent
+                              public nsIDOMMouseScrollEvent
 {
 public:
   nsDOMMouseScrollEvent(nsPresContext* aPresContext, nsInputEvent* aEvent);

content/events/src/nsDOMMutationEvent.h

@@ -44,8 +44,8 @@
 #include "nsDOMEvent.h"
 #include "nsContentUtils.h"
 
-class nsDOMMutationEvent : public nsIDOMMutationEvent,
+class nsDOMMutationEvent : public nsDOMEvent,
-                           public nsDOMEvent
+                           public nsIDOMMutationEvent
 {
 public:
   nsDOMMutationEvent(nsPresContext* aPresContext, nsMutationEvent* aEvent);

content/events/src/nsDOMNotifyPaintEvent.h

@@ -45,8 +45,8 @@
 
 class nsPaintRequestList;
 
-class nsDOMNotifyPaintEvent : public nsIDOMNotifyPaintEvent,
+class nsDOMNotifyPaintEvent : public nsDOMEvent,
-                              public nsDOMEvent
+                              public nsIDOMNotifyPaintEvent
 {
 public:
   nsDOMNotifyPaintEvent(nsPresContext*           aPresContext,

content/events/src/nsDOMOrientationEvent.h

@@ -40,7 +40,8 @@
 #include "nsIDOMOrientationEvent.h"
 #include "nsDOMEvent.h"
 
-class nsDOMOrientationEvent : public nsIDOMOrientationEvent, public nsDOMEvent
+class nsDOMOrientationEvent : public nsDOMEvent,
+                              public nsIDOMOrientationEvent
 {
 public:
 

content/events/src/nsDOMPageTransitionEvent.h

@@ -42,8 +42,8 @@
 #include "nsIDOMPageTransitionEvent.h"
 #include "nsDOMEvent.h"
 
-class nsDOMPageTransitionEvent : public nsIDOMPageTransitionEvent,
+class nsDOMPageTransitionEvent : public nsDOMEvent,
-                                 public nsDOMEvent
+                                 public nsIDOMPageTransitionEvent
 {
 public:
   nsDOMPageTransitionEvent(nsPresContext* aPresContext, nsEvent* aEvent) :

content/events/src/nsDOMPopupBlockedEvent.h

@@ -43,8 +43,8 @@
 #include "nsDOMEvent.h"
 #include "nsIURI.h"
 
-class nsDOMPopupBlockedEvent : public nsIDOMPopupBlockedEvent,
+class nsDOMPopupBlockedEvent : public nsDOMEvent,
-                               public nsDOMEvent
+                               public nsIDOMPopupBlockedEvent
 {
 public:
 

content/events/src/nsDOMProgressEvent.h

@@ -49,8 +49,8 @@
  * See http://www.whatwg.org/specs/web-apps/current-work/#progress0 for
  * further details.
  */
-class nsDOMProgressEvent : public nsIDOMProgressEvent,
+class nsDOMProgressEvent : public nsDOMEvent,
-                           public nsDOMEvent
+                           public nsIDOMProgressEvent
 {
 public:
   nsDOMProgressEvent(nsPresContext* aPresContext, nsEvent* aEvent)

content/events/src/nsDOMSimpleGestureEvent.h

@@ -42,8 +42,8 @@
 
 class nsPresContext;
 
-class nsDOMSimpleGestureEvent : public nsIDOMSimpleGestureEvent,
+class nsDOMSimpleGestureEvent : public nsDOMMouseEvent,
-                                public nsDOMMouseEvent
+                                public nsIDOMSimpleGestureEvent
 {
 public:
   nsDOMSimpleGestureEvent(nsPresContext*, nsSimpleGestureEvent*);

content/events/src/nsDOMUIEvent.h

@@ -45,10 +45,10 @@
 #include "nsIPrivateCompositionEvent.h"
 #include "nsDOMEvent.h"
 
-class nsDOMUIEvent : public nsIDOMUIEvent,
+class nsDOMUIEvent : public nsDOMEvent,
+                     public nsIDOMUIEvent,
                      public nsIDOMNSUIEvent,
-                     public nsIPrivateCompositionEvent,
+                     public nsIPrivateCompositionEvent
-                     public nsDOMEvent
 {
 public:
   nsDOMUIEvent(nsPresContext* aPresContext, nsGUIEvent* aEvent);

content/svg/content/src/nsDOMSVGEvent.h

@@ -41,8 +41,8 @@
 #include "nsIDOMSVGEvent.h"
 #include "nsDOMEvent.h"
 
-class nsDOMSVGEvent : public nsIDOMSVGEvent,
+class nsDOMSVGEvent : public nsDOMEvent,
-                      public nsDOMEvent
+                      public nsIDOMSVGEvent
 {
 public:
   nsDOMSVGEvent(nsPresContext* aPresContext, nsEvent* aEvent);

content/svg/content/src/nsDOMSVGZoomEvent.cpp

@@ -105,14 +105,13 @@ nsDOMSVGZoomEvent::nsDOMSVGZoomEvent(nsPresContext* aPresContext,
 //----------------------------------------------------------------------
 // nsISupports methods:
 
-NS_IMPL_ADDREF_INHERITED(nsDOMSVGZoomEvent, nsDOMEvent)
+NS_IMPL_ADDREF_INHERITED(nsDOMSVGZoomEvent, nsDOMUIEvent)
-NS_IMPL_RELEASE_INHERITED(nsDOMSVGZoomEvent, nsDOMEvent)
+NS_IMPL_RELEASE_INHERITED(nsDOMSVGZoomEvent, nsDOMUIEvent)
 
 NS_INTERFACE_MAP_BEGIN(nsDOMSVGZoomEvent)
   NS_INTERFACE_MAP_ENTRY(nsIDOMSVGZoomEvent)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMUIEvent,nsIDOMSVGZoomEvent)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGZoomEvent)
-NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)
+NS_INTERFACE_MAP_END_INHERITING(nsDOMUIEvent)
 
 
 //----------------------------------------------------------------------

content/svg/content/src/nsDOMSVGZoomEvent.h

@@ -42,8 +42,8 @@
 #include "nsDOMUIEvent.h"
 #include "nsIDOMSVGSVGElement.h"
 
-class nsDOMSVGZoomEvent : public nsIDOMSVGZoomEvent,
+class nsDOMSVGZoomEvent : public nsDOMUIEvent,
-                          public nsDOMUIEvent
+                          public nsIDOMSVGZoomEvent
 {
 public:
   nsDOMSVGZoomEvent(nsPresContext* aPresContext, nsGUIEvent* aEvent);

dom/base/nsDOMClassInfo.cpp

@@ -3431,7 +3431,7 @@ nsDOMClassInfo::Init()
 
   DOM_CLASSINFO_MAP_BEGIN(SVGZoomEvent, nsIDOMSVGZoomEvent)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGZoomEvent)
-    DOM_CLASSINFO_EVENT_MAP_ENTRIES
+    DOM_CLASSINFO_UI_EVENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 #endif // MOZ_SVG