Unreviewed, rolling out r165985.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Mar 2014 00:57:31 +0000 (00:57 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Mar 2014 00:57:31 +0000 (00:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=130551

broke page loading on all cocoa platforms (Requested by
thorton on #webkit).

Reverted changeset:

"[WebKit2] Implement
NetworkingContext::sourceApplicationAuditData() for WebKit2"
https://bugs.webkit.org/show_bug.cgi?id=130528
http://trac.webkit.org/changeset/165985

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@166031 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm
Source/WebKit2/Platform/IPC/Connection.h
Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

index 937c14b..6fd31c5 100644 (file)
@@ -1,3 +1,18 @@
+2014-03-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r165985.
+        https://bugs.webkit.org/show_bug.cgi?id=130551
+
+        broke page loading on all cocoa platforms (Requested by
+        thorton on #webkit).
+
+        Reverted changeset:
+
+        "[WebKit2] Implement
+        NetworkingContext::sourceApplicationAuditData() for WebKit2"
+        https://bugs.webkit.org/show_bug.cgi?id=130528
+        http://trac.webkit.org/changeset/165985
+
 2014-03-20  Alexey Proskuryakov  <ap@apple.com>
 
         Fix a long-standing typo that's now breaking USE(ASYNC_NSTEXTINPUTCLIENT) build.
index 28cfe7b..2a7c594 100644 (file)
@@ -26,7 +26,6 @@
 #import "config.h"
 #import "RemoteNetworkingContext.h"
 
-#import "NetworkProcess.h"
 #import "SessionTracker.h"
 #import "WebErrors.h"
 #import <WebCore/ResourceError.h>
@@ -70,11 +69,7 @@ NetworkStorageSession& RemoteNetworkingContext::storageSession() const
 
 RetainPtr<CFDataRef> RemoteNetworkingContext::sourceApplicationAuditData() const
 {
-    audit_token_t auditToken;
-    if (!NetworkProcess::shared().parentProcessConnection()->getAuditToken(auditToken))
-        return nullptr;
-    
-    return adoptCF(CFDataCreate(0, (const UInt8*)&auditToken, sizeof(auditToken)));
+    return nil;
 }
 
 ResourceError RemoteNetworkingContext::blockedError(const ResourceRequest& request) const
index 6383017..e16ef7f 100644 (file)
@@ -114,7 +114,7 @@ public:
     };
     static bool identifierIsNull(Identifier identifier) { return identifier.port == MACH_PORT_NULL; }
     xpc_connection_t xpcConnection() { return m_xpcConnection; }
-    bool getAuditToken(audit_token_t&);
+
 #elif USE(UNIX_DOMAIN_SOCKETS)
     typedef int Identifier;
     static bool identifierIsNull(Identifier identifier) { return !identifier; }
index 6c6f68a..f6a7659 100644 (file)
 #include <wtf/RunLoop.h>
 #include <xpc/xpc.h>
 
-#if __has_include(<xpc/private.h>)
-#include <xpc/private.h>
-#else
-extern "C" void xpc_connection_get_audit_token(xpc_connection_t, audit_token_t*);
-#endif
-
 namespace IPC {
 
 static const size_t inlineMessageMaxSize = 4096;
@@ -517,13 +511,4 @@ IPC::Connection::Identifier Connection::identifier() const
     return Identifier(m_isServer ? m_receivePort : m_sendPort, m_xpcConnection);
 }
     
-bool Connection::getAuditToken(audit_token_t& auditToken)
-{
-    if (!m_xpcConnection)
-        return false;
-    
-    xpc_connection_get_audit_token(m_xpcConnection, &auditToken);
-    return true;
-}
-    
 } // namespace IPC
index df2fbe3..26bffc4 100644 (file)
  */
 
 #include "config.h"
-#include "WebFrameNetworkingContext.h"
 
 #include "SessionTracker.h"
 #include "WebCookieManager.h"
-#include "WebProcess.h"
+#include "WebFrameNetworkingContext.h"
 #include "WebPage.h"
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
@@ -91,11 +90,7 @@ SchedulePairHashSet* WebFrameNetworkingContext::scheduledRunLoopPairs() const
 
 RetainPtr<CFDataRef> WebFrameNetworkingContext::sourceApplicationAuditData() const
 {
-    audit_token_t auditToken;
-    if (!WebProcess::shared().parentProcessConnection()->getAuditToken(auditToken))
-        return nullptr;
-    
-    return adoptCF(CFDataCreate(0, (const UInt8*)&auditToken, sizeof(auditToken)));
+    return RetainPtr<CFDataRef>();
 }
 
 ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const