Attachment 358191 Details for Bug 193083 – ROLLOUT of r239524

[patch] ROLLOUT of r239524

bug-193083-20190102113446.patch (text/plain), 6.85 KB, created by WebKit Commit Bot on 2019-01-02 11:34:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-01-02 11:34:47 PST

Size: 6.85 KB

patch

obsolete

>Subversion Revision: 239571
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 8316c1bcadd26b9d82d8b9dc662a653c70c9e54b..295099b63bae08061e921cf2b1ebbb74f7b5cff0 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-02  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r239524.
>+        https://bugs.webkit.org/show_bug.cgi?id=193083
>+
>+        basic browsing seems not to work (Requested by thorton on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "Expand use of sourceApplicationAuditData"
>+        https://bugs.webkit.org/show_bug.cgi?id=192995
>+        https://trac.webkit.org/changeset/239524
>+
> 2018-12-28  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
> 
>         Add ENABLE_UNIFIED_BUILDS option to cmake ports
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5c23432fe891564907ceb8a768a7d6eae8558ebc..8ab58af9c828ec5e5801af9af8f2a8e5318d145b 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-02  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r239524.
>+        https://bugs.webkit.org/show_bug.cgi?id=193083
>+
>+        basic browsing seems not to work (Requested by thorton on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "Expand use of sourceApplicationAuditData"
>+        https://bugs.webkit.org/show_bug.cgi?id=192995
>+        https://trac.webkit.org/changeset/239524
>+
> 2019-01-01  Jeff Miller  <jeffm@apple.com>
> 
>         Update user-visible copyright strings to include 2019
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 52b7d2e764d573f96a21eeca4d471a00fc0a945b..9cfc8c14bba0f158c9806045152d0b39187f4245 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1359,10 +1359,6 @@
> #define HAVE_RSA_PSS 1
> #endif
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS_FAMILY)
>-#define USE_SOURCE_APPLICATION_AUDIT_DATA 1
>-#endif
>-
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(IOSMAC)
> #define HAVE_URL_FORMATTING 1
> #endif
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>index 9f84a6d13374d15484fc0b03279e415c19bb10fd..1c55779d9d1794447de63b8b5468ef4fdd0cbae9 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>@@ -133,14 +133,12 @@ void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessC
> 
> RetainPtr<CFDataRef> NetworkProcess::sourceApplicationAuditData() const
> {
>-#if USE(SOURCE_APPLICATION_AUDIT_DATA)
>+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
>+    audit_token_t auditToken;
>     ASSERT(parentProcessConnection());
>-    if (!parentProcessConnection())
>+    if (!parentProcessConnection() || !parentProcessConnection()->getAuditToken(auditToken))
>         return nullptr;
>-    Optional<audit_token_t> auditToken = parentProcessConnection()->getAuditToken();
>-    if (!auditToken)
>-        return nullptr;
>-    return adoptCF(CFDataCreate(nullptr, (const UInt8*)&*auditToken, sizeof(*auditToken)));
>+    return adoptCF(CFDataCreate(nullptr, (const UInt8*)&auditToken, sizeof(auditToken)));
> #else
>     return nullptr;
> #endif
>diff --git a/Source/WebKit/Platform/IPC/Connection.h b/Source/WebKit/Platform/IPC/Connection.h
>index e81e81e35de55fe2c44d828e1e72cf8be93dc9b1..fd0015b6457e4a3f30f276a7fbd0e559463e3f3d 100644
>--- a/Source/WebKit/Platform/IPC/Connection.h
>+++ b/Source/WebKit/Platform/IPC/Connection.h
>@@ -137,7 +137,7 @@ public:
>     };
>     static bool identifierIsValid(Identifier identifier) { return MACH_PORT_VALID(identifier.port); }
>     xpc_connection_t xpcConnection() const { return m_xpcConnection.get(); }
>-    Optional<audit_token_t> getAuditToken();
>+    bool getAuditToken(audit_token_t&);
>     pid_t remoteProcessID() const;
> #elif OS(WINDOWS)
>     typedef HANDLE Identifier;
>diff --git a/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm b/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>index 94cc953b4e4acb22a0596673cf15b7255d88a434..fd286b531a12a08dc9b0543f201e3143d57467c6 100644
>--- a/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>+++ b/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>@@ -603,14 +603,13 @@ IPC::Connection::Identifier Connection::identifier() const
>     return Identifier(m_isServer ? m_receivePort : m_sendPort, m_xpcConnection);
> }
> 
>-Optional<audit_token_t> Connection::getAuditToken()
>+bool Connection::getAuditToken(audit_token_t& auditToken)
> {
>     if (!m_xpcConnection)
>-        return WTF::nullopt;
>+        return false;
>     
>-    audit_token_t auditToken;
>     xpc_connection_get_audit_token(m_xpcConnection.get(), &auditToken);
>-    return WTFMove(auditToken);
>+    return true;
> }
> 
> bool Connection::kill()
>diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
>index dd95677b60431949ea835af54cfcae1a0a3d3e38..09cea95355311b64c3ae0bc631eda8b10852fffb 100644
>--- a/Source/WebKit/WebProcess/WebProcess.cpp
>+++ b/Source/WebKit/WebProcess/WebProcess.cpp
>@@ -401,8 +401,9 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
> #endif
> 
> #if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA)
>-    if (Optional<audit_token_t> auditToken = parentProcessConnection()->getAuditToken()) {
>-        RetainPtr<CFDataRef> auditData = adoptCF(CFDataCreate(nullptr, (const UInt8*)&*auditToken, sizeof(*auditToken)));
>+    audit_token_t auditToken;
>+    if (parentProcessConnection()->getAuditToken(auditToken)) {
>+        RetainPtr<CFDataRef> auditData = adoptCF(CFDataCreate(nullptr, (const UInt8*)&auditToken, sizeof(auditToken)));
>         Inspector::RemoteInspector::singleton().setParentProcessInformation(WebCore::presentingApplicationPID(), auditData);
>     }
> #endif
>diff --git a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>index 83ab80f5e7bdb0b9ba54df420e0337044ee8a1a2..ef32528f6899cffda85207b7ad76a0c2d2fde6f1 100644
>--- a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>+++ b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
>@@ -417,14 +417,12 @@ void WebProcess::platformTerminate()
> 
> RetainPtr<CFDataRef> WebProcess::sourceApplicationAuditData() const
> {
>-#if USE(SOURCE_APPLICATION_AUDIT_DATA)
>+#if PLATFORM(IOS_FAMILY)
>+    audit_token_t auditToken;
>     ASSERT(parentProcessConnection());
>-    if (!parentProcessConnection())
>-        return nullptr;
>-    Optional<audit_token_t> auditToken = parentProcessConnection()->getAuditToken();
>-    if (!auditToken)
>+    if (!parentProcessConnection() || !parentProcessConnection()->getAuditToken(auditToken))
>         return nullptr;
>-    return adoptCF(CFDataCreate(nullptr, (const UInt8*)&*auditToken, sizeof(*auditToken)));
>+    return adoptCF(CFDataCreate(nullptr, (const UInt8*)&auditToken, sizeof(auditToken)));
> #else
>     return nullptr;
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 193083: 358191