Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2020-09-16 21:19:55 +08:00
commit 8fd5fd8690
8 changed files with 24 additions and 28 deletions

View file

@ -222,7 +222,7 @@ nsDragService::ConstructDragImage(nsIDOMNode* aDOMNode,
bool
nsDragService::IsValidType(NSString* availableType, bool allowFileURL)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
// Prevent exposing fileURL for non-fileURL type.
// We need URL provided by dropped webloc file, but don't need file's URL.
@ -234,7 +234,7 @@ nsDragService::IsValidType(NSString* availableType, bool allowFileURL)
return true;
NS_OBJC_END_TRY_ABORT_BLOCK(false);
NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
}
NSString*