Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (203749 => 203750)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-07-26 23:30:01 UTC (rev 203749)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-07-26 23:31:43 UTC (rev 203750)
@@ -208,7 +208,6 @@
NetworkProcess/NetworkResourceLoadParameters.cpp
NetworkProcess/Downloads/Download.cpp
- NetworkProcess/Downloads/DownloadAuthenticationClient.cpp
NetworkProcess/Downloads/DownloadManager.cpp
Platform/Logging.cpp
Modified: trunk/Source/WebKit2/ChangeLog (203749 => 203750)
--- trunk/Source/WebKit2/ChangeLog 2016-07-26 23:30:01 UTC (rev 203749)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-26 23:31:43 UTC (rev 203750)
@@ -1,3 +1,17 @@
+2016-07-26 Alex Christensen <[email protected]>
+
+ Remove unused DownloadAuthenticationClient
+ https://bugs.webkit.org/show_bug.cgi?id=160220
+
+ Reviewed by Darin Adler.
+
+ * CMakeLists.txt:
+ * NetworkProcess/Downloads/Download.cpp:
+ * NetworkProcess/Downloads/Download.h:
+ * NetworkProcess/Downloads/DownloadAuthenticationClient.cpp: Removed.
+ * NetworkProcess/Downloads/DownloadAuthenticationClient.h: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2016-07-26 Simon Fraser <[email protected]>
Allow LOG macros to be used outside the namespace, and other logging cleanup
Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (203749 => 203750)
--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-07-26 23:30:01 UTC (rev 203749)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-07-26 23:31:43 UTC (rev 203750)
@@ -35,10 +35,6 @@
#include "WebCoreArgumentCoders.h"
#include <WebCore/NotImplemented.h>
-#if !USE(NETWORK_SESSION)
-#include "DownloadAuthenticationClient.h"
-#endif
-
using namespace WebCore;
#define DOWNLOAD_LOG_ALWAYS(...) LOG_ALWAYS(isAlwaysOnLoggingAllowed(), __VA_ARGS__)
Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (203749 => 203750)
--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-07-26 23:30:01 UTC (rev 203749)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2016-07-26 23:31:43 UTC (rev 203750)
@@ -68,7 +68,6 @@
namespace WebKit {
-class DownloadAuthenticationClient;
class DownloadManager;
class NetworkSession;
class WebPage;
@@ -110,10 +109,6 @@
void didFail(const WebCore::ResourceError&, const IPC::DataReference& resumeData);
void didCancel(const IPC::DataReference& resumeData);
-#if USE(CFNETWORK)
- DownloadAuthenticationClient* authenticationClient();
-#endif
-
private:
// IPC::MessageSender
IPC::Connection* messageSenderConnection() override;
@@ -142,7 +137,6 @@
#endif
#if USE(CFNETWORK)
RetainPtr<CFURLDownloadRef> m_download;
- RefPtr<DownloadAuthenticationClient> m_authenticationClient;
#endif
#if PLATFORM(GTK) || PLATFORM(EFL)
std::unique_ptr<WebCore::ResourceHandleClient> m_downloadClient;
Deleted: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadAuthenticationClient.cpp (203749 => 203750)
--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadAuthenticationClient.cpp 2016-07-26 23:30:01 UTC (rev 203749)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadAuthenticationClient.cpp 2016-07-26 23:31:43 UTC (rev 203750)
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "DownloadAuthenticationClient.h"
-
-#if !USE(NETWORK_SESSION)
-
-#include "Download.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-DownloadAuthenticationClient::DownloadAuthenticationClient(Download* download)
- : m_download(download)
-{
- ASSERT_ARG(download, download);
-}
-
-void DownloadAuthenticationClient::receivedCredential(const AuthenticationChallenge&, const Credential&)
-{
- // FIXME (119667): This can probably be just removed.
-}
-
-void DownloadAuthenticationClient::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
-{
- // FIXME (119667): This can probably be just removed.
-}
-
-void DownloadAuthenticationClient::receivedCancellation(const AuthenticationChallenge&)
-{
- // FIXME (119667): This can probably be just removed.
-}
-
-void DownloadAuthenticationClient::receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&)
-{
- // FIXME (119667): This can probably be just removed.
-}
-
-void DownloadAuthenticationClient::receivedChallengeRejection(const AuthenticationChallenge&)
-{
- // FIXME (119667): This can probably be just removed.
-}
-
-} // namespace WebKit
-
-#endif
Deleted: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadAuthenticationClient.h (203749 => 203750)
--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadAuthenticationClient.h 2016-07-26 23:30:01 UTC (rev 203749)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadAuthenticationClient.h 2016-07-26 23:31:43 UTC (rev 203750)
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DownloadAuthenticationClient_h
-#define DownloadAuthenticationClient_h
-
-#if !USE(NETWORK_SESSION)
-
-#include <WebCore/AuthenticationClient.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
- class AuthenticationChallenge;
- class Credential;
-}
-
-namespace WebKit {
-
-class Download;
-
-class DownloadAuthenticationClient : public RefCounted<DownloadAuthenticationClient>, public WebCore::AuthenticationClient {
-public:
- static Ref<DownloadAuthenticationClient> create(Download* download) { return adoptRef(*new DownloadAuthenticationClient(download)); }
-
- void detach() { m_download = 0; }
-
- using RefCounted<DownloadAuthenticationClient>::ref;
- using RefCounted<DownloadAuthenticationClient>::deref;
-
-private:
- DownloadAuthenticationClient(Download*);
-
- void receivedCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&) override;
- void receivedRequestToContinueWithoutCredential(const WebCore::AuthenticationChallenge&) override;
- void receivedCancellation(const WebCore::AuthenticationChallenge&) override;
- void receivedRequestToPerformDefaultHandling(const WebCore::AuthenticationChallenge&) override;
- void receivedChallengeRejection(const WebCore::AuthenticationChallenge&) override;
-
- void refAuthenticationClient() override { ref(); }
- void derefAuthenticationClient() override { deref(); }
-
- Download* m_download;
-};
-
-} // namespace WebKit
-
-#endif // !USE(NETWORK_SESSION)
-
-#endif // DownloadAuthenticationClient_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (203749 => 203750)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-07-26 23:30:01 UTC (rev 203749)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-07-26 23:31:43 UTC (rev 203750)
@@ -1033,8 +1033,6 @@
5C1426F01C23F80900D41183 /* NetworkResourceLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E61C23F80500D41183 /* NetworkResourceLoadParameters.h */; };
5C1427011C23F84C00D41183 /* Download.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426F31C23F84300D41183 /* Download.cpp */; };
5C1427021C23F84C00D41183 /* Download.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F41C23F84300D41183 /* Download.h */; };
- 5C1427031C23F84C00D41183 /* DownloadAuthenticationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426F51C23F84300D41183 /* DownloadAuthenticationClient.cpp */; };
- 5C1427041C23F84C00D41183 /* DownloadAuthenticationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F61C23F84300D41183 /* DownloadAuthenticationClient.h */; };
5C1427051C23F84C00D41183 /* DownloadID.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F71C23F84300D41183 /* DownloadID.h */; };
5C1427061C23F84C00D41183 /* DownloadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426F81C23F84300D41183 /* DownloadManager.cpp */; };
5C1427071C23F84C00D41183 /* DownloadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F91C23F84300D41183 /* DownloadManager.h */; };
@@ -3087,8 +3085,6 @@
5C1426E61C23F80500D41183 /* NetworkResourceLoadParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkResourceLoadParameters.h; path = NetworkProcess/NetworkResourceLoadParameters.h; sourceTree = "<group>"; };
5C1426F31C23F84300D41183 /* Download.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Download.cpp; path = NetworkProcess/Downloads/Download.cpp; sourceTree = "<group>"; };
5C1426F41C23F84300D41183 /* Download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Download.h; path = NetworkProcess/Downloads/Download.h; sourceTree = "<group>"; };
- 5C1426F51C23F84300D41183 /* DownloadAuthenticationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadAuthenticationClient.cpp; path = NetworkProcess/Downloads/DownloadAuthenticationClient.cpp; sourceTree = "<group>"; };
- 5C1426F61C23F84300D41183 /* DownloadAuthenticationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadAuthenticationClient.h; path = NetworkProcess/Downloads/DownloadAuthenticationClient.h; sourceTree = "<group>"; };
5C1426F71C23F84300D41183 /* DownloadID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadID.h; path = NetworkProcess/Downloads/DownloadID.h; sourceTree = "<group>"; };
5C1426F81C23F84300D41183 /* DownloadManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadManager.cpp; path = NetworkProcess/Downloads/DownloadManager.cpp; sourceTree = "<group>"; };
5C1426F91C23F84300D41183 /* DownloadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadManager.h; path = NetworkProcess/Downloads/DownloadManager.h; sourceTree = "<group>"; };
@@ -5631,8 +5627,6 @@
5C14270B1C23F87100D41183 /* mac */,
5C1426F31C23F84300D41183 /* Download.cpp */,
5C1426F41C23F84300D41183 /* Download.h */,
- 5C1426F51C23F84300D41183 /* DownloadAuthenticationClient.cpp */,
- 5C1426F61C23F84300D41183 /* DownloadAuthenticationClient.h */,
5C1426F71C23F84300D41183 /* DownloadID.h */,
5C1426F81C23F84300D41183 /* DownloadManager.cpp */,
5C1426F91C23F84300D41183 /* DownloadManager.h */,
@@ -7493,7 +7487,6 @@
1AC75380183BE50F0072CB15 /* DataReference.h in Headers */,
83891B6C1A68C30B0030F386 /* DiagnosticLoggingClient.h in Headers */,
5C1427021C23F84C00D41183 /* Download.h in Headers */,
- 5C1427041C23F84C00D41183 /* DownloadAuthenticationClient.h in Headers */,
A1DF631318E0B7C8003A3E2A /* DownloadClient.h in Headers */,
5C1427051C23F84C00D41183 /* DownloadID.h in Headers */,
5C1427071C23F84C00D41183 /* DownloadManager.h in Headers */,
@@ -8959,7 +8952,6 @@
2D3494641BCC2EC30064F0BE /* DeprecatedPDFPlugin.mm in Sources */,
83891B6D1A68C30B0030F386 /* DiagnosticLoggingClient.mm in Sources */,
5C1427011C23F84C00D41183 /* Download.cpp in Sources */,
- 5C1427031C23F84C00D41183 /* DownloadAuthenticationClient.cpp in Sources */,
A1DF631218E0B7C8003A3E2A /* DownloadClient.mm in Sources */,
5C1427131C23F89E00D41183 /* DownloadCocoa.mm in Sources */,
5C1427111C23F89E00D41183 /* DownloadIOS.mm in Sources */,
