Changeset 157853 in webkit
- Timestamp:
- Oct 23, 2013 2:17:45 AM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r157852 r157853 1 2013-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 1 18 2013-10-23 Tim Horton <timothy_horton@apple.com> 2 19 -
trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp
r157842 r157853 52 52 : m_certificate(resourceError.certificate()) 53 53 , m_tlsErrors(static_cast<GTlsCertificateFlags>(resourceError.tlsErrors())) 54 { 55 } 56 57 PlatformCertificateInfo::PlatformCertificateInfo(GTlsCertificate* certificate, GTlsCertificateFlags tlsErrors) 58 : m_certificate(certificate) 59 , m_tlsErrors(tlsErrors) 54 60 { 55 61 } -
trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.h
r157849 r157853 48 48 explicit PlatformCertificateInfo(const WebCore::ResourceResponse&); 49 49 explicit PlatformCertificateInfo(const WebCore::ResourceError&); 50 explicit PlatformCertificateInfo(GTlsCertificate*, GTlsCertificateFlags); 50 51 ~PlatformCertificateInfo(); 51 52 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCertificateInfo.cpp
r157781 r157853 43 43 G_DEFINE_BOXED_TYPE(WebKitCertificateInfo, webkit_certificate_info, webkit_certificate_info_copy, webkit_certificate_info_free) 44 44 45 const CertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo* info)45 const PlatformCertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo* info) 46 46 { 47 47 ASSERT(info); -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCertificateInfoPrivate.h
r157781 r157853 21 21 #define WebKitCertificateInfoPrivate_h 22 22 23 #include " CertificateInfo.h"23 #include "PlatformCertificateInfo.h" 24 24 #include "WebKitCertificateInfo.h" 25 25 #include "WebKitPrivate.h" … … 36 36 } 37 37 38 Web Core::CertificateInfo certificateInfo;38 WebKit::PlatformCertificateInfo certificateInfo; 39 39 }; 40 40 41 const Web Core::CertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo*);41 const WebKit::PlatformCertificateInfo& webkitCertificateInfoGetCertificateInfo(WebKitCertificateInfo*); 42 42 43 43 #endif // WebKitCertificateInfoPrivate_h
Note: See TracChangeset
for help on using the changeset viewer.