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

followup for 358093, take care of some lifetime and null checking issues for the global drag transferables variable. b=388382 r=shebs

Browse Source
This commit is contained in:
joshmoz@gmail.com 2007-07-17 16:02:40 -07:00
parent f17228f4ff
commit de18adfc8d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
widget/src/cocoa/nsChildView.mm
View File

@ -85,6 +85,8 @@ extern "C" {
CG_EXTERN void CGContextResetClip(CGContextRef);
}
extern nsISupportsArray *gDraggedTransferables;
PRBool nsTSMManager::sIsIMEEnabled = PR_TRUE;
PRBool nsTSMManager::sIsRomanKeyboardsOnly = PR_FALSE;
NSView<mozView>* nsTSMManager::sComposingView = nsnull;
@ -4203,6 +4205,8 @@ static PRBool IsSpecialGeckoKey(UInt32 macKeyCode)
// NSDraggingSource
- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
{
gDraggedTransferables = nsnull;
if (!mDragService) {
CallGetService(kDragServiceContractID, &mDragService);
NS_ASSERTION(mDragService, "Couldn't get a drag service - big problem!");
@ -4248,16 +4252,17 @@ static PRBool IsSpecialGeckoKey(UInt32 macKeyCode)
return nil;
}
extern nsISupportsArray *draggedTransferables;
if (!gDraggedTransferables)
return nil;
PRUint32 transferableCount;
rv = draggedTransferables->Count(&transferableCount);
rv = gDraggedTransferables->Count(&transferableCount);
if (NS_FAILED(rv))
return nil;
for (PRUint32 i = 0; i < transferableCount; i++) {
nsCOMPtr<nsISupports> genericItem;
draggedTransferables->GetElementAt(i, getter_AddRefs(genericItem));
gDraggedTransferables->GetElementAt(i, getter_AddRefs(genericItem));
nsCOMPtr<nsITransferable> item(do_QueryInterface(genericItem));
if (!item) {
NS_ERROR("no transferable");

4
widget/src/cocoa/nsDragService.mm
View File

@ -71,7 +71,7 @@ extern NSEvent* globalDragEvent;
// This global makes the transferable array available to Cocoa's promised
// file destination callback.
nsISupportsArray *draggedTransferables;
nsISupportsArray *gDraggedTransferables = nsnull;
NSString* const kWildcardPboardType = @"MozillaWildcard";
@ -267,7 +267,7 @@ nsDragService::InvokeDragSession(nsIDOMNode* aDOMNode, nsISupportsArray* aTransf
NSPoint localPoint = [globalDragView convertPoint:point fromView:nil];
// Save the transferables away in case a promised file callback is invoked.
draggedTransferables = aTransferableArray;
gDraggedTransferables = aTransferableArray;
nsBaseDragService::StartDragSession();