Skip to content
  • andersca@apple.com's avatar
    Revert r157445 since it broke certificates on Mac. · 0443222f
    andersca@apple.com authored
    <rdar://problem/15246926&15254017&15269117>
    
    Source/WebCore:
    
    * GNUmakefile.list.am:
    * PlatformEfl.cmake:
    * WebCore.exp.in:
    * WebCore.vcxproj/WebCore.vcxproj:
    * WebCore.vcxproj/WebCore.vcxproj.filters:
    * WebCore.xcodeproj/project.pbxproj:
    * platform/network/ResourceErrorBase.h:
    * platform/network/ResourceResponseBase.h:
    * platform/network/cf/CertificateInfoCFNet.cpp: Removed.
    * platform/network/cf/ResourceResponse.h:
    * platform/network/mac/ResourceResponseMac.mm:
    (WebCore::ResourceResponse::setCertificateChain):
    (WebCore::ResourceResponse::certificateChain):
    * platform/network/soup/ResourceError.h:
    (WebCore::ResourceError::ResourceError):
    (WebCore::ResourceError::tlsErrors):
    (WebCore::ResourceError::setTLSErrors):
    (WebCore::ResourceError::certificate):
    (WebCore::ResourceError::setCertificate):
    * platform/network/soup/ResourceErrorSoup.cpp:
    (WebCore::ResourceError::tlsError):
    (WebCore::ResourceError::platformCopy):
    (WebCore::ResourceError::platformCompare):
    * platform/network/soup/ResourceResponse.h:
    (WebCore::ResourceResponse::ResourceResponse):
    (WebCore::ResourceResponse::soupMessageCertificate):
    (WebCore::ResourceResponse::setSoupMessageCertificate):
    (WebCore::ResourceResponse::soupMessageTLSErrors):
    (WebCore::ResourceResponse::setSoupMessageTLSErrors):
    * platform/network/soup/ResourceResponseSoup.cpp:
    (WebCore::ResourceResponse::toSoupMessage):
    (WebCore::ResourceResponse::updateFromSoupMessage):
    
    Source/WebKit2:
    
    * GNUmakefile.list.am:
    * NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
    (WebKit::AsynchronousNetworkLoaderClient::didReceiveResponse):
    * NetworkProcess/NetworkProcess.h:
    * NetworkProcess/NetworkProcess.messages.in:
    * NetworkProcess/NetworkResourceLoader.cpp:
    * NetworkProcess/mac/NetworkProcessMac.mm:
    (WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost):
    * PlatformEfl.cmake:
    * PlatformGTK.cmake:
    * Shared/API/c/mac/WKCertificateInfoMac.mm:
    (WKCertificateInfoCreateWithCertficateChain):
    (WKCertificateInfoGetCertificateChain):
    * Shared/Authentication/AuthenticationManager.cpp:
    (WebKit::AuthenticationManager::tryUsePlatformCertificateInfoForChallenge):
    (WebKit::AuthenticationManager::useCredentialForChallenge):
    * Shared/Authentication/AuthenticationManager.h:
    * Shared/Authentication/AuthenticationManager.messages.in:
    * Shared/Authentication/mac/AuthenticationManager.mac.mm:
    (WebKit::AuthenticationManager::tryUsePlatformCertificateInfoForChallenge):
    * Shared/UserMessageCoders.h:
    (WebKit::UserMessageEncoder::baseEncode):
    (WebKit::UserMessageDecoder::baseDecode):
    * Shared/WebCertificateInfo.h:
    (WebKit::WebCertificateInfo::create):
    (WebKit::WebCertificateInfo::platformCertificateInfo):
    (WebKit::WebCertificateInfo::WebCertificateInfo):
    * Shared/WebCoreArgumentCoders.cpp:
    * Shared/WebCoreArgumentCoders.h:
    * Shared/mac/PlatformCertificateInfo.h: Renamed from Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp.
    (WebKit::PlatformCertificateInfo::certificateChain):
    * Shared/mac/PlatformCertificateInfo.mm: Renamed from Source/WebCore/platform/network/mac/CertificateInfoMac.mm.
    (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
    (WebKit::PlatformCertificateInfo::encode):
    (WebKit::PlatformCertificateInfo::decode):
    (WebKit::PlatformCertificateInfo::dump):
    * Shared/mac/WebCoreArgumentCodersMac.mm:
    (CoreIPC::::encodePlatformData):
    (CoreIPC::::decodePlatformData):
    * Shared/soup/PlatformCertificateInfo.cpp: Added.
    (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
    (WebKit::PlatformCertificateInfo::~PlatformCertificateInfo):
    (WebKit::PlatformCertificateInfo::encode):
    (WebKit::PlatformCertificateInfo::decode):
    * Shared/soup/PlatformCertificateInfo.h: Renamed from Source/WebCore/platform/network/CertificateInfo.h.
    (WebKit::PlatformCertificateInfo::certificate):
    (WebKit::PlatformCertificateInfo::tlsErrors):
    * Shared/soup/WebCoreArgumentCodersSoup.cpp:
    (CoreIPC::::encodePlatformData):
    (CoreIPC::::decodePlatformData):
    * UIProcess/API/gtk/WebKitWebView.cpp:
    (webkit_web_view_get_tls_info):
    * UIProcess/Authentication/AuthenticationChallengeProxy.cpp:
    (WebKit::AuthenticationChallengeProxy::useCredential):
    * UIProcess/WebContext.cpp:
    (WebKit::WebContext::allowSpecificHTTPSCertificateForHost):
    * UIProcess/WebFrameProxy.cpp:
    (WebKit::WebFrameProxy::didCommitLoad):
    * UIProcess/WebFrameProxy.h:
    * UIProcess/WebPageProxy.cpp:
    (WebKit::WebPageProxy::didCommitLoadForFrame):
    * UIProcess/WebPageProxy.h:
    * UIProcess/WebPageProxy.messages.in:
    * WebKit2.xcodeproj/project.pbxproj:
    * WebProcess/Network/WebResourceLoader.cpp:
    (WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
    * WebProcess/Network/WebResourceLoader.h:
    * WebProcess/Network/WebResourceLoader.messages.in:
    * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    0443222f