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.75 Rename NS_DRAGDROP_EVENT_START to eDragDropEventFirst, define eDragDropEventLast and correct the type and name of event message in DataTransfer r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2015-09-02 15:08:01 +09:00
parent 258230964d
commit bb12ca8bc7
3 changed files with 82 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
dom/events/DataTransfer.cpp
View File

@ -68,40 +68,41 @@ const char DataTransfer::sEffects[8][9] = {
"none", "copy", "move", "copyMove", "link", "copyLink", "linkMove", "all"
};
DataTransfer::DataTransfer(nsISupports* aParent, uint32_t aEventType,
DataTransfer::DataTransfer(nsISupports* aParent, EventMessage aEventMessage,
bool aIsExternal, int32_t aClipboardType)
: mParent(aParent),
mEventType(aEventType),
mDropEffect(nsIDragService::DRAGDROP_ACTION_NONE),
mEffectAllowed(nsIDragService::DRAGDROP_ACTION_UNINITIALIZED),
mCursorState(false),
mReadOnly(true),
mIsExternal(aIsExternal),
mUserCancelled(false),
mIsCrossDomainSubFrameDrop(false),
mClipboardType(aClipboardType),
mDragImageX(0),
mDragImageY(0)
: mParent(aParent)
, mDropEffect(nsIDragService::DRAGDROP_ACTION_NONE)
, mEffectAllowed(nsIDragService::DRAGDROP_ACTION_UNINITIALIZED)
, mEventMessage(aEventMessage)
, mCursorState(false)
, mReadOnly(true)
, mIsExternal(aIsExternal)
, mUserCancelled(false)
, mIsCrossDomainSubFrameDrop(false)
, mClipboardType(aClipboardType)
, mDragImageX(0)
, mDragImageY(0)
{
// For these events, we want to be able to add data to the data transfer, so
// clear the readonly state. Otherwise, the data is already present. For
// external usage, cache the data from the native clipboard or drag.
if (aEventType == NS_CUT ||
aEventType == NS_COPY ||
aEventType == NS_DRAGDROP_START ||
aEventType == NS_DRAGDROP_GESTURE) {
if (aEventMessage == NS_CUT ||
aEventMessage == NS_COPY ||
aEventMessage == NS_DRAGDROP_START ||
aEventMessage == NS_DRAGDROP_GESTURE) {
mReadOnly = false;
} else if (mIsExternal) {
if (aEventType == NS_PASTE) {
if (aEventMessage == NS_PASTE) {
CacheExternalClipboardFormats();
} else if (aEventType >= NS_DRAGDROP_EVENT_START && aEventType <= NS_DRAGDROP_LEAVE) {
} else if (aEventMessage >= eDragDropEventFirst &&
aEventMessage <= eDragDropEventLast) {
CacheExternalDragFormats();
}
}
}
DataTransfer::DataTransfer(nsISupports* aParent,
uint32_t aEventType,
EventMessage aEventMessage,
const uint32_t aEffectAllowed,
bool aCursorState,
bool aIsExternal,
@ -112,20 +113,20 @@ DataTransfer::DataTransfer(nsISupports* aParent,
Element* aDragImage,
uint32_t aDragImageX,
uint32_t aDragImageY)
: mParent(aParent),
mEventType(aEventType),
mDropEffect(nsIDragService::DRAGDROP_ACTION_NONE),
mEffectAllowed(aEffectAllowed),
mCursorState(aCursorState),
mReadOnly(true),
mIsExternal(aIsExternal),
mUserCancelled(aUserCancelled),
mIsCrossDomainSubFrameDrop(aIsCrossDomainSubFrameDrop),
mClipboardType(aClipboardType),
mItems(aItems),
mDragImage(aDragImage),
mDragImageX(aDragImageX),
mDragImageY(aDragImageY)
: mParent(aParent)
, mDropEffect(nsIDragService::DRAGDROP_ACTION_NONE)
, mEffectAllowed(aEffectAllowed)
, mEventMessage(aEventMessage)
, mCursorState(aCursorState)
, mReadOnly(true)
, mIsExternal(aIsExternal)
, mUserCancelled(aUserCancelled)
, mIsCrossDomainSubFrameDrop(aIsCrossDomainSubFrameDrop)
, mClipboardType(aClipboardType)
, mItems(aItems)
, mDragImage(aDragImage)
, mDragImageX(aDragImageX)
, mDragImageY(aDragImageY)
{
MOZ_ASSERT(mParent);
// The items are copied from aItems into mItems. There is no need to copy
@ -133,8 +134,8 @@ DataTransfer::DataTransfer(nsISupports* aParent,
// draggesture and dragstart events are the only times when items are
// modifiable, but those events should have been using the first constructor
// above.
NS_ASSERTION(aEventType != NS_DRAGDROP_GESTURE &&
aEventType != NS_DRAGDROP_START,
NS_ASSERTION(aEventMessage != NS_DRAGDROP_GESTURE &&
aEventMessage != NS_DRAGDROP_START,
"invalid event type for DataTransfer constructor");
}
@ -268,8 +269,9 @@ DataTransfer::GetMozUserCancelled(bool* aUserCancelled)
FileList*
DataTransfer::GetFiles(ErrorResult& aRv)
{
if (mEventType != NS_DRAGDROP_DROP && mEventType != NS_DRAGDROP_DRAGDROP &&
mEventType != NS_PASTE) {
if (mEventMessage != NS_DRAGDROP_DROP &&
mEventMessage != NS_DRAGDROP_DRAGDROP &&
mEventMessage != NS_PASTE) {
return nullptr;
}
@ -541,7 +543,8 @@ DataTransfer::MozTypesAt(uint32_t aIndex, ErrorResult& aRv)
{
// Only the first item is valid for clipboard events
if (aIndex > 0 &&
(mEventType == NS_CUT || mEventType == NS_COPY || mEventType == NS_PASTE)) {
(mEventMessage == NS_CUT || mEventMessage == NS_COPY ||
mEventMessage == NS_PASTE)) {
aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
return nullptr;
}
@ -581,7 +584,8 @@ DataTransfer::MozGetDataAt(const nsAString& aFormat, uint32_t aIndex,
// Only the first item is valid for clipboard events
if (aIndex > 0 &&
(mEventType == NS_CUT || mEventType == NS_COPY || mEventType == NS_PASTE)) {
(mEventMessage == NS_CUT || mEventMessage == NS_COPY ||
mEventMessage == NS_PASTE)) {
return NS_ERROR_DOM_INDEX_SIZE_ERR;
}
@ -599,8 +603,9 @@ DataTransfer::MozGetDataAt(const nsAString& aFormat, uint32_t aIndex,
// only allow access to the data with the same principal.
nsIPrincipal* principal = nullptr;
if (mIsCrossDomainSubFrameDrop ||
(mEventType != NS_DRAGDROP_DROP && mEventType != NS_DRAGDROP_DRAGDROP &&
mEventType != NS_PASTE &&
(mEventMessage != NS_DRAGDROP_DROP &&
mEventMessage != NS_DRAGDROP_DRAGDROP &&
mEventMessage != NS_PASTE &&
!nsContentUtils::IsCallerChrome())) {
principal = nsContentUtils::SubjectPrincipal();
}
@ -692,7 +697,8 @@ DataTransfer::MozSetDataAt(const nsAString& aFormat, nsIVariant* aData,
// Only the first item is valid for clipboard events
if (aIndex > 0 &&
(mEventType == NS_CUT || mEventType == NS_COPY || mEventType == NS_PASTE)) {
(mEventMessage == NS_CUT || mEventMessage == NS_COPY ||
mEventMessage == NS_PASTE)) {
return NS_ERROR_DOM_INDEX_SIZE_ERR;
}
@ -737,7 +743,8 @@ DataTransfer::MozClearDataAt(const nsAString& aFormat, uint32_t aIndex,
// Only the first item is valid for clipboard events
if (aIndex > 0 &&
(mEventType == NS_CUT || mEventType == NS_COPY || mEventType == NS_PASTE)) {
(mEventMessage == NS_CUT || mEventMessage == NS_COPY ||
mEventMessage == NS_PASTE)) {
aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
return;
}
@ -752,8 +759,8 @@ DataTransfer::MozClearDataAtHelper(const nsAString& aFormat, uint32_t aIndex,
MOZ_ASSERT(!mReadOnly);
MOZ_ASSERT(aIndex < mItems.Length());
MOZ_ASSERT(aIndex == 0 ||
(mEventType != NS_CUT && mEventType != NS_COPY &&
mEventType != NS_PASTE));
(mEventMessage != NS_CUT && mEventMessage != NS_COPY &&
mEventMessage != NS_PASTE));
nsAutoString format;
GetRealFormat(aFormat, format);
@ -938,12 +945,12 @@ DataTransfer::AddElement(nsIDOMElement* aElement)
}
nsresult
DataTransfer::Clone(nsISupports* aParent, uint32_t aEventType,
DataTransfer::Clone(nsISupports* aParent, EventMessage aEventMessage,
bool aUserCancelled, bool aIsCrossDomainSubFrameDrop,
DataTransfer** aNewDataTransfer)
{
DataTransfer* newDataTransfer =
new DataTransfer(aParent, aEventType, mEffectAllowed, mCursorState,
new DataTransfer(aParent, aEventMessage, mEffectAllowed, mCursorState,
mIsExternal, aUserCancelled, aIsCrossDomainSubFrameDrop,
mClipboardType, mItems, mDragImage, mDragImageX,
mDragImageY);
@ -1252,7 +1259,8 @@ DataTransfer::CacheExternalDragFormats()
void
DataTransfer::CacheExternalClipboardFormats()
{
NS_ASSERTION(mEventType == NS_PASTE, "caching clipboard data for invalid event");
NS_ASSERTION(mEventMessage == NS_PASTE,
"caching clipboard data for invalid event");
// Called during the constructor for paste events to cache the formats
// available on the clipboard. As with CacheExternalDragFormats, the
@ -1293,7 +1301,7 @@ DataTransfer::FillInExternalData(TransferItem& aItem, uint32_t aIndex)
}
// only drag and paste events should be calling FillInExternalData
NS_ASSERTION(mEventType != NS_CUT && mEventType != NS_COPY,
NS_ASSERTION(mEventMessage != NS_CUT && mEventMessage != NS_COPY,
"clipboard event with empty data");
NS_ConvertUTF16toUTF8 utf8format(aItem.mFormat);
@ -1311,7 +1319,7 @@ DataTransfer::FillInExternalData(TransferItem& aItem, uint32_t aIndex)
trans->Init(nullptr);
trans->AddDataFlavor(format);
if (mEventType == NS_PASTE) {
if (mEventMessage == NS_PASTE) {
MOZ_ASSERT(aIndex == 0, "index in clipboard must be 0");
nsCOMPtr<nsIClipboard> clipboard = do_GetService("@mozilla.org/widget/clipboard;1");

21
dom/events/DataTransfer.h
View File

@ -18,6 +18,7 @@
#include "nsAutoPtr.h"
#include "mozilla/Attributes.h"
#include "mozilla/EventForwards.h"
#include "mozilla/dom/File.h"
#include "mozilla/dom/Promise.h"
@ -75,7 +76,7 @@ protected:
// this constructor is used only by the Clone method to copy the fields as
// needed to a new data transfer.
DataTransfer(nsISupports* aParent,
uint32_t aEventType,
EventMessage aEventMessage,
const uint32_t aEffectAllowed,
bool aCursorState,
bool aIsExternal,
@ -95,8 +96,6 @@ public:
// Constructor for DataTransfer.
//
// aEventType is an event constant (such as NS_DRAGDROP_START)
//
// aIsExternal must only be true when used to create a dataTransfer for a
// paste or a drag that was started without using a data transfer. The
// latter will occur when an external drag occurs, that is, a drag where the
@ -104,8 +103,8 @@ public:
// service directly. For clipboard operations, aClipboardType indicates
// which clipboard to use, from nsIClipboard, or -1 for non-clipboard operations,
// or if access to the system clipboard should not be allowed.
DataTransfer(nsISupports* aParent, uint32_t aEventType, bool aIsExternal,
int32_t aClipboardType);
DataTransfer(nsISupports* aParent, EventMessage aEventMessage,
bool aIsExternal, int32_t aClipboardType);
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
nsISupports* GetParentObject()
@ -222,8 +221,9 @@ public:
return mDragImage;
}
nsresult Clone(nsISupports* aParent, uint32_t aEventType, bool aUserCancelled,
bool aIsCrossDomainSubFrameDrop, DataTransfer** aResult);
nsresult Clone(nsISupports* aParent, EventMessage aEventMessage,
bool aUserCancelled, bool aIsCrossDomainSubFrameDrop,
DataTransfer** aResult);
protected:
@ -254,14 +254,15 @@ protected:
nsCOMPtr<nsISupports> mParent;
// the event type this data transfer is for. This will correspond to an
// event->mMessage value.
uint32_t mEventType;
// the drop effect and effect allowed
uint32_t mDropEffect;
uint32_t mEffectAllowed;
// the event message this data transfer is for. This will correspond to an
// event->mMessage value.
EventMessage mEventMessage;
// Indicates the behavior of the cursor during drag operations
bool mCursorState;

23
widget/EventMessageList.h
View File

@ -101,17 +101,18 @@ NS_EVENT_MESSAGE(eFocusEventFirst, 1300)
NS_EVENT_MESSAGE(eFocus, eFocusEventFirst)
NS_EVENT_MESSAGE(eBlur, eFocusEventFirst + 1)
NS_EVENT_MESSAGE(NS_DRAGDROP_EVENT_START, 1400)
NS_EVENT_MESSAGE(NS_DRAGDROP_ENTER, NS_DRAGDROP_EVENT_START)
NS_EVENT_MESSAGE(NS_DRAGDROP_OVER, NS_DRAGDROP_EVENT_START + 1)
NS_EVENT_MESSAGE(NS_DRAGDROP_EXIT, NS_DRAGDROP_EVENT_START + 2)
NS_EVENT_MESSAGE(NS_DRAGDROP_DRAGDROP, NS_DRAGDROP_EVENT_START + 3)
NS_EVENT_MESSAGE(NS_DRAGDROP_GESTURE, NS_DRAGDROP_EVENT_START + 4)
NS_EVENT_MESSAGE(NS_DRAGDROP_DRAG, NS_DRAGDROP_EVENT_START + 5)
NS_EVENT_MESSAGE(NS_DRAGDROP_END, NS_DRAGDROP_EVENT_START + 6)
NS_EVENT_MESSAGE(NS_DRAGDROP_START, NS_DRAGDROP_EVENT_START + 7)
NS_EVENT_MESSAGE(NS_DRAGDROP_DROP, NS_DRAGDROP_EVENT_START + 8)
NS_EVENT_MESSAGE(NS_DRAGDROP_LEAVE, NS_DRAGDROP_EVENT_START + 9)
NS_EVENT_MESSAGE(eDragDropEventFirst, 1400)
NS_EVENT_MESSAGE(NS_DRAGDROP_ENTER, eDragDropEventFirst)
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(NS_DRAGDROP_END, eDragDropEventFirst + 6)
NS_EVENT_MESSAGE(NS_DRAGDROP_START, eDragDropEventFirst + 7)
NS_EVENT_MESSAGE(NS_DRAGDROP_DROP, eDragDropEventFirst + 8)
NS_EVENT_MESSAGE(NS_DRAGDROP_LEAVE, eDragDropEventFirst + 9)
NS_EVENT_MESSAGE(eDragDropEventLast, NS_DRAGDROP_LEAVE)
// Events for popups
NS_EVENT_MESSAGE(NS_XUL_EVENT_START, 1500)