Attachment 360646 Details for Bug 193992 – Patch for landing

[patch] Patch for landing

bug-193992-20190130165419.patch (text/plain), 3.84 KB, created by Benjamin Poulain on 2019-01-30 16:54:20 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Poulain

Created: 2019-01-30 16:54:20 PST

Size: 3.84 KB

patch

obsolete

>Subversion Revision: 240741
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 7100e1ea84472140f77898d95fff3297ee16ff51..eddc4500e664b0d1e42f41c1906ed3016dc8d7ab 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-01-30  Daniel Steffen  <dsteffen@apple.com>
>+
>+        <rdar://problem/29471922> Safari should switch from the legacy denap SPI to handling vouchers
>+        https://bugs.webkit.org/show_bug.cgi?id=193992
>+
>+        Reviewed by Geoffrey Garen.
>+
>+        The denap SPI is deprecated.
>+        The new way of staying out of AppNap is through a voucher.
>+
>+        * Platform/IPC/mac/ConnectionMac.mm:
>+        (IPC::readFromMachPort):
>+        * Platform/IPC/mac/ImportanceAssertion.h:
>+        (IPC::ImportanceAssertion::ImportanceAssertion):
>+        (IPC::ImportanceAssertion::~ImportanceAssertion):
>+
> 2019-01-30  Per Arne Vollan  <pvollan@apple.com>
> 
>         [macOS] Sandbox fails to compile on 10.12
>diff --git a/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm b/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>index 50416b84114ab930eb4e628a3951417825a89e12..b98ac560307b21f422d3d47f368e6b61c36ba0dd 100644
>--- a/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>+++ b/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>@@ -476,7 +476,7 @@ static mach_msg_header_t* readFromMachPort(mach_port_t machPort, ReceiveBuffer&
>     buffer.resize(receiveBufferSize);
> 
>     mach_msg_header_t* header = reinterpret_cast<mach_msg_header_t*>(buffer.data());
>-    kern_return_t kr = mach_msg(header, MACH_RCV_MSG | MACH_RCV_LARGE | MACH_RCV_TIMEOUT, 0, buffer.size(), machPort, 0, MACH_PORT_NULL);
>+    kern_return_t kr = mach_msg(header, MACH_RCV_MSG | MACH_RCV_LARGE | MACH_RCV_TIMEOUT | MACH_RCV_VOUCHER, 0, buffer.size(), machPort, 0, MACH_PORT_NULL);
>     if (kr == MACH_RCV_TIMED_OUT)
>         return nullptr;
> 
>@@ -485,7 +485,7 @@ static mach_msg_header_t* readFromMachPort(mach_port_t machPort, ReceiveBuffer&
>         buffer.resize(header->msgh_size + MAX_TRAILER_SIZE);
>         header = reinterpret_cast<mach_msg_header_t*>(buffer.data());
>         
>-        kr = mach_msg(header, MACH_RCV_MSG | MACH_RCV_LARGE | MACH_RCV_TIMEOUT, 0, buffer.size(), machPort, 0, MACH_PORT_NULL);
>+        kr = mach_msg(header, MACH_RCV_MSG | MACH_RCV_LARGE | MACH_RCV_TIMEOUT | MACH_RCV_VOUCHER, 0, buffer.size(), machPort, 0, MACH_PORT_NULL);
>         ASSERT(kr != MACH_RCV_TOO_LARGE);
>     }
> 
>diff --git a/Source/WebKit/Platform/IPC/mac/ImportanceAssertion.h b/Source/WebKit/Platform/IPC/mac/ImportanceAssertion.h
>index f7687a7b789edf16136bdd181d75454ed79c8b52..d9765d1854c5508dca69760c40619df1e7a40a29 100644
>--- a/Source/WebKit/Platform/IPC/mac/ImportanceAssertion.h
>+++ b/Source/WebKit/Platform/IPC/mac/ImportanceAssertion.h
>@@ -28,12 +28,7 @@
> 
> #if PLATFORM(MAC)
> 
>-#if USE(APPLE_INTERNAL_SDK)
>-#include <libproc_internal.h>
>-#endif
>-
>-extern "C" int proc_denap_assertion_begin_with_msg(mach_msg_header_t*, uint64_t *);
>-extern "C" int proc_denap_assertion_complete(uint64_t);
>+#include <mach/message.h>
> 
> namespace IPC {
> 
>@@ -42,18 +37,25 @@ class ImportanceAssertion {
> 
> public:
>     explicit ImportanceAssertion(mach_msg_header_t* header)
>-        : m_assertion(0)
>+        : m_voucher(0)
>     {
>-        proc_denap_assertion_begin_with_msg(header, &m_assertion);
>+        if (MACH_MSGH_BITS_HAS_VOUCHER(header->msgh_bits)) {
>+            m_voucher = header->msgh_voucher_port;
>+            header->msgh_voucher_port = MACH_VOUCHER_NULL;
>+            header->msgh_bits &= ~(MACH_MSGH_BITS_VOUCHER_MASK | MACH_MSGH_BITS_RAISEIMP);
>+        }
>     }
> 
>     ~ImportanceAssertion()
>     {
>-        proc_denap_assertion_complete(m_assertion);
>+        if (m_voucher) {
>+            kern_return_t kr = mach_voucher_deallocate(m_voucher);
>+            ASSERT_UNUSED(kr, !kr);
>+        }
>     }
> 
> private:
>-    uint64_t m_assertion;
>+    mach_voucher_t m_voucher;
> };
> 
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 193992: 360513 | 360646