From 0f0fd6a94fdfa5376cc97ea03be3ecab99346f8f Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 23 Jan 2020 13:13:54 +0300 Subject: [PATCH] Use non-libdispatch queues in Mac App Store build. --- ui/platform/mac/ui_utility_mac.h | 3 ++- ui/platform/mac/ui_utility_mac.mm | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/platform/mac/ui_utility_mac.h b/ui/platform/mac/ui_utility_mac.h index 491e3c6..7d4bffe 100644 --- a/ui/platform/mac/ui_utility_mac.h +++ b/ui/platform/mac/ui_utility_mac.h @@ -6,6 +6,7 @@ // #pragma once +#include "base/platform/base_platform_info.h" #include namespace Ui { @@ -19,7 +20,7 @@ inline void UpdateOverlayed(not_null widget) { } inline constexpr bool UseMainQueueGeneric() { - return false; + return ::Platform::IsMacStoreBuild(); } } // namespace Platform diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm index a7e05db..76d986d 100644 --- a/ui/platform/mac/ui_utility_mac.mm +++ b/ui/platform/mac/ui_utility_mac.mm @@ -14,9 +14,11 @@ #include +#ifndef OS_MAC_STORE extern "C" { void _dispatch_main_queue_callback_4CF(mach_msg_header_t *msg); } // extern "C" +#endif // OS_MAC_STORE namespace Ui { namespace Platform { @@ -88,7 +90,9 @@ void BringToBack(not_null widget) { } void DrainMainQueue() { +#ifndef OS_MAC_STORE _dispatch_main_queue_callback_4CF(nullptr); +#endif // OS_MAC_STORE } void IgnoreAllActivation(not_null widget) {