Bug 499665 - Remove nsIDOMSVGListener and nsIDOMSVGZoomListener interfaces, r+sr=roc
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Tue, 23 Jun 2009 12:19:12 +0300
changeset 29467 0fab3712e348077bf9b7a6ecd48fd59a2cb96b43
parent 29466 068ff5c2592fe8ccb33e51a3dd0753a9aa5dbaa0
child 29468 6ac21b65f123d88d91fc327b985a6f43869ff38e
push idunknown
push userunknown
push dateunknown
bugs499665
milestone1.9.2a1pre
Bug 499665 - Remove nsIDOMSVGListener and nsIDOMSVGZoomListener interfaces, r+sr=roc
content/events/src/nsEventListenerManager.cpp
content/svg/content/src/Makefile.in
content/svg/content/src/nsIDOMSVGListener.h
content/svg/content/src/nsIDOMSVGZoomListener.h
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -50,18 +50,16 @@
 #include "nsIDOMFormListener.h"
 #include "nsIDOMLoadListener.h"
 #include "nsIDOMTextListener.h"
 #include "nsIDOMCompositionListener.h"
 #include "nsIDOMXULListener.h"
 #include "nsIDOMUIListener.h"
 #include "nsITextControlFrame.h"
 #ifdef MOZ_SVG
-#include "nsIDOMSVGListener.h"
-#include "nsIDOMSVGZoomListener.h"
 #include "nsGkAtoms.h"
 #endif // MOZ_SVG
 #include "nsIEventStateManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIJSEventListener.h"
 #include "prmem.h"
 #include "nsIScriptGlobalObject.h"
@@ -258,31 +256,16 @@ static const EventDispatchData sXULEvent
 };
 
 static const EventDispatchData sUIEvents[] = {
   { NS_UI_ACTIVATE, HANDLER(&nsIDOMUIListener::Activate) },
   { NS_UI_FOCUSIN,  HANDLER(&nsIDOMUIListener::FocusIn)  },
   { NS_UI_FOCUSOUT, HANDLER(&nsIDOMUIListener::FocusOut) }
 };
 
-#ifdef MOZ_SVG
-static const EventDispatchData sSVGEvents[] = {
-  { NS_SVG_LOAD,   HANDLER(&nsIDOMSVGListener::Load)   },
-  { NS_SVG_UNLOAD, HANDLER(&nsIDOMSVGListener::Unload) },
-  { NS_SVG_ABORT,  HANDLER(&nsIDOMSVGListener::Abort)  },
-  { NS_SVG_ERROR,  HANDLER(&nsIDOMSVGListener::Error)  },
-  { NS_SVG_RESIZE, HANDLER(&nsIDOMSVGListener::Resize) },
-  { NS_SVG_SCROLL, HANDLER(&nsIDOMSVGListener::Scroll) }
-};
-
-static const EventDispatchData sSVGZoomEvents[] = {
-  { NS_SVG_ZOOM, HANDLER(&nsIDOMSVGZoomListener::Zoom) }
-};
-#endif // MOZ_SVG
-
 #define IMPL_EVENTTYPEDATA(type) \
 { \
   s##type##Events, \
   NS_ARRAY_LENGTH(s##type##Events), \
   &NS_GET_IID(nsIDOM##type##Listener) \
 }
  
 // IMPORTANT: indices match up with eEventArrayType_ enum values
@@ -294,21 +277,16 @@ static const EventTypeData sEventTypes[]
   IMPL_EVENTTYPEDATA(Key),
   IMPL_EVENTTYPEDATA(Load),
   IMPL_EVENTTYPEDATA(Focus),
   IMPL_EVENTTYPEDATA(Form),
   IMPL_EVENTTYPEDATA(Text),
   IMPL_EVENTTYPEDATA(Composition),
   IMPL_EVENTTYPEDATA(XUL),
   IMPL_EVENTTYPEDATA(UI)
-#ifdef MOZ_SVG
- ,
-  IMPL_EVENTTYPEDATA(SVG),
-  IMPL_EVENTTYPEDATA(SVGZoom)
-#endif // MOZ_SVG
 };
 
 // Strong references to event groups
 nsIDOMEventGroup* gSystemEventGroup = nsnull;
 nsIDOMEventGroup* gDOM2EventGroup = nsnull;
 
 nsDataHashtable<nsISupportsHashKey, PRUint32>* gEventIdTable = nsnull;
 
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -151,18 +151,16 @@ CPPSRCS += nsSVGAnimateElement.cpp \
 endif
 
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 EXPORTS =  			\
-	nsIDOMSVGListener.h \
-	nsIDOMSVGZoomListener.h \
 	nsISVGValue.h              \
 	nsISVGValueObserver.h      \
 	nsISVGValueUtils.h         \
 	nsSVGFeatures.h            \
 	nsSVGNumber.h              \
 	nsSVGRect.h                \
 	nsSVGPoint.h               \
 	nsSVGMatrix.h              \
deleted file mode 100644
--- a/content/svg/content/src/nsIDOMSVGListener.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla SVG Project code.
- *
- * The Initial Developer of the Original Code is Jonathan Watt.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jonathan Watt <jonathan.watt@strath.ac.uk> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __NS_SVGEVENT_H__
-#define __NS_SVGEVENT_H__
-
-#include "nsIDOMEventListener.h"
-
-class nsIDOMEvent;
-
-/*
- * SVG event listener interface.
- */
-
-#define NS_IDOMSVGLISTENER_IID \
-{ 0xcb6f30f1, 0x5754, 0x49a3, { 0xa6, 0x6f, 0x2d, 0x6b, 0xa1, 0xb6, 0x3a, 0x58 } }
-
-class nsIDOMSVGListener : public nsIDOMEventListener {
- public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMSVGLISTENER_IID)
-  NS_IMETHOD Load   (nsIDOMEvent* aEvent) = 0;
-  NS_IMETHOD Unload (nsIDOMEvent* aEvent) = 0;
-  NS_IMETHOD Abort  (nsIDOMEvent* aEvent) = 0;
-  NS_IMETHOD Error  (nsIDOMEvent* aEvent) = 0;
-  NS_IMETHOD Resize (nsIDOMEvent* aEvent) = 0;
-  NS_IMETHOD Scroll (nsIDOMEvent* aEvent) = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMSVGListener, NS_IDOMSVGLISTENER_IID)
-
-#endif // __NS_SVGEVENT_H__
deleted file mode 100644
--- a/content/svg/content/src/nsIDOMSVGZoomListener.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla SVG Project code.
- *
- * The Initial Developer of the Original Code is Jonathan Watt.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jonathan Watt <jonathan.watt@strath.ac.uk> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __NS_SVGZOOMEVENT_H__
-#define __NS_SVGZOOMEVENT_H__
-
-#include "nsIDOMEventListener.h"
-
-class nsIDOMEvent;
-
-/*
- * SVG zoom event listener interface.
- */
-
-#define NS_IDOMSVGZOOMLISTENER_IID \
-{ 0xccbeadab, 0xb3fe, 0x42f7, { 0x90, 0xed, 0xd6, 0xe4, 0x0f, 0x71, 0x2c, 0x29 } }
-
-class nsIDOMSVGZoomListener : public nsIDOMEventListener {
- public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMSVGZOOMLISTENER_IID)
-  NS_IMETHOD Zoom (nsIDOMEvent* aEvent) = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMSVGZoomListener,
-                              NS_IDOMSVGZOOMLISTENER_IID)
-
-#endif // __NS_SVGZOOMEVENT_H__