diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-27 12:48:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-27 11:11:56 +0000 |
| commit | c69fdae9c762b7bdf45016bf8398f6050b7699ba (patch) | |
| tree | 7f95460374822dbb18bba1f0bad1c09a1427c8a5 /chromium/ui/base/clipboard | |
| parent | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (diff) | |
| download | qtwebengine-chromium-c69fdae9c762b7bdf45016bf8398f6050b7699ba.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.113
Change-Id: I4fb3f077682cc7eda51e9046981dcd40e0183cd6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/ui/base/clipboard')
| -rw-r--r-- | chromium/ui/base/clipboard/clipboard_util_mac.mm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chromium/ui/base/clipboard/clipboard_util_mac.mm b/chromium/ui/base/clipboard/clipboard_util_mac.mm index 1f7296e0da7..0db36b8f58a 100644 --- a/chromium/ui/base/clipboard/clipboard_util_mac.mm +++ b/chromium/ui/base/clipboard/clipboard_util_mac.mm @@ -5,6 +5,7 @@ #include "ui/base/clipboard/clipboard_util_mac.h" #include "base/mac/foundation_util.h" +#import "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" namespace ui { @@ -29,6 +30,14 @@ UniquePasteboard::UniquePasteboard() UniquePasteboard::~UniquePasteboard() { [pasteboard_ releaseGlobally]; + + if (base::mac::IsOS10_12()) { + // On 10.12, move ownership to the autorelease pool rather than possibly + // triggering -[NSPasteboard dealloc] here. This is a speculative workaround + // for https://crbug.com/877979 where a call to __CFPasteboardDeallocate + // from here is triggering "Semaphore object deallocated while in use". + pasteboard_.autorelease(); + } } // static |