Attachment 214157 Details for Bug 118520 – patch for attachment213874

[patch] patch for attachment213874

1.patch (text/plain), 3.28 KB, created by Csaba Osztrogonác on 2013-10-14 09:45:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2013-10-14 09:45:03 PDT

Size: 3.28 KB

patch

obsolete

>diff --git a/Source/WebCore/platform/network/soup/ResourceError.h b/Source/WebCore/platform/network/soup/ResourceError.h
>index a10c6cb..a86ece4 100644
>--- a/Source/WebCore/platform/network/soup/ResourceError.h
>+++ b/Source/WebCore/platform/network/soup/ResourceError.h
>@@ -54,11 +54,6 @@ public:
>     static ResourceError timeoutError(const String& failingURL);
>     static ResourceError authenticationError(SoupMessage*);
> 
>-    unsigned tlsErrors() const { return m_certificateInfo.tlsErrors(); }
>-    void setTLSErrors(unsigned tlsErrors) { m_certificateInfo.setTLSErrors(static_cast<GTlsCertificateFlags>(tlsErrors)); }
>-    GTlsCertificate* certificate() const { return m_certificateInfo.certificate(); }
>-    void setCertificate(GTlsCertificate* certificate) { m_certificateInfo.setCertificate(certificate); }
>-
> private:
>     void platformCopy(ResourceError&) const;
>     static bool platformCompare(const ResourceError& a, const ResourceError& b);
>diff --git a/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp b/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
>index 1b89ce2..787c747 100644
>--- a/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
>@@ -79,8 +79,8 @@ ResourceError ResourceError::tlsError(SoupRequest* request, unsigned tlsErrors,
> {
>     ResourceError resourceError(g_quark_to_string(SOUP_HTTP_ERROR), SOUP_STATUS_SSL_FAILED,
>         failingURI(request), unacceptableTLSCertificate());
>-    resourceError.setTLSErrors(tlsErrors);
>-    resourceError.setCertificate(certificate);
>+    resourceError.m_certificateInfo.setTLSErrors(static_cast<GTlsCertificateFlags>(tlsErrors));
>+    resourceError.m_certificateInfo.setCertificate(certificate);
>     return resourceError;
> }
> 
>@@ -104,7 +104,7 @@ void ResourceError::platformCopy(ResourceError& errorCopy) const
> 
> bool ResourceError::platformCompare(const ResourceError& a, const ResourceError& b)
> {
>-    return a.tlsErrors() == b.tlsErrors();
>+    return a.m_certificateInfo.tlsErrors() == b.m_certificateInfo.tlsErrors();
> }
> 
> } // namespace WebCore
>diff --git a/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm b/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
>index 80ef888..32fa21f 100644
>--- a/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
>+++ b/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
>@@ -29,11 +29,12 @@
> #import "WKAPICast.h"
> #import "WebCertificateInfo.h"
> 
>+using namespace WebCore;
> using namespace WebKit;
> 
> WKCertificateInfoRef WKCertificateInfoCreateWithCertficateChain(CFArrayRef certificateChain)
> {
>-    RefPtr<WebCertificateInfo> certificateInfo = WebCertificateInfo::create(WebCore::CertificateInfo(certificateChain));
>+    RefPtr<WebCertificateInfo> certificateInfo = WebCertificateInfo::create(CertificateInfo(certificateChain));
>     return toAPI(certificateInfo.release().leakRef());
> }
> 
>diff --git a/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
>index ba57d1d..f79472b 100644
>--- a/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
>+++ b/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
>@@ -561,7 +561,6 @@ bool ArgumentCoder<CertificateInfo>::decode(ArgumentDecoder& decoder, Certificat
>         return false;
> 
>     certificateInfo = certificate;
>-
>     return true;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 118520: 206453 | 206454 | 206500 | 206507 | 209637 | 209640 | 209746 | 210347 | 212703 | 212804 | 212957 | 213036 | 213359 | 213595 | 213867 | 213868 | 213870 | 213871 | 213872 | 213874 | 214157 | 214158 | 214160