Bug 895274 part.78 Rename NS_DRAGDROP_START to eDragStart r=smaug

This commit is contained in:
Masayuki Nakano 2015-09-02 15:08:01 +09:00
parent 05598ebcf2
commit b0276f5a3b
8 changed files with 10 additions and 10 deletions

View File

@ -5465,7 +5465,7 @@ nsContentUtils::SetDataTransferInEvent(WidgetDragEvent* aDragEvent)
// created before the event fires, so it should already be set. For other
// drag events, get the object from the drag session.
NS_ASSERTION(aDragEvent->mMessage != NS_DRAGDROP_GESTURE &&
aDragEvent->mMessage != NS_DRAGDROP_START,
aDragEvent->mMessage != eDragStart,
"draggesture event created without a dataTransfer");
nsCOMPtr<nsIDragSession> dragSession = GetDragSession();

View File

@ -88,7 +88,7 @@ DataTransfer::DataTransfer(nsISupports* aParent, EventMessage aEventMessage,
// external usage, cache the data from the native clipboard or drag.
if (aEventMessage == NS_CUT ||
aEventMessage == NS_COPY ||
aEventMessage == NS_DRAGDROP_START ||
aEventMessage == eDragStart ||
aEventMessage == NS_DRAGDROP_GESTURE) {
mReadOnly = false;
} else if (mIsExternal) {
@ -135,7 +135,7 @@ DataTransfer::DataTransfer(nsISupports* aParent,
// modifiable, but those events should have been using the first constructor
// above.
NS_ASSERTION(aEventMessage != NS_DRAGDROP_GESTURE &&
aEventMessage != NS_DRAGDROP_START,
aEventMessage != eDragStart,
"invalid event type for DataTransfer constructor");
}

View File

@ -199,7 +199,7 @@ EVENT(dragover,
EventNameType_HTMLXUL,
eDragEventClass)
EVENT(dragstart,
NS_DRAGDROP_START,
eDragStart,
EventNameType_HTMLXUL,
eDragEventClass)
EVENT(drop,

View File

@ -1637,7 +1637,7 @@ EventStateManager::GenerateDragGesture(nsPresContext* aPresContext,
return;
nsRefPtr<DataTransfer> dataTransfer =
new DataTransfer(window, NS_DRAGDROP_START, false, -1);
new DataTransfer(window, eDragStart, false, -1);
nsCOMPtr<nsISelection> selection;
nsCOMPtr<nsIContent> eventContent, targetContent;
@ -1663,7 +1663,7 @@ EventStateManager::GenerateDragGesture(nsPresContext* aPresContext,
// get the widget from the target frame
WidgetDragEvent startEvent(aEvent->mFlags.mIsTrusted,
NS_DRAGDROP_START, widget);
eDragStart, widget);
FillInEventFromGestureDown(&startEvent);
WidgetDragEvent gestureEvent(aEvent->mFlags.mIsTrusted,

View File

@ -2809,7 +2809,7 @@ ContentChild::RecvInvokeDragSession(nsTArray<IPCDataTransfer>&& aTransfers,
if (session) {
session->SetDragAction(aAction);
nsCOMPtr<DataTransfer> dataTransfer =
new DataTransfer(nullptr, NS_DRAGDROP_START, false, -1);
new DataTransfer(nullptr, eDragStart, false, -1);
for (uint32_t i = 0; i < aTransfers.Length(); ++i) {
auto& items = aTransfers[i].items();
for (uint32_t j = 0; j < items.Length(); ++j) {

View File

@ -1269,7 +1269,7 @@ nsXULElement::PreHandleEvent(EventChainPreVisitor& aVisitor)
aVisitor.mEvent->mMessage == eMouseDoubleClick ||
aVisitor.mEvent->mMessage == NS_XUL_COMMAND ||
aVisitor.mEvent->mMessage == eContextMenu ||
aVisitor.mEvent->mMessage == NS_DRAGDROP_START ||
aVisitor.mEvent->mMessage == eDragStart ||
aVisitor.mEvent->mMessage == NS_DRAGDROP_GESTURE)) {
// Don't propagate these events from native anonymous scrollbar.
aVisitor.mCanHandle = true;

View File

@ -109,7 +109,7 @@ 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(NS_DRAGDROP_END, eDragDropEventFirst + 6)
NS_EVENT_MESSAGE(NS_DRAGDROP_START, eDragDropEventFirst + 7)
NS_EVENT_MESSAGE(eDragStart, eDragDropEventFirst + 7)
NS_EVENT_MESSAGE(eDrop, eDragDropEventFirst + 8)
NS_EVENT_MESSAGE(eDragLeave, eDragDropEventFirst + 9)
NS_EVENT_MESSAGE(eDragDropEventLast, eDragLeave)

View File

@ -106,7 +106,7 @@ WidgetEvent::HasDragEventMessage() const
case NS_DRAGDROP_GESTURE:
case NS_DRAGDROP_DRAG:
case NS_DRAGDROP_END:
case NS_DRAGDROP_START:
case eDragStart:
case eDrop:
case eDragLeave:
return true;