mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 1216916 clean up when InvokeDragSession() fails r=roc 

--HG--
extra : rebase_source : 3e29c8454779b50d9eef9f4ea24aec537b8f865c
This commit is contained in:
Karl Tomlinson 2015-10-21 22:16:40 +13:00
Родитель 9406708e70
Коммит 92cf9adfb9
10 изменённых файлов: 63 добавлений и 55 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
widget/cocoa/nsDragService.h
Просмотреть файл

@ -30,9 +30,11 @@ class nsDragService : public nsBaseDragService
public:
nsDragService();
// nsBaseDragService
virtual nsresult InvokeDragSessionImpl(nsISupportsArray* anArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType);
// nsIDragService
NS_IMETHOD InvokeDragSession(nsIDOMNode *aDOMNode, nsISupportsArray * anArrayTransferables,
nsIScriptableRegion * aRegion, uint32_t aActionType);
NS_IMETHOD EndDragSession(bool aDoneDrag);
// nsIDragSession

14
widget/cocoa/nsDragService.mm
Просмотреть файл

@ -273,17 +273,13 @@ nsDragService::ConstructDragImage(nsIDOMNode* aDOMNode,
// We can only invoke NSView's 'dragImage:at:offset:event:pasteboard:source:slideBack:' from
// within NSView's 'mouseDown:' or 'mouseDragged:'. Luckily 'mouseDragged' is always on the
// stack when InvokeDragSession gets called.
NS_IMETHODIMP
nsDragService::InvokeDragSession(nsIDOMNode* aDOMNode, nsISupportsArray* aTransferableArray,
nsIScriptableRegion* aDragRgn, uint32_t aActionType)
nsresult
nsDragService::InvokeDragSessionImpl(nsISupportsArray* aTransferableArray,
nsIScriptableRegion* aDragRgn,
uint32_t aActionType)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
nsresult rv = nsBaseDragService::InvokeDragSession(aDOMNode,
aTransferableArray,
aDragRgn, aActionType);
NS_ENSURE_SUCCESS(rv, rv);
mDataItems = aTransferableArray;
// put data on the clipboard
@ -291,7 +287,7 @@ nsDragService::InvokeDragSession(nsIDOMNode* aDOMNode, nsISupportsArray* aTransf
return NS_ERROR_FAILURE;
nsIntRect dragRect(0, 0, 20, 20);
NSImage* image = ConstructDragImage(aDOMNode, &dragRect, aDragRgn);
NSImage* image = ConstructDragImage(mSourceNode, &dragRect, aDragRgn);
if (!image) {
// if no image was returned, just draw a rectangle
NSSize size;

15
widget/gtk/nsDragService.cpp
Просмотреть файл

@ -312,11 +312,16 @@ nsDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
if (mSourceNode)
return NS_ERROR_NOT_AVAILABLE;
nsresult rv = nsBaseDragService::InvokeDragSession(aDOMNode,
aArrayTransferables,
aRegion, aActionType);
NS_ENSURE_SUCCESS(rv, rv);
return nsBaseDragService::InvokeDragSession(aDOMNode, aArrayTransferables,
aRegion, aActionType);
}
// nsBaseDragService
nsresult
nsDragService::InvokeDragSessionImpl(nsISupportsArray* aArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType)
{
// make sure that we have an array of transferables to use
if (!aArrayTransferables)
return NS_ERROR_INVALID_ARG;
@ -377,6 +382,7 @@ nsDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
mSourceRegion = nullptr;
nsresult rv;
if (context) {
StartDragSession();
@ -391,6 +397,7 @@ nsDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
}
// We don't have a drag end point yet.
mEndDragPoint = nsIntPoint(-1, -1);
rv = NS_OK;
}
else {
rv = NS_ERROR_FAILURE;

4
widget/gtk/nsDragService.h
Просмотреть файл

@ -58,6 +58,10 @@ public:
NS_DECL_NSIOBSERVER
// nsBaseDragService
virtual nsresult InvokeDragSessionImpl(nsISupportsArray* anArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType) override;
// nsIDragService
NS_IMETHOD InvokeDragSession (nsIDOMNode *aDOMNode,
nsISupportsArray * anArrayTransferables,

10
widget/nsBaseDragService.cpp
Просмотреть файл

@ -225,7 +225,15 @@ nsBaseDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
// are in the wrong coord system, so turn off mouse capture.
nsIPresShell::ClearMouseCapture(nullptr);
return NS_OK;
nsresult rv = InvokeDragSessionImpl(aTransferableArray,
aDragRgn, aActionType);
if (NS_FAILED(rv)) {
mSourceNode = nullptr;
mSourceDocument = nullptr;
}
return rv;
}
NS_IMETHODIMP

9
widget/nsBaseDragService.h
Просмотреть файл

@ -63,6 +63,15 @@ public:
protected:
virtual ~nsBaseDragService();
/**
* Called from nsBaseDragService to initiate a platform drag from a source
* in this process. This is expected to ensure that StartDragSession() and
* EndDragSession() get called if the platform drag is successfully invoked.
*/
virtual nsresult InvokeDragSessionImpl(nsISupportsArray* aTransferableArray,
nsIScriptableRegion* aDragRgn,
uint32_t aActionType) = 0;
/**
* Draw the drag image, if any, to a surface and return it. The drag image
* is constructed from mImage if specified, or aDOMNode if mImage is null.

19
widget/nsDragServiceProxy.cpp
Просмотреть файл

@ -23,21 +23,12 @@ nsDragServiceProxy::~nsDragServiceProxy()
{
}
NS_IMETHODIMP
nsDragServiceProxy::InvokeDragSession(nsIDOMNode* aDOMNode,
nsISupportsArray* aArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType)
nsresult
nsDragServiceProxy::InvokeDragSessionImpl(nsISupportsArray* aArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType)
{
nsresult rv = nsBaseDragService::InvokeDragSession(aDOMNode,
aArrayTransferables,
aRegion,
aActionType);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDOMDocument> sourceDocument;
aDOMNode->GetOwnerDocument(getter_AddRefs(sourceDocument));
nsCOMPtr<nsIDocument> doc = do_QueryInterface(sourceDocument);
nsCOMPtr<nsIDocument> doc = do_QueryInterface(mSourceDocument);
NS_ENSURE_STATE(doc->GetDocShell());
mozilla::dom::TabChild* child =
mozilla::dom::TabChild::GetFrom(doc->GetDocShell());

9
widget/nsDragServiceProxy.h
Просмотреть файл

@ -15,11 +15,10 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// nsIDragService
NS_IMETHOD InvokeDragSession(nsIDOMNode* aDOMNode,
nsISupportsArray* anArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType) override;
// nsBaseDragService
virtual nsresult InvokeDragSessionImpl(nsISupportsArray* anArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType) override;
private:
virtual ~nsDragServiceProxy();
};

23
widget/windows/nsDragService.cpp
Просмотреть файл

@ -170,18 +170,11 @@ nsDragService::CreateDragImage(nsIDOMNode *aDOMNode,
}
//-------------------------------------------------------------------------
NS_IMETHODIMP
nsDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
nsISupportsArray *anArrayTransferables,
nsIScriptableRegion *aRegion,
uint32_t aActionType)
nsresult
nsDragService::InvokeDragSessionImpl(nsISupportsArray* anArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType)
{
nsresult rv = nsBaseDragService::InvokeDragSession(aDOMNode,
anArrayTransferables,
aRegion,
aActionType);
NS_ENSURE_SUCCESS(rv, rv);
// Try and get source URI of the items that are being dragged
nsIURI *uri = nullptr;
@ -191,7 +184,7 @@ nsDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
}
uint32_t numItemsToDrag = 0;
rv = anArrayTransferables->Count(&numItemsToDrag);
nsresult rv = anArrayTransferables->Count(&numItemsToDrag);
if (!numItemsToDrag)
return NS_ERROR_FAILURE;
@ -214,7 +207,7 @@ nsDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
nsCOMPtr<nsITransferable> trans(do_QueryInterface(supports));
if (trans) {
// set the requestingNode on the transferable
trans->SetRequestingNode(aDOMNode);
trans->SetRequestingNode(mSourceNode);
RefPtr<IDataObject> dataObj;
rv = nsClipboard::CreateNativeDataObject(trans,
getter_AddRefs(dataObj), uri);
@ -233,7 +226,7 @@ nsDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
nsCOMPtr<nsITransferable> trans(do_QueryInterface(supports));
if (trans) {
// set the requestingNode on the transferable
trans->SetRequestingNode(aDOMNode);
trans->SetRequestingNode(mSourceNode);
rv = nsClipboard::CreateNativeDataObject(trans,
getter_AddRefs(itemToDrag),
uri);
@ -247,7 +240,7 @@ nsDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
CLSCTX_INPROC_SERVER,
IID_IDragSourceHelper, (void**)&pdsh))) {
SHDRAGIMAGE sdi;
if (CreateDragImage(aDOMNode, aRegion, &sdi)) {
if (CreateDragImage(mSourceNode, aRegion, &sdi)) {
if (FAILED(pdsh->InitializeFromBitmap(&sdi, itemToDrag)))
DeleteObject(sdi.hbmpDragImage);
}

9
widget/windows/nsDragService.h
Просмотреть файл

@ -23,11 +23,10 @@ public:
nsDragService();
virtual ~nsDragService();
// nsIDragService
NS_IMETHOD InvokeDragSession(nsIDOMNode *aDOMNode,
nsISupportsArray *anArrayTransferables,
nsIScriptableRegion *aRegion,
uint32_t aActionType);
// nsBaseDragService
virtual nsresult InvokeDragSessionImpl(nsISupportsArray* anArrayTransferables,
nsIScriptableRegion* aRegion,
uint32_t aActionType);
// nsIDragSession
NS_IMETHOD GetData(nsITransferable * aTransferable, uint32_t anItem);