wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 895274 part.79 Rename NS_DRAGDROP_END to eDragEnd r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2015-09-02 15:08:02 +09:00
parent 4d11a6026b
commit 1aec683604
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsContentUtils.cpp
View File

@ -5516,7 +5516,7 @@ nsContentUtils::SetDataTransferInEvent(WidgetDragEvent* aDragEvent)
} }
else if (aDragEvent->mMessage == eDrop || else if (aDragEvent->mMessage == eDrop ||
aDragEvent->mMessage == NS_DRAGDROP_DRAGDROP || aDragEvent->mMessage == NS_DRAGDROP_DRAGDROP ||
aDragEvent->mMessage == NS_DRAGDROP_END) { aDragEvent->mMessage == eDragEnd) {
// For the drop and dragend events, set the drop effect based on the // For the drop and dragend events, set the drop effect based on the
// last value that the dropEffect had. This will have been set in // last value that the dropEffect had. This will have been set in
// EventStateManager::PostHandleEvent for the last dragenter or // EventStateManager::PostHandleEvent for the last dragenter or

2
dom/base/nsGlobalWindow.cpp
View File

@ -3086,7 +3086,7 @@ nsGlobalWindow::PreHandleEvent(EventChainPreVisitor& aVisitor)
} }
} else if (msg == eMouseDown && aVisitor.mEvent->mFlags.mIsTrusted) { } else if (msg == eMouseDown && aVisitor.mEvent->mFlags.mIsTrusted) {
gMouseDown = true; gMouseDown = true;
} else if ((msg == eMouseUp || msg == NS_DRAGDROP_END) && } else if ((msg == eMouseUp || msg == eDragEnd) &&
aVisitor.mEvent->mFlags.mIsTrusted) { aVisitor.mEvent->mFlags.mIsTrusted) {
gMouseDown = false; gMouseDown = false;
if (gDragServiceDisabled) { if (gDragServiceDisabled) {

2
dom/events/EventNameList.h
View File

@ -183,7 +183,7 @@ EVENT(drag,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
eDragEventClass) eDragEventClass)
EVENT(dragend, EVENT(dragend,
NS_DRAGDROP_END, eDragEnd,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
eDragEventClass) eDragEventClass)
EVENT(dragenter, EVENT(dragenter,

2
widget/EventMessageList.h
View File

@ -108,7 +108,7 @@ NS_EVENT_MESSAGE(NS_DRAGDROP_EXIT, eDragDropEventFirst + 2)
NS_EVENT_MESSAGE(NS_DRAGDROP_DRAGDROP, eDragDropEventFirst + 3) NS_EVENT_MESSAGE(NS_DRAGDROP_DRAGDROP, eDragDropEventFirst + 3)
NS_EVENT_MESSAGE(NS_DRAGDROP_GESTURE, eDragDropEventFirst + 4) NS_EVENT_MESSAGE(NS_DRAGDROP_GESTURE, eDragDropEventFirst + 4)
NS_EVENT_MESSAGE(NS_DRAGDROP_DRAG, eDragDropEventFirst + 5) NS_EVENT_MESSAGE(NS_DRAGDROP_DRAG, eDragDropEventFirst + 5)
NS_EVENT_MESSAGE(NS_DRAGDROP_END, eDragDropEventFirst + 6) NS_EVENT_MESSAGE(eDragEnd, eDragDropEventFirst + 6)
NS_EVENT_MESSAGE(eDragStart, eDragDropEventFirst + 7) NS_EVENT_MESSAGE(eDragStart, eDragDropEventFirst + 7)
NS_EVENT_MESSAGE(eDrop, eDragDropEventFirst + 8) NS_EVENT_MESSAGE(eDrop, eDragDropEventFirst + 8)
NS_EVENT_MESSAGE(eDragLeave, eDragDropEventFirst + 9) NS_EVENT_MESSAGE(eDragLeave, eDragDropEventFirst + 9)

2
widget/MouseEvents.h
View File

@ -324,7 +324,7 @@ public:
mFlags.mCancelable = mFlags.mCancelable =
(aMessage != NS_DRAGDROP_EXIT && (aMessage != NS_DRAGDROP_EXIT &&
aMessage != eDragLeave && aMessage != eDragLeave &&
aMessage != NS_DRAGDROP_END); aMessage != eDragEnd);
} }
virtual WidgetEvent* Duplicate() const override virtual WidgetEvent* Duplicate() const override

2
widget/WidgetEventImpl.cpp
View File

@ -105,7 +105,7 @@ WidgetEvent::HasDragEventMessage() const
case NS_DRAGDROP_DRAGDROP: case NS_DRAGDROP_DRAGDROP:
case NS_DRAGDROP_GESTURE: case NS_DRAGDROP_GESTURE:
case NS_DRAGDROP_DRAG: case NS_DRAGDROP_DRAG:
case NS_DRAGDROP_END: case eDragEnd:
case eDragStart: case eDragStart:
case eDrop: case eDrop:
case eDragLeave: case eDragLeave:

2
widget/gtk/nsDragService.cpp
View File

@ -235,7 +235,7 @@ OnSourceGrabEventAfter(GtkWidget *widget, GdkEvent *event, gpointer user_data)
sMotionEvent = gdk_event_copy(event); sMotionEvent = gdk_event_copy(event);
// Update the cursor position. The last of these recorded gets used for // Update the cursor position. The last of these recorded gets used for
// the NS_DRAGDROP_END event. // the eDragEnd event.
nsDragService *dragService = static_cast<nsDragService*>(user_data); nsDragService *dragService = static_cast<nsDragService*>(user_data);
dragService->SetDragEndPoint(nsIntPoint(event->motion.x_root, dragService->SetDragEndPoint(nsIntPoint(event->motion.x_root,
event->motion.y_root)); event->motion.y_root));

7
widget/nsBaseDragService.cpp
View File

@ -356,8 +356,9 @@ nsBaseDragService::EndDragSession(bool aDoneDrag)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
if (aDoneDrag && !mSuppressLevel) if (aDoneDrag && !mSuppressLevel) {
FireDragEventAtSource(NS_DRAGDROP_END); FireDragEventAtSource(eDragEnd);
}
if (mDragPopup) { if (mDragPopup) {
nsXULPopupManager* pm = nsXULPopupManager::GetInstance(); nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
@ -405,7 +406,7 @@ nsBaseDragService::FireDragEventAtSource(uint32_t aMsg)
nsEventStatus status = nsEventStatus_eIgnore; nsEventStatus status = nsEventStatus_eIgnore;
WidgetDragEvent event(true, static_cast<EventMessage>(aMsg), nullptr); WidgetDragEvent event(true, static_cast<EventMessage>(aMsg), nullptr);
event.inputSource = mInputSource; event.inputSource = mInputSource;
if (aMsg == NS_DRAGDROP_END) { if (aMsg == eDragEnd) {
event.refPoint.x = mEndDragPoint.x; event.refPoint.x = mEndDragPoint.x;
event.refPoint.y = mEndDragPoint.y; event.refPoint.y = mEndDragPoint.y;
event.userCancelled = mUserCancelled; event.userCancelled = mUserCancelled;