Changeset 157853 in webkit


Ignore:
Timestamp:
Oct 23, 2013 2:17:45 AM (10 years ago)
Author:
mario@webkit.org
Message:

[GTK] Add WebKit2 API for TLS errors
https://bugs.webkit.org/show_bug.cgi?id=120160

Patch by Brian Holt <brian.holt@samsung.com> on 2013-10-23
Reviewed by Mario Sanchez Prada.

Revert back to using PlatformCertificateInfo following the rollout
of https://bugs.webkit.org/show_bug.cgi?id=118520.

  • Shared/soup/PlatformCertificateInfo.cpp:

(WebKit::PlatformCertificateInfo::PlatformCertificateInfo):

  • Shared/soup/PlatformCertificateInfo.h:
  • UIProcess/API/gtk/WebKitCertificateInfo.cpp:

(webkitCertificateInfoGetCertificateInfo):

  • UIProcess/API/gtk/WebKitCertificateInfoPrivate.h:
Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r157852 r157853  
     12013-10-23  Brian Holt  <brian.holt@samsung.com>
     2
     3        [GTK] Add WebKit2 API for TLS errors
     4        https://bugs.webkit.org/show_bug.cgi?id=120160
     5
     6        Reviewed by Mario Sanchez Prada.
     7
     8        Revert back to using PlatformCertificateInfo following the rollout
     9        of https://bugs.webkit.org/show_bug.cgi?id=118520.
     10
     11        * Shared/soup/PlatformCertificateInfo.cpp:
     12        (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
     13        * Shared/soup/PlatformCertificateInfo.h:
     14        * UIProcess/API/gtk/WebKitCertificateInfo.cpp:
     15        (webkitCertificateInfoGetCertificateInfo):
     16        * UIProcess/API/gtk/WebKitCertificateInfoPrivate.h:
     17
    1182013-10-23  Tim Horton  <timothy_horton@apple.com>
    219
  • trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp

    r157842 r157853  
    5252    : m_certificate(resourceError.certificate())
    5353    , m_tlsErrors(static_cast<GTlsCertificateFlags>(resourceError.tlsErrors()))
     54{
     55}
     56
     57PlatformCertificateInfo::PlatformCertificateInfo(GTlsCertificate* certificate, GTlsCertificateFlags tlsErrors)
     58    : m_certificate(certificate)
     59    , m_tlsErrors(tlsErrors)
    5460{
    5561}
  • trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.h

    r157849 r157853  
    4848    explicit PlatformCertificateInfo(const WebCore::ResourceResponse&);
    4949    explicit PlatformCertificateInfo(const WebCore::ResourceError&);
     50    explicit PlatformCertificateInfo(GTlsCertificate*, GTlsCertificateFlags);
    5051    ~PlatformCertificateInfo();
    5152
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCertificateInfo.cpp

    r157781 r157853  
    4343G_DEFINE_BOXED_TYPE(WebKitCertificateInfo, webkit_certificate_info, webkit_certificate_info_copy, webkit_certificate_info_free)
    4444
    45 const CertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo* info)
     45const PlatformCertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo* info)
    4646{
    4747    ASSERT(info);
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCertificateInfoPrivate.h

    r157781 r157853  
    2121#define WebKitCertificateInfoPrivate_h
    2222
    23 #include "CertificateInfo.h"
     23#include "PlatformCertificateInfo.h"
    2424#include "WebKitCertificateInfo.h"
    2525#include "WebKitPrivate.h"
     
    3636    }
    3737
    38     WebCore::CertificateInfo certificateInfo;
     38    WebKit::PlatformCertificateInfo certificateInfo;
    3939};
    4040
    41 const WebCore::CertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo*);
     41const WebKit::PlatformCertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo*);
    4242
    4343#endif // WebKitCertificateInfoPrivate_h
Note: See TracChangeset for help on using the changeset viewer.