Bug 360847, Remove unused nsIDOM*foo*Listener interfaces, r=jst, sr=sicking

content/events/src/nsEventListenerManager.cpp

@@ -50,14 +50,10 @@
 #include "nsIDOMFormListener.h"
 #include "nsIDOMLoadListener.h"
 #include "nsIDOMDragListener.h"
-#include "nsIDOMPaintListener.h"
 #include "nsIDOMTextListener.h"
 #include "nsIDOMCompositionListener.h"
 #include "nsIDOMXULListener.h"
-#include "nsIDOMScrollListener.h"
-#include "nsIDOMMutationListener.h"
 #include "nsIDOMUIListener.h"
-#include "nsIDOMPageTransitionListener.h"
 #include "nsITextControlFrame.h"
 #ifdef MOZ_SVG
 #include "nsIDOMSVGListener.h"
@@ -264,12 +260,6 @@ static const EventDispatchData sLoadEvents[] = {
   { NS_BEFORE_PAGE_UNLOAD, HANDLER(&nsIDOMLoadListener::BeforeUnload) }
 };
 
-static const EventDispatchData sPaintEvents[] = {
-  { NS_PAINT,        HANDLER(&nsIDOMPaintListener::Paint)  },
-  { NS_RESIZE_EVENT, HANDLER(&nsIDOMPaintListener::Resize) },
-  { NS_SCROLL_EVENT, HANDLER(&nsIDOMPaintListener::Scroll) }
-};
-
 static const EventDispatchData sDragEvents[] = {
   { NS_DRAGDROP_ENTER,      HANDLER(&nsIDOMDragListener::DragEnter)   },
   { NS_DRAGDROP_OVER_SYNTH, HANDLER(&nsIDOMDragListener::DragOver)    },
@@ -278,15 +268,6 @@ static const EventDispatchData sDragEvents[] = {
   { NS_DRAGDROP_GESTURE,    HANDLER(&nsIDOMDragListener::DragGesture) }
 };
 
-static const EventDispatchData sScrollEvents[] = {
-  { NS_SCROLLPORT_OVERFLOW,
-    HANDLER(&nsIDOMScrollListener::Overflow)        },
-  { NS_SCROLLPORT_UNDERFLOW,
-    HANDLER(&nsIDOMScrollListener::Underflow)       },
-  { NS_SCROLLPORT_OVERFLOWCHANGED,
-    HANDLER(&nsIDOMScrollListener::OverflowChanged) }
-};
-
 static const EventDispatchData sXULEvents[] = {
   { NS_XUL_POPUP_SHOWING,  HANDLER(&nsIDOMXULListener::PopupShowing)  },
   { NS_XUL_POPUP_SHOWN,    HANDLER(&nsIDOMXULListener::PopupShown)    },
@@ -298,34 +279,12 @@ static const EventDispatchData sXULEvents[] = {
   { NS_XUL_COMMAND_UPDATE, HANDLER(&nsIDOMXULListener::CommandUpdate) }
 };
 
-static const EventDispatchData sMutationEvents[] = {
-  { NS_MUTATION_SUBTREEMODIFIED,
-    HANDLER(&nsIDOMMutationListener::SubtreeModified)          },
-  { NS_MUTATION_NODEINSERTED,
-    HANDLER(&nsIDOMMutationListener::NodeInserted)             },
-  { NS_MUTATION_NODEREMOVED,
-    HANDLER(&nsIDOMMutationListener::NodeRemoved)              },
-  { NS_MUTATION_NODEINSERTEDINTODOCUMENT,
-    HANDLER(&nsIDOMMutationListener::NodeInsertedIntoDocument) },
-  { NS_MUTATION_NODEREMOVEDFROMDOCUMENT,
-    HANDLER(&nsIDOMMutationListener::NodeRemovedFromDocument)  },
-  { NS_MUTATION_ATTRMODIFIED,
-    HANDLER(&nsIDOMMutationListener::AttrModified)             },
-  { NS_MUTATION_CHARACTERDATAMODIFIED,
-    HANDLER(&nsIDOMMutationListener::CharacterDataModified)    }
-};
-
 static const EventDispatchData sUIEvents[] = {
   { NS_UI_ACTIVATE, HANDLER(&nsIDOMUIListener::Activate) },
   { NS_UI_FOCUSIN,  HANDLER(&nsIDOMUIListener::FocusIn)  },
   { NS_UI_FOCUSOUT, HANDLER(&nsIDOMUIListener::FocusOut) }
 };
 
-static const EventDispatchData sPageTransitionEvents[] = {
-  { NS_PAGE_SHOW, HANDLER(&nsIDOMPageTransitionListener::PageShow) },
-  { NS_PAGE_HIDE, HANDLER(&nsIDOMPageTransitionListener::PageHide) }
-};
-
 #ifdef MOZ_SVG
 static const EventDispatchData sSVGEvents[] = {
   { NS_SVG_LOAD,   HANDLER(&nsIDOMSVGListener::Load)   },
@@ -359,14 +318,10 @@ static const EventTypeData sEventTypes[] = {
   IMPL_EVENTTYPEDATA(Focus),
   IMPL_EVENTTYPEDATA(Form),
   IMPL_EVENTTYPEDATA(Drag),
-  IMPL_EVENTTYPEDATA(Paint),
   IMPL_EVENTTYPEDATA(Text),
   IMPL_EVENTTYPEDATA(Composition),
   IMPL_EVENTTYPEDATA(XUL),
-  IMPL_EVENTTYPEDATA(Scroll),
-  IMPL_EVENTTYPEDATA(Mutation),
-  IMPL_EVENTTYPEDATA(UI),
-  IMPL_EVENTTYPEDATA(PageTransition)
+  IMPL_EVENTTYPEDATA(UI)
 #ifdef MOZ_SVG
  ,
   IMPL_EVENTTYPEDATA(SVG),
@@ -553,9 +508,7 @@ nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener,
 
   // For mutation listeners, we need to update the global bit on the DOM window.
   // Otherwise we won't actually fire the mutation event.
-  if ((aType >= NS_MUTATION_START && aType <= NS_MUTATION_END) ||
-      (ls->mTypeData && ls->mTypeData->iid &&
-       ls->mTypeData->iid->Equals(NS_GET_IID(nsIDOMMutationListener)))) {
+  if (aType >= NS_MUTATION_START && aType <= NS_MUTATION_END) {
     mMayHaveMutationListeners = PR_TRUE;
     // Go from our target to the nearest enclosing DOM window.
     nsCOMPtr<nsPIDOMWindow> window;
@@ -574,13 +527,7 @@ nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener,
     if (window) {
       NS_ASSERTION(window->IsInnerWindow(),
                    "Setting mutation listener bits on outer window?");
-      if (ls->mTypeData) {
-        // If we have type data, nsIDOMMutationListener is used and so we
-        // have to listen all mutation events.
-        window->SetMutationListeners(kAllMutationBits);
-      } else {
-        window->SetMutationListeners(MutationBitForEventType(aType));
-      }
+      window->SetMutationListeners(MutationBitForEventType(aType));
     }
   }
 
@@ -1899,10 +1846,8 @@ nsEventListenerManager::HasMutationListeners(PRBool* aListener)
       nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*,
                                             mListeners.FastElementAt(i));
       if (ls &&
-          (ls->mEventType >= NS_MUTATION_START &&
-           ls->mEventType <= NS_MUTATION_END) ||
-          (ls->mTypeData && ls->mTypeData->iid &&
-           ls->mTypeData->iid->Equals(NS_GET_IID(nsIDOMMutationListener)))) {
+          ls->mEventType >= NS_MUTATION_START &&
+          ls->mEventType <= NS_MUTATION_END) {
         *aListener = PR_TRUE;
         break;
       }
@@ -1921,10 +1866,6 @@ nsEventListenerManager::MutationListenerBits()
     for (i = 0; i < count; ++i) {
       nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*,
                                             mListeners.FastElementAt(i));
-      if (ls && ls->mTypeData && ls->mTypeData->iid &&
-          ls->mTypeData->iid->Equals(NS_GET_IID(nsIDOMMutationListener))) {
-        return kAllMutationBits;
-      }
       if (ls &&
           (ls->mEventType >= NS_MUTATION_START &&
            ls->mEventType <= NS_MUTATION_END)) {

content/xbl/src/nsXBLBinding.cpp

@@ -77,12 +77,10 @@
 #include "nsIDOMMouseMotionListener.h"
 #include "nsIDOMLoadListener.h"
 #include "nsIDOMFocusListener.h"
-#include "nsIDOMPaintListener.h"
 #include "nsIDOMKeyListener.h"
 #include "nsIDOMFormListener.h"
 #include "nsIDOMXULListener.h"
 #include "nsIDOMDragListener.h"
-#include "nsIDOMMutationListener.h"
 #include "nsIDOMContextMenuListener.h"
 #include "nsIDOMEventGroup.h"
 #include "nsAttrName.h"

content/xul/content/src/nsXULElement.cpp

@@ -71,11 +71,9 @@
 #include "nsIDOMMouseMotionListener.h"
 #include "nsIDOMLoadListener.h"
 #include "nsIDOMFocusListener.h"
-#include "nsIDOMPaintListener.h"
 #include "nsIDOMKeyListener.h"
 #include "nsIDOMFormListener.h"
 #include "nsIDOMXULListener.h"
-#include "nsIDOMScrollListener.h"
 #include "nsIDOMContextMenuListener.h"
 #include "nsIDOMDragListener.h"
 #include "nsIDOMEventListener.h"

dom/public/coreEvents/Makefile.in

@@ -52,16 +52,12 @@ EXPORTS =				\
 	nsIDOMLoadListener.h		\
 	nsIDOMMouseListener.h		\
 	nsIDOMMouseMotionListener.h	\
-	nsIDOMMutationListener.h	\
-	nsIDOMPaintListener.h		\
 	nsIDOMDragListener.h		\
 	nsIDOMTextListener.h		\
 	nsIDOMCompositionListener.h	\
 	nsIDOMXULListener.h		\
-	nsIDOMScrollListener.h		\
 	nsIDOMContextMenuListener.h	\
 	nsIDOMUIListener.h		\
-	nsIDOMPageTransitionListener.h	\
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk