зеркало из https://github.com/mozilla/pjs.git
345425 onDragExit in tabbrowser.xml is called with aDragSession.sourceNode null when a tab is dropped on itself. Eliminate extra call to EndDragSession. r=josh sr=pink
This commit is contained in:
mark%moxienet.com
Родитель
bfe4b085ee
Коммит
7dddcd9996
|
|
@ -239,10 +239,6 @@ nsDragHelperService::Drop(DragReference inDragRef, nsIEventSink *inSink,
|
|||
result = dragNotAcceptedErr;
|
||||
} // if a valid drag session
|
||||
|
||||
// we don't need the drag session anymore, the user has released the
|
||||
// mouse and the event has already gone to gecko.
|
||||
mDragService->EndDragSession();
|
||||
|
||||
// if there was any kind of error, the drag wasn't accepted
|
||||
*outAccepted = (result == noErr);
|
||||
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ nsDragService::ComputeGlobalRectFromFrame ( nsIDOMNode* aDOMNode, Rect & outScre
|
|||
|
||||
|
||||
//
|
||||
// StartDragSession
|
||||
// InvokeDragSession
|
||||
//
|
||||
// Do all the work to kick it off.
|
||||
//
|
||||
|
|
@ -326,7 +326,7 @@ nsDragService::InvokeDragSession (nsIDOMNode *aDOMNode, nsISupportsArray * aTran
|
|||
|
||||
return NS_OK;
|
||||
|
||||
} // StartDragSession
|
||||
} // InvokeDragSession
|
||||
|
||||
|
||||
//
|
||||
|
|
@ -1163,26 +1163,6 @@ nsDragService::ExtractDataFromOS ( DragReference inDragRef, ItemReference inItem
|
|||
} // ExtractDataFromOS
|
||||
|
||||
|
||||
//
|
||||
// StartDragSession
|
||||
// EndDragSession
|
||||
//
|
||||
// Override the defaults to disable/enable the watch cursor while we're dragging
|
||||
//
|
||||
|
||||
nsresult
|
||||
nsDragService::StartDragSession ( )
|
||||
{
|
||||
return nsBaseDragService::StartDragSession();
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsDragService::EndDragSession ( )
|
||||
{
|
||||
return nsBaseDragService::EndDragSession();
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// SetDragAction
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,118 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
|
||||
//
|
||||
// Mike Pinkerton
|
||||
// Netscape Communications
|
||||
//
|
||||
// The MacOS native implementation of nsIDragService, nsIDragSession, and
|
||||
// nsIDragSessionMac.
|
||||
//
|
||||
|
||||
|
||||
#ifndef nsDragService_h__
|
||||
#define nsDragService_h__
|
||||
|
||||
|
||||
#include "nsBaseDragService.h"
|
||||
#include "nsIDragSessionMac.h"
|
||||
#include <Drag.h>
|
||||
#include <MacWindows.h>
|
||||
|
||||
class nsILocalFile;
|
||||
|
||||
class nsDragService : public nsBaseDragService, public nsIDragSessionMac
|
||||
{
|
||||
public:
|
||||
nsDragService();
|
||||
virtual ~nsDragService();
|
||||
|
||||
//nsISupports - can't use inherited because of nsIDragSessionMac
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
//nsIDragService
|
||||
NS_IMETHOD InvokeDragSession (nsIDOMNode *aDOMNode, nsISupportsArray * anArrayTransferables, nsIScriptableRegion * aRegion, PRUint32 aActionType);
|
||||
|
||||
//nsIDragSession
|
||||
NS_IMETHOD GetData (nsITransferable * aTransferable, PRUint32 aItemIndex);
|
||||
NS_IMETHOD IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval);
|
||||
NS_IMETHOD GetNumDropItems (PRUint32 * aNumItems);
|
||||
NS_IMETHOD SetDragAction ( PRUint32 anAction ) ;
|
||||
|
||||
//nsIDragSessionMac
|
||||
NS_IMETHOD SetDragReference ( DragReference aDragRef ) ;
|
||||
|
||||
private:
|
||||
|
||||
NS_IMETHOD StartDragSession ( ) ;
|
||||
NS_IMETHOD EndDragSession ( ) ;
|
||||
|
||||
char* LookupMimeMappingsForItem ( DragReference inDragRef, ItemReference itemRef ) ;
|
||||
|
||||
void RegisterDragItemsAndFlavors ( nsISupportsArray * inArray, RgnHandle inDragRgn ) ;
|
||||
PRBool BuildDragRegion ( nsIScriptableRegion* inRegion, nsIDOMNode* inNode, RgnHandle ioDragRgn ) ;
|
||||
OSErr GetDataForFlavor ( nsISupportsArray* inDragItems, DragReference inDragRef, unsigned int inItemIndex,
|
||||
FlavorType inFlavor, void** outData, unsigned int * outSize ) ;
|
||||
nsresult ExtractDataFromOS ( DragReference inDragRef, ItemReference inItemRef, ResType inFlavor,
|
||||
void** outBuffer, PRUint32* outBuffSize ) ;
|
||||
|
||||
// compute a screen rect from the frame associated with the given dom node
|
||||
PRBool ComputeGlobalRectFromFrame ( nsIDOMNode* aDOMNode, Rect & outScreenRect ) ;
|
||||
|
||||
OSErr GetHFSPromiseDropDirectory(DragReference inDragRef, unsigned int inItemIndex,
|
||||
FlavorType inFlavor, nsILocalFile** outDir);
|
||||
|
||||
OSErr SetDropFileInDrag(DragReference inDragRef, unsigned int inItemIndex,
|
||||
FlavorType inFlavor, nsILocalFile* inFile);
|
||||
|
||||
// callback for the MacOS DragManager when a drop site asks for data
|
||||
static pascal OSErr DragSendDataProc ( FlavorType inFlavor, void* inRefCon,
|
||||
ItemReference theItemRef, DragReference inDragRef ) ;
|
||||
|
||||
DragSendDataUPP mDragSendDataUPP;
|
||||
DragReference mDragRef; // reference to _the_ drag. There can be only one.
|
||||
nsISupportsArray* mDataItems; // cached here for when we start the drag so the
|
||||
// DragSendDataProc has access to them.
|
||||
// ONLY VALID DURING A DRAG STARTED WITHIN THIS APP.
|
||||
PRBool mImageDraggingSupported;
|
||||
|
||||
}; // class nsDragService
|
||||
|
||||
|
||||
#endif // nsDragService_h__
|
||||
|
||||
|
|
@ -574,7 +574,7 @@ PRBool nsMacEventHandler::DragEvent(unsigned int aMessage,
|
|||
// done when aMessage == NS_DRAGDROP_EXIT, because that indicates
|
||||
// that the drag is leaving the window.
|
||||
|
||||
nsMouseEvent enterEvent(PR_TRUE, NS_DRAGDROP_EXIT, widgetHit,
|
||||
nsMouseEvent enterEvent(PR_TRUE, NS_DRAGDROP_ENTER, widgetHit,
|
||||
nsMouseEvent::eReal);
|
||||
InitializeMouseEvent(enterEvent, widgetHitPoint, aKeyModifiers, 1);
|
||||
widgetHit->DispatchMouseEvent(enterEvent);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче