зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1162050 - remove instances of eLegacyDragDrop and dragdrop. r=enn
MozReview-Commit-ID: Di41WT8zcZ1 --HG-- extra : rebase_source : b9502c06b5351d0c75d23b17319c77579ccbb5a1
This commit is contained in:
Родитель
81ebc7d712
Коммит
aa9a74f34c
|
@ -5397,8 +5397,7 @@ nsContentUtils::SetDataTransferInEvent(WidgetDragEvent* aDragEvent)
|
|||
}
|
||||
|
||||
bool isCrossDomainSubFrameDrop = false;
|
||||
if (aDragEvent->mMessage == eDrop ||
|
||||
aDragEvent->mMessage == eLegacyDragDrop) {
|
||||
if (aDragEvent->mMessage == eDrop) {
|
||||
isCrossDomainSubFrameDrop = CheckForSubFrameDrop(dragSession, aDragEvent);
|
||||
}
|
||||
|
||||
|
@ -5422,7 +5421,6 @@ nsContentUtils::SetDataTransferInEvent(WidgetDragEvent* aDragEvent)
|
|||
FilterDropEffect(action, effectAllowed));
|
||||
}
|
||||
else if (aDragEvent->mMessage == eDrop ||
|
||||
aDragEvent->mMessage == eLegacyDragDrop ||
|
||||
aDragEvent->mMessage == eDragEnd) {
|
||||
// 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
|
||||
|
|
|
@ -328,7 +328,6 @@ GK_ATOM(DOMNodeRemovedFromDocument, "DOMNodeRemovedFromDocument")
|
|||
GK_ATOM(DOMSubtreeModified, "DOMSubtreeModified")
|
||||
GK_ATOM(double_, "double")
|
||||
GK_ATOM(drag, "drag")
|
||||
GK_ATOM(dragdrop, "dragdrop")
|
||||
GK_ATOM(dragend, "dragend")
|
||||
GK_ATOM(dragenter, "dragenter")
|
||||
GK_ATOM(dragevent, "dragevent")
|
||||
|
|
|
@ -616,8 +616,7 @@ DataTransfer::GetDataAtInternal(const nsAString& aFormat, uint32_t aIndex,
|
|||
// we only allow access to data of the same principal. During other events,
|
||||
// only allow access to the data with the same principal.
|
||||
bool checkFormatItemPrincipal = mIsCrossDomainSubFrameDrop ||
|
||||
(mEventMessage != eDrop && mEventMessage != eLegacyDragDrop &&
|
||||
mEventMessage != ePaste);
|
||||
(mEventMessage != eDrop && mEventMessage != ePaste);
|
||||
MOZ_ASSERT(aSubjectPrincipal);
|
||||
|
||||
RefPtr<DataTransferItem> item = mItems->MozItemByTypeAt(format, aIndex);
|
||||
|
|
|
@ -774,10 +774,6 @@ NON_IDL_EVENT(dragexit,
|
|||
eDragExit,
|
||||
EventNameType_XUL,
|
||||
eDragEventClass)
|
||||
NON_IDL_EVENT(dragdrop,
|
||||
eLegacyDragDrop,
|
||||
EventNameType_XUL,
|
||||
eDragEventClass)
|
||||
NON_IDL_EVENT(overflow,
|
||||
eScrollPortOverflow,
|
||||
EventNameType_XUL,
|
||||
|
|
|
@ -2906,7 +2906,6 @@ nsPluginInstanceOwner::Destroy()
|
|||
content->RemoveEventListener(NS_LITERAL_STRING("keydown"), this, true);
|
||||
content->RemoveEventListener(NS_LITERAL_STRING("keyup"), this, true);
|
||||
content->RemoveEventListener(NS_LITERAL_STRING("drop"), this, true);
|
||||
content->RemoveEventListener(NS_LITERAL_STRING("dragdrop"), this, true);
|
||||
content->RemoveEventListener(NS_LITERAL_STRING("drag"), this, true);
|
||||
content->RemoveEventListener(NS_LITERAL_STRING("dragenter"), this, true);
|
||||
content->RemoveEventListener(NS_LITERAL_STRING("dragover"), this, true);
|
||||
|
@ -3305,7 +3304,6 @@ nsresult nsPluginInstanceOwner::Init(nsIContent* aContent)
|
|||
aContent->AddEventListener(NS_LITERAL_STRING("keydown"), this, true);
|
||||
aContent->AddEventListener(NS_LITERAL_STRING("keyup"), this, true);
|
||||
aContent->AddEventListener(NS_LITERAL_STRING("drop"), this, true);
|
||||
aContent->AddEventListener(NS_LITERAL_STRING("dragdrop"), this, true);
|
||||
aContent->AddEventListener(NS_LITERAL_STRING("drag"), this, true);
|
||||
aContent->AddEventListener(NS_LITERAL_STRING("dragenter"), this, true);
|
||||
aContent->AddEventListener(NS_LITERAL_STRING("dragover"), this, true);
|
||||
|
|
|
@ -131,7 +131,6 @@ NS_EVENT_MESSAGE(eBlur)
|
|||
NS_EVENT_MESSAGE(eDragEnter)
|
||||
NS_EVENT_MESSAGE(eDragOver)
|
||||
NS_EVENT_MESSAGE(eDragExit)
|
||||
NS_EVENT_MESSAGE(eLegacyDragDrop)
|
||||
NS_EVENT_MESSAGE(eDrag)
|
||||
NS_EVENT_MESSAGE(eDragEnd)
|
||||
NS_EVENT_MESSAGE(eDragStart)
|
||||
|
|
|
@ -213,7 +213,6 @@ WidgetEvent::HasDragEventMessage() const
|
|||
case eDragEnter:
|
||||
case eDragOver:
|
||||
case eDragExit:
|
||||
case eLegacyDragDrop:
|
||||
case eDrag:
|
||||
case eDragEnd:
|
||||
case eDragStart:
|
||||
|
|
Загрузка…
Ссылка в новой задаче