Diff
Modified: trunk/Source/WTF/ChangeLog (239571 => 239572)
--- trunk/Source/WTF/ChangeLog 2019-01-02 19:24:48 UTC (rev 239571)
+++ trunk/Source/WTF/ChangeLog 2019-01-02 19:40:05 UTC (rev 239572)
@@ -1,3 +1,17 @@
+2019-01-02 Commit Queue <commit-qu...@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 <yusukesuz...@slowstart.org>
Add ENABLE_UNIFIED_BUILDS option to cmake ports
Modified: trunk/Source/WTF/wtf/Platform.h (239571 => 239572)
--- trunk/Source/WTF/wtf/Platform.h 2019-01-02 19:24:48 UTC (rev 239571)
+++ trunk/Source/WTF/wtf/Platform.h 2019-01-02 19:40:05 UTC (rev 239572)
@@ -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
Modified: trunk/Source/WebKit/ChangeLog (239571 => 239572)
--- trunk/Source/WebKit/ChangeLog 2019-01-02 19:24:48 UTC (rev 239571)
+++ trunk/Source/WebKit/ChangeLog 2019-01-02 19:40:05 UTC (rev 239572)
@@ -1,3 +1,17 @@
+2019-01-02 Commit Queue <commit-qu...@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 <je...@apple.com>
Update user-visible copyright strings to include 2019
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (239571 => 239572)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-01-02 19:24:48 UTC (rev 239571)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-01-02 19:40:05 UTC (rev 239572)
@@ -133,14 +133,12 @@
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
Modified: trunk/Source/WebKit/Platform/IPC/Connection.h (239571 => 239572)
--- trunk/Source/WebKit/Platform/IPC/Connection.h 2019-01-02 19:24:48 UTC (rev 239571)
+++ trunk/Source/WebKit/Platform/IPC/Connection.h 2019-01-02 19:40:05 UTC (rev 239572)
@@ -137,7 +137,7 @@
};
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;
Modified: trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm (239571 => 239572)
--- trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2019-01-02 19:24:48 UTC (rev 239571)
+++ trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2019-01-02 19:40:05 UTC (rev 239572)
@@ -603,14 +603,13 @@
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()
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (239571 => 239572)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2019-01-02 19:24:48 UTC (rev 239571)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2019-01-02 19:40:05 UTC (rev 239572)
@@ -401,8 +401,9 @@
#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
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (239571 => 239572)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2019-01-02 19:24:48 UTC (rev 239571)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2019-01-02 19:40:05 UTC (rev 239572)
@@ -417,14 +417,12 @@
RetainPtr<CFDataRef> WebProcess::sourceApplicationAuditData() const
{
-#if USE(SOURCE_APPLICATION_AUDIT_DATA)
+#if PLATFORM(IOS_FAMILY)
+ 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
