From 2b42662c532e365f67b3d3e2c84bf8ff18bed934 Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Mon, 7 Sep 2015 23:55:52 +0900 Subject: [PATCH] Bug 895274 part.114 Rename NS_SVG_ZOOM to eSVGZoom r=smaug --- dom/events/EventNameList.h | 4 ++-- dom/svg/SVGSVGElement.cpp | 2 +- dom/svg/SVGZoomEvent.cpp | 2 +- widget/EventMessageList.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index 3432c92a10cf..77f91b4f88cc 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -759,7 +759,7 @@ NON_IDL_EVENT(SVGScroll, eBasicEventClass) NON_IDL_EVENT(SVGZoom, - NS_SVG_ZOOM, + eSVGZoom, EventNameType_None, eSVGZoomEventClass) @@ -767,7 +767,7 @@ NON_IDL_EVENT(SVGZoom, #ifndef MESSAGE_TO_EVENT // This is a bit hackish, but SVG's event names are weird. NON_IDL_EVENT(zoom, - NS_SVG_ZOOM, + eSVGZoom, EventNameType_SVGSVG, eBasicEventClass) #endif diff --git a/dom/svg/SVGSVGElement.cpp b/dom/svg/SVGSVGElement.cpp index d2bedbc77a42..67906a87db0f 100644 --- a/dom/svg/SVGSVGElement.cpp +++ b/dom/svg/SVGSVGElement.cpp @@ -511,7 +511,7 @@ SVGSVGElement::SetCurrentScaleTranslate(float s, float x, float y) if (presShell && IsRoot()) { nsEventStatus status = nsEventStatus_eIgnore; if (mPreviousScale != mCurrentScale) { - InternalSVGZoomEvent svgZoomEvent(true, NS_SVG_ZOOM); + InternalSVGZoomEvent svgZoomEvent(true, eSVGZoom); presShell->HandleDOMEventWithTarget(this, &svgZoomEvent, &status); } else { WidgetEvent svgScrollEvent(true, eSVGScroll); diff --git a/dom/svg/SVGZoomEvent.cpp b/dom/svg/SVGZoomEvent.cpp index c25acf01d481..239351da36cd 100644 --- a/dom/svg/SVGZoomEvent.cpp +++ b/dom/svg/SVGZoomEvent.cpp @@ -31,7 +31,7 @@ SVGZoomEvent::SVGZoomEvent(EventTarget* aOwner, nsPresContext* aPresContext, InternalSVGZoomEvent* aEvent) : UIEvent(aOwner, aPresContext, - aEvent ? aEvent : new InternalSVGZoomEvent(false, NS_SVG_ZOOM)) + aEvent ? aEvent : new InternalSVGZoomEvent(false, eSVGZoom)) , mPreviousScale(0) , mNewScale(0) { diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 5d2f70caeeba..b9f35b59f3c1 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -199,7 +199,7 @@ NS_EVENT_MESSAGE(eSVGScroll, eSVGEventFirst + 5) // SVG Zoom events NS_EVENT_MESSAGE(eSVGZoomEventFirst, 2900) -NS_EVENT_MESSAGE(NS_SVG_ZOOM, eSVGZoomEventFirst) +NS_EVENT_MESSAGE(eSVGZoom, eSVGZoomEventFirst) // XUL command events NS_EVENT_MESSAGE(eXULCommandEventFirst, 3000)