diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
| commit | 9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f (patch) | |
| tree | 831e0ae1649d6135429def03688bc93ff7c86b03 /widget/cocoa | |
| parent | 42f895f27f239e973c9c06241f7a58da7381353c (diff) | |
| parent | f624bd1375655dea196cdcb70a9860bc5817df49 (diff) | |
| download | UXP-RELBASE_20200929.tar UXP-RELBASE_20200929.tar.gz UXP-RELBASE_20200929.tar.lz UXP-RELBASE_20200929.tar.xz UXP-RELBASE_20200929.zip | |
Merge branch 'redwood' into releaseRELBASE_20200929RC_20200924
Diffstat (limited to 'widget/cocoa')
| -rw-r--r-- | widget/cocoa/nsDragService.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/widget/cocoa/nsDragService.mm b/widget/cocoa/nsDragService.mm index b92db1b2a..c4d8e6ff0 100644 --- a/widget/cocoa/nsDragService.mm +++ b/widget/cocoa/nsDragService.mm @@ -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* |