From 90a5ee85409586b7fdbb8b58331312e574da9eed Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Wed, 2 Sep 2015 15:08:02 +0900 Subject: [PATCH] Bug 895274 part.80 Rename NS_DRAGDROP_DRAG to eDrag r=smaug --- dom/events/EventNameList.h | 2 +- dom/ipc/TabChild.cpp | 2 +- widget/EventMessageList.h | 2 +- widget/WidgetEventImpl.cpp | 2 +- widget/cocoa/nsChildView.mm | 2 +- widget/gtk/nsDragService.cpp | 2 +- widget/windows/nsNativeDragTarget.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index 0d59673e8323..c60be3e009be 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -179,7 +179,7 @@ EVENT(dblclick, EventNameType_HTMLXUL, eMouseEventClass) EVENT(drag, - NS_DRAGDROP_DRAG, + eDrag, EventNameType_HTMLXUL, eDragEventClass) EVENT(dragend, diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 6aa964461cba..0cfb1f1ef236 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -2195,7 +2195,7 @@ TabChild::RecvRealDragEvent(const WidgetDragEvent& aEvent, if (dragService) { // This will dispatch 'drag' event at the source if the // drag transaction started in this process. - dragService->FireDragEventAtSource(NS_DRAGDROP_DRAG); + dragService->FireDragEventAtSource(eDrag); } } diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index e1817aa57f70..1e8e807f3b89 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -107,7 +107,7 @@ NS_EVENT_MESSAGE(NS_DRAGDROP_OVER, eDragDropEventFirst + 1) NS_EVENT_MESSAGE(NS_DRAGDROP_EXIT, eDragDropEventFirst + 2) NS_EVENT_MESSAGE(NS_DRAGDROP_DRAGDROP, eDragDropEventFirst + 3) NS_EVENT_MESSAGE(NS_DRAGDROP_GESTURE, eDragDropEventFirst + 4) -NS_EVENT_MESSAGE(NS_DRAGDROP_DRAG, eDragDropEventFirst + 5) +NS_EVENT_MESSAGE(eDrag, eDragDropEventFirst + 5) NS_EVENT_MESSAGE(eDragEnd, eDragDropEventFirst + 6) NS_EVENT_MESSAGE(eDragStart, eDragDropEventFirst + 7) NS_EVENT_MESSAGE(eDrop, eDragDropEventFirst + 8) diff --git a/widget/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp index 330a89c96332..e5be3a4117f0 100644 --- a/widget/WidgetEventImpl.cpp +++ b/widget/WidgetEventImpl.cpp @@ -104,7 +104,7 @@ WidgetEvent::HasDragEventMessage() const case NS_DRAGDROP_EXIT: case NS_DRAGDROP_DRAGDROP: case NS_DRAGDROP_GESTURE: - case NS_DRAGDROP_DRAG: + case eDrag: case eDragEnd: case eDragStart: case eDrop: diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 3fcf3714cdbb..289b61128085 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -5744,7 +5744,7 @@ PanGestureTypeForEvent(NSEvent* aEvent) if (aMessage == NS_DRAGDROP_OVER) { // fire the drag event at the source. Just ignore whether it was // cancelled or not as there isn't actually a means to stop the drag - mDragService->FireDragEventAtSource(NS_DRAGDROP_DRAG); + mDragService->FireDragEventAtSource(eDrag); dragSession->SetCanDrop(false); } else if (aMessage == eDrop) { // We make the assumption that the dragOver handlers have correctly set diff --git a/widget/gtk/nsDragService.cpp b/widget/gtk/nsDragService.cpp index 07521a3c88a7..71293f92d8f4 100644 --- a/widget/gtk/nsDragService.cpp +++ b/widget/gtk/nsDragService.cpp @@ -2036,7 +2036,7 @@ nsDragService::DispatchMotionEvents() { mCanDrop = false; - FireDragEventAtSource(NS_DRAGDROP_DRAG); + FireDragEventAtSource(eDrag); mTargetWindow-> DispatchDragEvent(NS_DRAGDROP_OVER, mTargetWindowPoint, mTargetTime); diff --git a/widget/windows/nsNativeDragTarget.cpp b/widget/windows/nsNativeDragTarget.cpp index 3592e56815fa..bc658fe1b2d7 100644 --- a/widget/windows/nsNativeDragTarget.cpp +++ b/widget/windows/nsNativeDragTarget.cpp @@ -340,7 +340,7 @@ nsNativeDragTarget::DragOver(DWORD grfKeyState, GetDropTargetHelper()->DragOver(&pt, *pdwEffect); } - mDragService->FireDragEventAtSource(NS_DRAGDROP_DRAG); + mDragService->FireDragEventAtSource(eDrag); // Now process the native drag state and then dispatch the event ProcessDrag(NS_DRAGDROP_OVER, grfKeyState, ptl, pdwEffect);