Changeset 157445 in webkit
- Timestamp:
- Oct 15, 2013 3:24:29 AM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 deleted
- 48 edited
- 1 copied
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r157444 r157445 1 2013-10-15 Csaba Osztrogonác <ossy@webkit.org> 2 3 Move PlatformCertificateInfo to WebCore and make the ResourceResponse primitives work in terms of that platform agnostic object 4 https://bugs.webkit.org/show_bug.cgi?id=118520 5 6 Reviewed by Anders Carlsson. 7 8 Added PlatformCertificateInfo getter and setter to ResourceErrorBase 9 and ResourceResponseBase so that getting and setting certificates 10 becomes cross platform. 11 12 Changed the existing platform specific certificate getters and setters 13 of ResourceError and ResourceResponse to use the 14 PlatformCertificateInfo member. 15 16 Original patch by Kwang Yul Seo <skyul@company100.net> 17 18 The following things were fixed by Csaba Osztrogonác: 19 - trivial conflicts resolved in WebCore.exp.in, project.pbxproj, NetworkResourceLoader.cpp, 20 WebPageProxy.h, WebFrameLoaderClient.cpp and PlatformEfl.cmake. 21 - trivial fix in the new AsynchronousNetworkLoaderClient.cpp 22 - style fixed (NULL -> 0 and smaller indentation in WebCoreArgumentCodersSoup.cpp) 23 - obsolete change removed from NetworkResourceLoader.cpp 24 - unneeded typo removed from ResourceHandleSoup.cpp 25 - Fixed the if guard of including RetainPtr.h in PlatformCertificateInfo.h to make Windows build happy. 26 - add PlatformCertificateInfoCFNet.cpp with empty constructor and destructor to make Windows build happy. 27 - resolved conflict in Source/WebCore/WebCore.xcodeproj/project.pbxproj after r156488 28 - renamed KURL to URL after r156550. 29 - removed obsolete Qt changes 30 - added back initializers for m_soupFlags 31 - included gio/gio.h instead of libsoup/soup.h in PlatformCertificateInfo.h 32 - removed unused class forward declarations and includes 33 34 * GNUmakefile.list.am: 35 * PlatformEfl.cmake: 36 * Target.pri: 37 * WebCore.exp.in: 38 * WebCore.vcxproj/WebCore.vcxproj: 39 * WebCore.vcxproj/WebCore.vcxproj.filters: 40 * WebCore.xcodeproj/project.pbxproj: 41 * platform/network/PlatformCertificateInfo.h: Renamed from Source/WebKit2/Shared/soup/PlatformCertificateInfo.h. 42 (WebCore::PlatformCertificateInfo::certificate): 43 (WebCore::PlatformCertificateInfo::setCertificate): 44 (WebCore::PlatformCertificateInfo::tlsErrors): 45 (WebCore::PlatformCertificateInfo::setTLSErrors): 46 * platform/network/ResourceErrorBase.h: 47 (WebCore::ResourceErrorBase::platformCertificateInfo): 48 (WebCore::ResourceErrorBase::setPlatformCertificateInfo): 49 * platform/network/ResourceResponseBase.h: 50 (WebCore::ResourceResponseBase::platformCertificateInfo): 51 (WebCore::ResourceResponseBase::setPlatformCertificateInfo): 52 * platform/network/cf/ResourceResponse.h: 53 * platform/network/mac/PlatformCertificateInfoMac.mm: Renamed from Source/WebKit2/Shared/mac/PlatformCertificateInfo.mm. 54 (WebCore::PlatformCertificateInfo::PlatformCertificateInfo): 55 (WebCore::PlatformCertificateInfo::~PlatformCertificateInfo): 56 (WebCore::PlatformCertificateInfo::setCertificateChain): 57 (WebCore::PlatformCertificateInfo::certificateChain): 58 (WebCore::PlatformCertificateInfo::dump): 59 * platform/network/mac/ResourceResponseMac.mm: 60 (WebCore::ResourceResponse::setCertificateChain): 61 (WebCore::ResourceResponse::certificateChain): 62 * platform/network/soup/PlatformCertificateInfoSoup.cpp: 63 (WebCore::PlatformCertificateInfo::PlatformCertificateInfo): 64 (WebCore::PlatformCertificateInfo::~PlatformCertificateInfo): 65 * platform/network/soup/ResourceError.h: 66 (WebCore::ResourceError::ResourceError): 67 (WebCore::ResourceError::tlsErrors): 68 (WebCore::ResourceError::setTLSErrors): 69 (WebCore::ResourceError::certificate): 70 (WebCore::ResourceError::setCertificate): 71 * platform/network/soup/ResourceErrorSoup.cpp: 72 (WebCore::ResourceError::platformCopy): 73 * platform/network/soup/ResourceResponse.h: 74 (WebCore::ResourceResponse::ResourceResponse): 75 (WebCore::ResourceResponse::soupMessageCertificate): 76 (WebCore::ResourceResponse::setSoupMessageCertificate): 77 (WebCore::ResourceResponse::soupMessageTLSErrors): 78 (WebCore::ResourceResponse::setSoupMessageTLSErrors): 79 * platform/network/soup/ResourceResponseSoup.cpp: 80 (WebCore::ResourceResponse::toSoupMessage): 81 (WebCore::ResourceResponse::updateFromSoupMessage): 82 1 83 2013-10-15 Ryosuke Niwa <rniwa@webkit.org> 2 84 -
trunk/Source/WebCore/GNUmakefile.list.am
r157430 r157445 5412 5412 Source/WebCore/platform/network/BlobResourceHandle.h \ 5413 5413 Source/WebCore/platform/network/BlobStorageData.h \ 5414 Source/WebCore/platform/network/CertificateInfo.h \ 5414 5415 Source/WebCore/platform/network/CookieStorage.h \ 5415 5416 Source/WebCore/platform/network/FormDataBuilder.cpp \ … … 5446 5447 Source/WebCore/platform/network/soup/AuthenticationChallenge.h \ 5447 5448 Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp \ 5449 Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp \ 5448 5450 Source/WebCore/platform/network/soup/CookieJarSoup.cpp \ 5449 5451 Source/WebCore/platform/network/soup/CookieJarSoup.h \ -
trunk/Source/WebCore/PlatformEfl.cmake
r157418 r157445 151 151 152 152 platform/network/soup/AuthenticationChallengeSoup.cpp 153 platform/network/soup/CertificateInfoSoup.cpp 153 154 platform/network/soup/CookieJarSoup.cpp 154 155 platform/network/soup/CookieStorageSoup.cpp -
trunk/Source/WebCore/WebCore.exp.in
r157444 r157445 763 763 __ZN7WebCore23MutableStylePropertySet25ensureCSSStyleDeclarationEv 764 764 __ZN7WebCore23MutableStylePropertySetD1Ev 765 __ZN7WebCore15CertificateInfo19setCertificateChainEPK9__CFArray 766 __ZN7WebCore15CertificateInfoC1EPK9__CFArray 767 __ZN7WebCore15CertificateInfoC1Ev 768 __ZN7WebCore15CertificateInfoD1Ev 769 __ZNK7WebCore15CertificateInfo16certificateChainEv 765 770 __ZN7WebCore23SynchronousLoaderClient24platformBadResponseErrorEv 766 771 __ZN7WebCore23dataForURLComponentTypeEP5NSURLl -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r157419 r157445 7970 7970 <ClCompile Include="..\platform\network\SynchronousLoaderClient.cpp" /> 7971 7971 <ClCompile Include="..\platform\network\cf\AuthenticationCF.cpp"> 7972 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild> 7973 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild> 7974 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild> 7975 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild> 7976 </ClCompile> 7977 <ClCompile Include="..\platform\network\cf\CertificateInfoCFNet.cpp"> 7972 7978 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild> 7973 7979 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild> … … 19046 19052 <ClInclude Include="..\platform\network\BlobResourceHandle.h" /> 19047 19053 <ClInclude Include="..\platform\network\BlobStorageData.h" /> 19054 <ClInclude Include="..\platform\network\CertificateInfo.h" /> 19048 19055 <ClInclude Include="..\platform\network\CookieStorage.h" /> 19049 19056 <ClInclude Include="..\platform\network\Credential.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r157430 r157445 8539 8539 <Filter>platform\network</Filter> 8540 8540 </ClInclude> 8541 <ClInclude Include="..\platform\network\CertificateInfo.h"> 8542 <Filter>platform\network</Filter> 8543 </ClInclude> 8541 8544 <ClInclude Include="..\platform\network\CookieStorage.h"> 8542 8545 <Filter>platform\network</Filter> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r157430 r157445 1863 1863 5DFE8F560D16477B0076E937 /* ScheduledAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */; }; 1864 1864 5DFE8F570D16477C0076E937 /* ScheduledAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA378BB0D15F64200B793D6 /* ScheduledAction.h */; }; 1865 5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */; }; 1866 5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F2DBBE8178E336900141486 /* CertificateInfo.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1865 1867 5FC7DC26CFE2563200B85AE4 /* JSEventTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FC7DC26CFE2563200B85AE5 /* JSEventTarget.h */; }; 1868 5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FE1D291178FD1F3001AA3C3 /* Security.framework */; }; 1866 1869 626CDE0E1140424C001E5A68 /* SpatialNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 626CDE0C1140424C001E5A68 /* SpatialNavigation.cpp */; }; 1867 1870 626CDE0F1140424C001E5A68 /* SpatialNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 626CDE0D1140424C001E5A68 /* SpatialNavigation.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 8438 8441 5DB1BC6810715A6400EFAA49 /* TransformSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformSource.h; sourceTree = "<group>"; }; 8439 8442 5DB1BC6910715A6400EFAA49 /* TransformSourceLibxslt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformSourceLibxslt.cpp; sourceTree = "<group>"; }; 8443 5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CertificateInfoMac.mm; sourceTree = "<group>"; }; 8444 5F2DBBE8178E336900141486 /* CertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CertificateInfo.h; sourceTree = "<group>"; }; 8440 8445 5FC7DC26CFE2563200B85AE5 /* JSEventTarget.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSEventTarget.h; sourceTree = "<group>"; }; 8446 5FE1D291178FD1F3001AA3C3 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = ../../../../../System/Library/Frameworks/Security.framework; sourceTree = "<group>"; }; 8441 8447 626CDE0C1140424C001E5A68 /* SpatialNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpatialNavigation.cpp; sourceTree = "<group>"; }; 8442 8448 626CDE0D1140424C001E5A68 /* SpatialNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpatialNavigation.h; sourceTree = "<group>"; }; … … 13228 13234 buildActionMask = 2147483647; 13229 13235 files = ( 13236 5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */, 13230 13237 FD2DBF1212B048A300ED98C6 /* Accelerate.framework in Frameworks */, 13231 13238 93F19B1308245E59001E9ABC /* ApplicationServices.framework in Frameworks */, … … 13563 13570 isa = PBXGroup; 13564 13571 children = ( 13572 5FE1D291178FD1F3001AA3C3 /* Security.framework */, 13565 13573 65C97AF208EA908800ACD273 /* config.h */, 13566 13574 EDEC98020AED7E170059137F /* WebCorePrefix.h */, … … 15042 15050 2EB4BCD1121F03E300EC4885 /* BlobResourceHandle.h */, 15043 15051 2EDEF1F2121B0EFC00726DB2 /* BlobStorageData.h */, 15052 5F2DBBE8178E336900141486 /* CertificateInfo.h */, 15044 15053 E13F01EA1270E10D00DFBA71 /* CookieStorage.h */, 15045 15054 514C76580CE923A1007EF3CD /* Credential.cpp */, … … 15102 15111 514C76420CE9234E007EF3CD /* AuthenticationMac.h */, 15103 15112 514C76430CE9234E007EF3CD /* AuthenticationMac.mm */, 15113 5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */, 15104 15114 E1424C8F164B460B00F32D40 /* CookieJarMac.mm */, 15105 15115 E13F01F01270E19000DFBA71 /* CookieStorageMac.mm */, … … 23569 23579 499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */, 23570 23580 493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */, 23581 5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */, 23571 23582 07C59B5417F4AC15000FBCBB /* AudioStreamTrack.h in Headers */, 23572 23583 E1424C8A164B3B4E00F32D40 /* PlatformCookieJar.h in Headers */, … … 27663 27674 977E2E0E12F0FC9C00C13380 /* XSSAuditorDelegate.cpp in Sources */, 27664 27675 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */, 27676 5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */, 27665 27677 FD1762DF176686D900D836A8 /* UpSampler.cpp in Sources */, 27666 27678 FD1762E3176686EA00D836A8 /* DownSampler.cpp in Sources */, -
trunk/Source/WebCore/platform/network/CertificateInfo.h
r157444 r157445 2 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 3 * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved. 4 * Portions Copyright (c) 2013 Company 100 Inc. All rights reserved. 4 5 * 5 6 * Redistribution and use in source and binary forms, with or without … … 25 26 */ 26 27 27 #ifndef PlatformCertificateInfo_h28 #define PlatformCertificateInfo_h28 #ifndef CertificateInfo_h 29 #define CertificateInfo_h 29 30 30 #include <libsoup/soup.h> 31 #if PLATFORM(MAC) || USE(CFNETWORK) 32 #include <wtf/RetainPtr.h> 33 #elif USE(SOUP) 34 #include <gio/gio.h> 31 35 #include <wtf/gobject/GRefPtr.h> 32 33 namespace CoreIPC { 34 class ArgumentDecoder; 35 class ArgumentEncoder; 36 } 36 #endif 37 37 38 38 namespace WebCore { 39 class ResourceError;40 class ResourceResponse;41 }42 39 43 namespace WebKit { 40 class CertificateInfo { 41 public: 42 CertificateInfo(); 44 43 45 class PlatformCertificateInfo { 46 public: 47 PlatformCertificateInfo(); 48 explicit PlatformCertificateInfo(const WebCore::ResourceResponse&); 49 explicit PlatformCertificateInfo(const WebCore::ResourceError&); 50 ~PlatformCertificateInfo(); 44 #if PLATFORM(MAC) 45 explicit CertificateInfo(CFArrayRef certificateChain); 46 #endif 51 47 48 ~CertificateInfo(); 49 50 #if PLATFORM(MAC) || USE(CFNETWORK) 51 void setCertificateChain(CFArrayRef); 52 CFArrayRef certificateChain() const; 53 #ifndef NDEBUG 54 void dump() const; 55 #endif 56 57 #elif USE(SOUP) 52 58 GTlsCertificate* certificate() const { return m_certificate.get(); } 59 void setCertificate(GTlsCertificate* certificate) { m_certificate = certificate; } 60 53 61 GTlsCertificateFlags tlsErrors() const { return m_tlsErrors; } 54 55 void encode(CoreIPC::ArgumentEncoder&) const; 56 static bool decode(CoreIPC::ArgumentDecoder&, PlatformCertificateInfo&); 62 void setTLSErrors(GTlsCertificateFlags tlsErrors) { m_tlsErrors = tlsErrors; } 63 #endif 57 64 58 65 private: 66 #if PLATFORM(MAC) || USE(CFNETWORK) 67 // Certificate chain is normally part of NS/CFURLResponse, but there is no way to re-add it to a deserialized response after IPC. 68 RetainPtr<CFArrayRef> m_certificateChain; 69 #elif USE(SOUP) 59 70 GRefPtr<GTlsCertificate> m_certificate; 60 71 GTlsCertificateFlags m_tlsErrors; 72 #endif 61 73 }; 62 74 63 } // namespace Web Kit75 } // namespace WebCore 64 76 65 #endif // PlatformCertificateInfo_h77 #endif // CertificateInfo_h -
trunk/Source/WebCore/platform/network/ResourceErrorBase.h
r127757 r157445 27 27 #define ResourceErrorBase_h 28 28 29 #include "CertificateInfo.h" 29 30 #include <wtf/text/WTFString.h> 30 31 … … 52 53 void setIsTimeout(bool isTimeout) { m_isTimeout = isTimeout; } 53 54 bool isTimeout() const { return m_isTimeout; } 55 56 const CertificateInfo& certificateInfo() const { return m_certificateInfo; } 57 void setCertificateInfo(const CertificateInfo& certificateInfo) { m_certificateInfo = certificateInfo; } 54 58 55 59 static bool compare(const ResourceError&, const ResourceError&); … … 90 94 String m_failingURL; 91 95 String m_localizedDescription; 96 CertificateInfo m_certificateInfo; 92 97 bool m_isNull; 93 98 bool m_isCancellation; -
trunk/Source/WebCore/platform/network/ResourceResponseBase.h
r156550 r157445 28 28 #define ResourceResponseBase_h 29 29 30 #include "CertificateInfo.h" 30 31 #include "HTTPHeaderMap.h" 32 #include "ResourceLoadTiming.h" 31 33 #include "URL.h" 32 #include "ResourceLoadTiming.h"33 34 34 35 #include <wtf/PassOwnPtr.h> … … 112 113 ResourceLoadTiming* resourceLoadTiming() const; 113 114 void setResourceLoadTiming(PassRefPtr<ResourceLoadTiming>); 115 116 const CertificateInfo& certificateInfo() const { return m_certificateInfo; } 117 void setCertificateInfo(const CertificateInfo& certificateInfo) { m_certificateInfo = certificateInfo; } 114 118 115 119 // The ResourceResponse subclass may "shadow" this method to provide platform-specific memory usage information … … 153 157 bool m_connectionReused : 1; 154 158 RefPtr<ResourceLoadTiming> m_resourceLoadTiming; 159 CertificateInfo m_certificateInfo; 155 160 156 161 bool m_isNull : 1; -
trunk/Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp
r157444 r157445 1 1 /* 2 * Copyright (C) 201 0 Apple Inc. All rights reserved.2 * Copyright (C) 2013 Company 100 Inc. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 #i fndef PlatformCertificateInfo_h27 # define PlatformCertificateInfo_h26 #include "config.h" 27 #include "CertificateInfo.h" 28 28 29 #include <WebCore/ResourceResponse.h> 30 #include <wtf/RetainPtr.h> 29 namespace WebCore { 31 30 32 namespace CoreIPC { 33 class ArgumentDecoder; 34 class ArgumentEncoder; 31 CertificateInfo::CertificateInfo() 32 { 35 33 } 36 34 37 namespace WebKit { 35 CertificateInfo::~CertificateInfo() 36 { 37 } 38 38 39 class PlatformCertificateInfo { 40 public: 41 PlatformCertificateInfo(); 42 explicit PlatformCertificateInfo(const WebCore::ResourceResponse&); 43 explicit PlatformCertificateInfo(CFArrayRef certificateChain); 44 45 CFArrayRef certificateChain() const { return m_certificateChain.get(); } 46 47 void encode(CoreIPC::ArgumentEncoder&) const; 48 static bool decode(CoreIPC::ArgumentDecoder&, PlatformCertificateInfo&); 49 50 #ifndef NDEBUG 51 void dump() const; 52 #endif 53 54 private: 55 RetainPtr<CFArrayRef> m_certificateChain; 56 }; 57 58 } // namespace WebKit 59 60 #endif // PlatformCertificateInfo_h 39 } // namespace WebCore -
trunk/Source/WebCore/platform/network/cf/ResourceResponse.h
r156550 r157445 118 118 mutable RetainPtr<NSURLResponse> m_nsResponse; 119 119 #endif 120 #if PLATFORM(MAC) || USE(CFNETWORK)121 // Certificate chain is normally part of NS/CFURLResponse, but there is no way to re-add it to a deserialized response after IPC.122 RetainPtr<CFArrayRef> m_externalCertificateChain;123 #endif124 120 InitLevel m_initLevel; 125 121 bool m_platformResponseIsUpToDate; -
trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm
r157444 r157445 1 1 /* 2 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Company 100 Inc. All rights reserved. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 25 26 26 27 #import "config.h" 27 #import " PlatformCertificateInfo.h"28 #import "CertificateInfo.h" 28 29 29 #import "ArgumentCodersCF.h" 30 #import "ArgumentDecoder.h" 31 #import "ArgumentEncoder.h" 30 namespace WebCore { 32 31 33 using namespace WebCore; 34 35 namespace WebKit { 36 37 PlatformCertificateInfo::PlatformCertificateInfo() 32 CertificateInfo::CertificateInfo() 38 33 { 39 34 } 40 35 41 PlatformCertificateInfo::PlatformCertificateInfo(const ResourceResponse& response)42 : m_certificateChain(response.certificateChain())43 {44 }45 36 46 PlatformCertificateInfo::PlatformCertificateInfo(CFArrayRef certificateChain)37 CertificateInfo::CertificateInfo(CFArrayRef certificateChain) 47 38 : m_certificateChain(certificateChain) 48 39 { 49 40 } 50 41 51 void PlatformCertificateInfo::encode(CoreIPC::ArgumentEncoder& encoder) const 42 CertificateInfo::~CertificateInfo() 52 43 { 53 if (!m_certificateChain) {54 encoder << false;55 return;56 }57 58 encoder << true;59 CoreIPC::encode(encoder, m_certificateChain.get());60 44 } 61 45 62 bool PlatformCertificateInfo::decode(CoreIPC::ArgumentDecoder& decoder, PlatformCertificateInfo& c)46 void CertificateInfo::setCertificateChain(CFArrayRef certificateChain) 63 47 { 64 bool hasCertificateChain; 65 if (!decoder.decode(hasCertificateChain)) 66 return false; 48 m_certificateChain = certificateChain; 49 } 67 50 68 if (!hasCertificateChain) 69 return true; 70 71 if (!CoreIPC::decode(decoder, c.m_certificateChain)) 72 return false; 73 74 return true; 51 CFArrayRef CertificateInfo::certificateChain() const 52 { 53 return m_certificateChain.get(); 75 54 } 76 55 77 56 #ifndef NDEBUG 78 void PlatformCertificateInfo::dump() const57 void CertificateInfo::dump() const 79 58 { 80 59 unsigned entries = m_certificateChain ? CFArrayGetCount(m_certificateChain.get()) : 0; 81 60 82 NSLog(@" PlatformCertificateInfo\n");61 NSLog(@"CertificateInfo\n"); 83 62 NSLog(@" Entries: %d\n", entries); 84 63 for (unsigned i = 0; i < entries; ++i) { … … 89 68 #endif 90 69 91 } // namespace Web Kit70 } // namespace WebCore -
trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm
r156715 r157445 182 182 { 183 183 ASSERT(!wkCopyNSURLResponseCertificateChain(nsURLResponse())); 184 m_ externalCertificateChain = certificateChain;184 m_certificateInfo.setCertificateChain(certificateChain); 185 185 } 186 186 187 187 RetainPtr<CFArrayRef> ResourceResponse::certificateChain() const 188 188 { 189 if (m_ externalCertificateChain)190 return m_externalCertificateChain;189 if (m_certificateInfo.certificateChain()) 190 return adoptCF(m_certificateInfo.certificateChain()); 191 191 192 192 return adoptCF(wkCopyNSURLResponseCertificateChain(nsURLResponse())); -
trunk/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp
r157444 r157445 1 1 /* 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Igalia S.L. 3 * Copyright (C) 2013 Company 100 Inc. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 24 25 */ 25 26 26 #i mport"config.h"27 #i mport "WKCertificateInfoMac.h"27 #include "config.h" 28 #include "CertificateInfo.h" 28 29 29 #import "WKAPICast.h" 30 #import "WebCertificateInfo.h" 30 namespace WebCore { 31 31 32 using namespace WebKit; 33 34 WKCertificateInfoRef WKCertificateInfoCreateWithCertficateChain(CFArrayRef certificateChain) 32 CertificateInfo::CertificateInfo() 33 : m_tlsErrors(static_cast<GTlsCertificateFlags>(0)) 35 34 { 36 RefPtr<WebCertificateInfo> certificateInfo = WebCertificateInfo::create(PlatformCertificateInfo(certificateChain));37 return toAPI(certificateInfo.release().leakRef());38 35 } 39 36 40 C FArrayRef WKCertificateInfoGetCertificateChain(WKCertificateInfoRef certificateInfoRef)37 CertificateInfo::~CertificateInfo() 41 38 { 42 return toImpl(certificateInfoRef)->platformCertificateInfo().certificateChain();43 39 } 40 41 } // namespace WebCore -
trunk/Source/WebCore/platform/network/soup/ResourceError.h
r149642 r157445 41 41 ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription) 42 42 : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription) 43 , m_tlsErrors(0)44 43 { 45 44 } 46 45 47 46 ResourceError() 48 : m_tlsErrors(0)49 47 { 50 48 } … … 57 55 static ResourceError authenticationError(SoupMessage*); 58 56 59 unsigned tlsErrors() const { return m_tlsErrors; }60 void setTLSErrors(unsigned tlsErrors) { m_tlsErrors = tlsErrors; }61 GTlsCertificate* certificate() const { return m_certificate.get(); }62 void setCertificate(GTlsCertificate* certificate) { m_certificate = certificate; }63 64 57 private: 65 58 void platformCopy(ResourceError&) const; 66 59 static bool platformCompare(const ResourceError& a, const ResourceError& b); 67 68 unsigned m_tlsErrors;69 GRefPtr<GTlsCertificate> m_certificate;70 60 }; 71 61 -
trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
r149642 r157445 1 1 /* 2 2 * Copyright (C) 2012 Igalia S.L. 3 * Copyright (C) 2013 Company 100 Inc. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 79 80 ResourceError resourceError(g_quark_to_string(SOUP_HTTP_ERROR), SOUP_STATUS_SSL_FAILED, 80 81 failingURI(request), unacceptableTLSCertificate()); 81 resourceError. setTLSErrors(tlsErrors);82 resourceError. setCertificate(certificate);82 resourceError.m_certificateInfo.setTLSErrors(static_cast<GTlsCertificateFlags>(tlsErrors)); 83 resourceError.m_certificateInfo.setCertificate(certificate); 83 84 return resourceError; 84 85 } … … 99 100 void ResourceError::platformCopy(ResourceError& errorCopy) const 100 101 { 101 errorCopy.m_certificate = m_certificate; 102 errorCopy.m_tlsErrors = m_tlsErrors; 102 errorCopy.setCertificateInfo(m_certificateInfo); 103 103 } 104 104 105 105 bool ResourceError::platformCompare(const ResourceError& a, const ResourceError& b) 106 106 { 107 return a. tlsErrors() == b.tlsErrors();107 return a.m_certificateInfo.tlsErrors() == b.m_certificateInfo.tlsErrors(); 108 108 } 109 109 -
trunk/Source/WebCore/platform/network/soup/ResourceResponse.h
r156550 r157445 39 39 : ResourceResponseBase() 40 40 , m_soupFlags(static_cast<SoupMessageFlags>(0)) 41 , m_tlsErrors(static_cast<GTlsCertificateFlags>(0))42 41 { 43 42 } … … 46 45 : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename) 47 46 , m_soupFlags(static_cast<SoupMessageFlags>(0)) 48 , m_tlsErrors(static_cast<GTlsCertificateFlags>(0))49 47 { 50 48 } … … 53 51 : ResourceResponseBase() 54 52 , m_soupFlags(static_cast<SoupMessageFlags>(0)) 55 , m_tlsErrors(static_cast<GTlsCertificateFlags>(0))56 53 { 57 54 updateFromSoupMessage(soupMessage); … … 68 65 void setSniffedContentType(const String& value) { m_sniffedContentType = value; } 69 66 70 GTlsCertificate* soupMessageCertificate() const { return m_certificate .get(); }71 void setSoupMessageCertificate(GTlsCertificate* certificate) { m_certificate = certificate; }67 GTlsCertificate* soupMessageCertificate() const { return m_certificateInfo.certificate(); } 68 void setSoupMessageCertificate(GTlsCertificate* certificate) { m_certificateInfo.setCertificate(certificate); } 72 69 73 GTlsCertificateFlags soupMessageTLSErrors() const { return m_ tlsErrors; }74 void setSoupMessageTLSErrors(GTlsCertificateFlags tlsErrors) { m_ tlsErrors = tlsErrors; }70 GTlsCertificateFlags soupMessageTLSErrors() const { return m_certificateInfo.tlsErrors(); } 71 void setSoupMessageTLSErrors(GTlsCertificateFlags tlsErrors) { m_certificateInfo.setTLSErrors(tlsErrors); } 75 72 76 73 bool platformResponseIsUpToDate() const { return false; } … … 81 78 SoupMessageFlags m_soupFlags; 82 79 String m_sniffedContentType; 83 GRefPtr<GTlsCertificate> m_certificate;84 GTlsCertificateFlags m_tlsErrors;85 80 86 81 void doUpdateResourceResponse() { } -
trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp
r142902 r157445 53 53 soup_message_set_flags(soupMessage, m_soupFlags); 54 54 55 g_object_set(G_OBJECT(soupMessage), "tls-certificate", m_certificate .get(), "tls-errors", m_tlsErrors, NULL);55 g_object_set(G_OBJECT(soupMessage), "tls-certificate", m_certificateInfo.certificate(), "tls-errors", m_certificateInfo.tlsErrors(), NULL); 56 56 57 57 // Body data is not in the message. … … 69 69 70 70 GTlsCertificate* certificate = 0; 71 soup_message_get_https_status(soupMessage, &certificate, &m_tlsErrors); 72 m_certificate = certificate; 71 GTlsCertificateFlags tlsErrors; 72 soup_message_get_https_status(soupMessage, &certificate, &tlsErrors); 73 m_certificateInfo.setTLSErrors(tlsErrors); 74 m_certificateInfo.setCertificate(certificate); 73 75 74 76 updateFromSoupMessageHeaders(soupMessage->response_headers); -
trunk/Source/WebKit2/ChangeLog
r157406 r157445 1 2013-10-15 Csaba Osztrogonác <ossy@webkit.org> 2 3 Move PlatformCertificateInfo to WebCore and make the ResourceResponse primitives work in terms of that platform agnostic object 4 https://bugs.webkit.org/show_bug.cgi?id=118520 5 6 Reviewed by Anders Carlsson. 7 8 Added PlatformCertificateInfo getter and setter to ResourceErrorBase 9 and ResourceResponseBase so that getting and setting certificates 10 becomes cross platform. 11 12 Changed the existing platform specific certificate getters and setters 13 of ResourceError and ResourceResponse to use the 14 PlatformCertificateInfo member. 15 16 Original patch by Kwang Yul Seo <skyul@company100.net> 17 18 The following things were fixed by Csaba Osztrogonác: 19 - trivial conflicts resolved in WebCore.exp.in, project.pbxproj, NetworkResourceLoader.cpp, 20 WebPageProxy.h, WebFrameLoaderClient.cpp and PlatformEfl.cmake. 21 - trivial fix in the new AsynchronousNetworkLoaderClient.cpp 22 - style fixed (NULL -> 0 and smaller indentation in WebCoreArgumentCodersSoup.cpp) 23 - obsolete change removed from NetworkResourceLoader.cpp 24 - unneeded typo removed from ResourceHandleSoup.cpp 25 - Fixed the if guard of including RetainPtr.h in PlatformCertificateInfo.h to make Windows build happy. 26 - add PlatformCertificateInfoCFNet.cpp with empty constructor and destructor to make Windows build happy. 27 - resolve conflict in Source/WebCore/WebCore.xcodeproj/project.pbxproj after r156488 28 - rename KURL to URL after r156550. 29 - remove obsolete Qt changes 30 - added back initializers for m_soupFlags 31 - included gio/gio.h instead of libsoup/soup.h in PlatformCertificateInfo.h 32 - removed unused class forward declarations and includes 33 34 * GNUmakefile.list.am: 35 * NetworkProcess/AsynchronousNetworkLoaderClient.cpp: 36 (WebKit::AsynchronousNetworkLoaderClient::didReceiveResponse): 37 * NetworkProcess/NetworkProcess.h: 38 * NetworkProcess/NetworkProcess.messages.in: 39 * NetworkProcess/NetworkResourceLoader.cpp: 40 * NetworkProcess/mac/NetworkProcessMac.mm: 41 * PlatformEfl.cmake: 42 * PlatformGTK.cmake: 43 * Shared/API/c/mac/WKCertificateInfoMac.mm: 44 (WKCertificateInfoCreateWithCertficateChain): 45 * Shared/Authentication/AuthenticationManager.h: 46 * Shared/Authentication/AuthenticationManager.messages.in: 47 * Shared/Authentication/mac/AuthenticationManager.mac.mm: 48 * Shared/UserMessageCoders.h: 49 (WebKit::UserMessageDecoder::baseDecode): 50 * Shared/WebCertificateInfo.h: 51 (WebKit::WebCertificateInfo::create): 52 (WebKit::WebCertificateInfo::platformCertificateInfo): 53 (WebKit::WebCertificateInfo::WebCertificateInfo): 54 * Shared/WebCoreArgumentCoders.cpp: 55 (CoreIPC::::decode): 56 (CoreIPC::::encode): 57 * Shared/WebCoreArgumentCoders.h: 58 * Shared/mac/WebCoreArgumentCodersMac.mm: 59 (CoreIPC::::encodePlatformData): 60 (CoreIPC::::decodePlatformData): 61 * Shared/soup/PlatformCertificateInfo.cpp: Removed. 62 * Shared/soup/WebCoreArgumentCodersSoup.cpp: 63 (CoreIPC::::encodePlatformData): 64 (CoreIPC::::decodePlatformData): 65 * Target.pri: 66 * UIProcess/API/gtk/WebKitWebView.cpp: 67 (webkit_web_view_get_tls_info): 68 * UIProcess/Authentication/AuthenticationChallengeProxy.cpp: 69 (WebKit::AuthenticationChallengeProxy::useCredential): 70 * UIProcess/WebFrameProxy.cpp: 71 (WebKit::WebFrameProxy::didCommitLoad): 72 * UIProcess/WebFrameProxy.h: 73 * UIProcess/WebPageProxy.h: 74 * UIProcess/WebPageProxy.messages.in: 75 * WebKit2.xcodeproj/project.pbxproj: 76 * WebProcess/Network/WebResourceLoader.cpp: 77 (WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo): 78 * WebProcess/Network/WebResourceLoader.h: 79 * WebProcess/Network/WebResourceLoader.messages.in: 80 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 81 (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad): 82 1 83 2013-10-14 Csaba Osztrogonác <ossy@webkit.org> 2 84 -
trunk/Source/WebKit2/GNUmakefile.list.am
r157320 r157445 482 482 Source/WebKit2/Shared/StatisticsData.cpp \ 483 483 Source/WebKit2/Shared/StatisticsData.h \ 484 Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp \485 Source/WebKit2/Shared/soup/PlatformCertificateInfo.h \486 484 Source/WebKit2/Shared/soup/SoupCookiePersistentStorageType.h \ 487 485 Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \ … … 1354 1352 Source/WebKit2/Shared/gtk/WebEventFactory.cpp \ 1355 1353 Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp \ 1356 Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp \1357 Source/WebKit2/Shared/soup/PlatformCertificateInfo.h \1358 1354 Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \ 1359 1355 Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \ -
trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp
r154895 r157445 29 29 #include "DataReference.h" 30 30 #include "NetworkResourceLoader.h" 31 #include "PlatformCertificateInfo.h"32 31 #include "WebCoreArgumentCoders.h" 33 32 #include "WebResourceLoaderMessages.h" 33 #include <WebCore/CertificateInfo.h> 34 34 #include <WebCore/ResourceError.h> 35 #include <WebCore/ResourceResponse.h> 35 36 #include <WebCore/SharedBuffer.h> 36 37 #include <wtf/CurrentTime.h> … … 64 65 void AsynchronousNetworkLoaderClient::didReceiveResponse(NetworkResourceLoader* loader, const ResourceResponse& response) 65 66 { 66 loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(response, PlatformCertificateInfo(response), loader->isLoadingMainResource()));67 loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(response, response.certificateInfo(), loader->isLoadingMainResource())); 67 68 } 68 69 -
trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h
r156354 r157445 37 37 38 38 namespace WebCore { 39 class RunLoop; 39 class CertificateInfo; 40 class RunLoop; 40 41 } 41 42 … … 45 46 class NetworkConnectionToWebProcess; 46 47 class NetworkProcessSupplement; 47 class PlatformCertificateInfo;48 48 struct NetworkProcessCreationParameters; 49 49 … … 109 109 void cancelDownload(uint64_t downloadID); 110 110 void setCacheModel(uint32_t); 111 void allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo&, const String& host);111 void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host); 112 112 void getNetworkProcessStatistics(uint64_t callbackID); 113 113 void clearCacheForAllOrigins(uint32_t cachesToClear); -
trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in
r147251 r157445 40 40 #endif 41 41 42 AllowSpecificHTTPSCertificateForHost(Web Kit::PlatformCertificateInfo certificate, WTF::String host)42 AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, WTF::String host) 43 43 44 44 GetNetworkProcessStatistics(uint64_t callbackID) -
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
r157251 r157445 38 38 #include "NetworkProcessConnectionMessages.h" 39 39 #include "NetworkResourceLoadParameters.h" 40 #include "PlatformCertificateInfo.h"41 40 #include "RemoteNetworkingContext.h" 42 41 #include "ShareableResource.h" -
trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm
r156550 r157445 31 31 #import "NetworkProcessCreationParameters.h" 32 32 #import "NetworkResourceLoader.h" 33 #import "PlatformCertificateInfo.h"34 33 #import "ResourceCachesToClear.h" 35 34 #import "SandboxExtension.h" … … 38 37 #import <WebCore/FileSystem.h> 39 38 #import <WebCore/LocalizedStrings.h> 39 #import <WebCore/CertificateInfo.h> 40 40 #import <WebKitSystemInterface.h> 41 41 #import <mach/host_info.h> … … 186 186 } 187 187 188 void NetworkProcess::allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo& certificateInfo, const String& host)188 void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host) 189 189 { 190 190 [NSURLRequest setAllowsSpecificHTTPSCertificate:(NSArray *)certificateInfo.certificateChain() forHost:(NSString *)host]; -
trunk/Source/WebKit2/PlatformEfl.cmake
r157289 r157445 47 47 Shared/linux/SeccompFilters/SyscallPolicy.cpp 48 48 49 Shared/soup/PlatformCertificateInfo.cpp50 49 Shared/soup/WebCoreArgumentCodersSoup.cpp 51 50 -
trunk/Source/WebKit2/PlatformGTK.cmake
r156265 r157445 62 62 Shared/linux/SeccompFilters/SyscallPolicy.cpp 63 63 64 Shared/soup/PlatformCertificateInfo.cpp65 64 Shared/soup/WebCoreArgumentCodersSoup.cpp 66 65 -
trunk/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
r95901 r157445 30 30 #import "WebCertificateInfo.h" 31 31 32 using namespace WebCore; 32 33 using namespace WebKit; 33 34 34 35 WKCertificateInfoRef WKCertificateInfoCreateWithCertficateChain(CFArrayRef certificateChain) 35 36 { 36 RefPtr<WebCertificateInfo> certificateInfo = WebCertificateInfo::create( PlatformCertificateInfo(certificateChain));37 RefPtr<WebCertificateInfo> certificateInfo = WebCertificateInfo::create(CertificateInfo(certificateChain)); 37 38 return toAPI(certificateInfo.release().leakRef()); 38 39 } … … 40 41 CFArrayRef WKCertificateInfoGetCertificateChain(WKCertificateInfoRef certificateInfoRef) 41 42 { 42 return toImpl(certificateInfoRef)-> platformCertificateInfo().certificateChain();43 return toImpl(certificateInfoRef)->certificateInfo().certificateChain(); 43 44 } -
trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp
r146929 r157445 99 99 // Currently, only Mac knows how to respond to authentication challenges with certificate info. 100 100 #if !USE(SECURITY_FRAMEWORK) 101 bool AuthenticationManager::tryUse PlatformCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const PlatformCertificateInfo&)101 bool AuthenticationManager::tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const CertificateInfo&) 102 102 { 103 103 return false; … … 105 105 #endif 106 106 107 void AuthenticationManager::useCredentialForChallenge(uint64_t challengeID, const Credential& credential, const PlatformCertificateInfo& certificateInfo)107 void AuthenticationManager::useCredentialForChallenge(uint64_t challengeID, const Credential& credential, const CertificateInfo& certificateInfo) 108 108 { 109 109 ASSERT(isMainThread()); … … 112 112 ASSERT(!challenge.isNull()); 113 113 114 if (tryUse PlatformCertificateInfoForChallenge(challenge, certificateInfo))114 if (tryUseCertificateInfoForChallenge(challenge, certificateInfo)) 115 115 return; 116 116 -
trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h
r142651 r157445 37 37 class AuthenticationChallenge; 38 38 class Credential; 39 class CertificateInfo; 39 40 } 40 41 … … 43 44 class ChildProcess; 44 45 class Download; 45 class PlatformCertificateInfo;46 46 class WebFrame; 47 47 … … 60 60 void didReceiveAuthenticationChallenge(Download*, const WebCore::AuthenticationChallenge&); 61 61 62 void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const PlatformCertificateInfo&);62 void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const WebCore::CertificateInfo&); 63 63 void continueWithoutCredentialForChallenge(uint64_t challengeID); 64 64 void cancelChallenge(uint64_t challengeID); … … 70 70 virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE; 71 71 72 bool tryUse PlatformCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const PlatformCertificateInfo&);72 bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&); 73 73 74 74 uint64_t establishIdentifierForChallenge(const WebCore::AuthenticationChallenge&); -
trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in
r141710 r157445 22 22 23 23 messages -> AuthenticationManager { 24 void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, Web Kit::PlatformCertificateInfo certificate);24 void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, WebCore::CertificateInfo certificate); 25 25 void ContinueWithoutCredentialForChallenge(uint64_t challengeID); 26 26 void CancelChallenge(uint64_t challengeID); -
trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm
r140874 r157445 29 29 #if USE(SECURITY_FRAMEWORK) 30 30 31 #include "PlatformCertificateInfo.h"32 31 #include <Security/SecIdentity.h> 33 32 #include <WebCore/AuthenticationChallenge.h> 33 #include <WebCore/CertificateInfo.h> 34 34 35 35 using namespace WebCore; … … 37 37 namespace WebKit { 38 38 39 bool AuthenticationManager::tryUse PlatformCertificateInfoForChallenge(const AuthenticationChallenge& challenge, const PlatformCertificateInfo& certificateInfo)39 bool AuthenticationManager::tryUseCertificateInfoForChallenge(const AuthenticationChallenge& challenge, const CertificateInfo& certificateInfo) 40 40 { 41 41 CFArrayRef chain = certificateInfo.certificateChain(); -
trunk/Source/WebKit2/Shared/UserMessageCoders.h
r149848 r157445 216 216 case APIObject::TypeCertificateInfo: { 217 217 WebCertificateInfo* certificateInfo = static_cast<WebCertificateInfo*>(m_root); 218 encoder << certificateInfo-> platformCertificateInfo();218 encoder << certificateInfo->certificateInfo(); 219 219 return true; 220 220 } … … 505 505 } 506 506 case APIObject::TypeCertificateInfo: { 507 PlatformCertificateInfo platformCertificateInfo;508 if (!decoder.decode( platformCertificateInfo))509 return false; 510 coder.m_root = WebCertificateInfo::create( platformCertificateInfo);507 WebCore::CertificateInfo certificateInfo; 508 if (!decoder.decode(certificateInfo)) 509 return false; 510 coder.m_root = WebCertificateInfo::create(certificateInfo); 511 511 break; 512 512 } -
trunk/Source/WebKit2/Shared/WebCertificateInfo.h
r147403 r157445 28 28 29 29 #include "APIObject.h" 30 #include "PlatformCertificateInfo.h"30 #include <WebCore/CertificateInfo.h> 31 31 #include <wtf/PassRefPtr.h> 32 32 … … 35 35 class WebCertificateInfo : public TypedAPIObject<APIObject::TypeCertificateInfo> { 36 36 public: 37 static PassRefPtr<WebCertificateInfo> create(const PlatformCertificateInfo& info)37 static PassRefPtr<WebCertificateInfo> create(const WebCore::CertificateInfo& info) 38 38 { 39 39 return adoptRef(new WebCertificateInfo(info)); 40 40 } 41 41 42 const PlatformCertificateInfo& platformCertificateInfo() const { return m_platformCertificateInfo; }42 const WebCore::CertificateInfo& certificateInfo() const { return m_certificateInfo; } 43 43 44 44 private: 45 explicit WebCertificateInfo(const PlatformCertificateInfo& info)46 : m_ platformCertificateInfo(info)45 explicit WebCertificateInfo(const WebCore::CertificateInfo& info) 46 : m_certificateInfo(info) 47 47 { 48 48 } 49 49 50 PlatformCertificateInfo m_platformCertificateInfo;50 WebCore::CertificateInfo m_certificateInfo; 51 51 }; 52 52 -
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
r156588 r157445 29 29 #include "ShareableBitmap.h" 30 30 #include <WebCore/AuthenticationChallenge.h> 31 #include <WebCore/CertificateInfo.h> 31 32 #include <WebCore/Cookie.h> 32 33 #include <WebCore/Credential.h> … … 40 41 #include <WebCore/GraphicsLayer.h> 41 42 #include <WebCore/Image.h> 42 #include <WebCore/URL.h>43 43 #include <WebCore/PluginData.h> 44 44 #include <WebCore/ProtectionSpace.h> … … 47 47 #include <WebCore/ResourceResponse.h> 48 48 #include <WebCore/TextCheckerClient.h> 49 #include <WebCore/URL.h> 49 50 #include <WebCore/UserScript.h> 50 51 #include <WebCore/UserStyleSheet.h> … … 545 546 resourceResponse = response; 546 547 548 return true; 549 } 550 551 void ArgumentCoder<CertificateInfo>::encode(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo) 552 { 553 encodePlatformData(encoder, certificateInfo); 554 } 555 556 bool ArgumentCoder<CertificateInfo>::decode(ArgumentDecoder& decoder, CertificateInfo& certificateInfo) 557 { 558 CertificateInfo certificate; 559 560 if (!decodePlatformData(decoder, certificate)) 561 return false; 562 563 certificateInfo = certificate; 547 564 return true; 548 565 } -
trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h
r156588 r157445 46 46 class URL; 47 47 class Notification; 48 class CertificateInfo; 48 49 class ProtectionSpace; 49 50 class ResourceError; … … 171 172 }; 172 173 174 template<> struct ArgumentCoder<WebCore::CertificateInfo> { 175 static void encode(ArgumentEncoder&, const WebCore::CertificateInfo&); 176 static bool decode(ArgumentDecoder&, WebCore::CertificateInfo&); 177 static void encodePlatformData(ArgumentEncoder&, const WebCore::CertificateInfo&); 178 static bool decodePlatformData(ArgumentDecoder&, WebCore::CertificateInfo&); 179 }; 180 173 181 template<> struct ArgumentCoder<WebCore::ResourceError> { 174 182 #if PLATFORM(MAC) -
trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
r149491 r157445 1 1 /* 2 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Company 100 Inc. All rights reserved. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 28 29 29 30 #import "ArgumentCodersCF.h" 30 #import "PlatformCertificateInfo.h"31 31 #import "WebKitSystemInterface.h" 32 32 #import <WebCore/KeyboardEvent.h> 33 #import <WebCore/CertificateInfo.h> 33 34 #import <WebCore/ResourceError.h> 34 35 #import <WebCore/ResourceRequest.h> 36 #import <WebCore/ResourceResponse.h> 35 37 36 38 using namespace WebCore; 37 using namespace WebKit;38 39 39 40 namespace CoreIPC { … … 133 134 } 134 135 136 137 void ArgumentCoder<CertificateInfo>::encodePlatformData(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo) 138 { 139 CFArrayRef certificateChain = certificateInfo.certificateChain(); 140 if (!certificateChain) { 141 encoder << false; 142 return; 143 } 144 145 encoder << true; 146 CoreIPC::encode(encoder, certificateChain); 147 } 148 149 bool ArgumentCoder<CertificateInfo>::decodePlatformData(ArgumentDecoder& decoder, CertificateInfo& certificateInfo) 150 { 151 bool hasCertificateChain; 152 if (!decoder.decode(hasCertificateChain)) 153 return false; 154 155 if (!hasCertificateChain) 156 return true; 157 158 RetainPtr<CFArrayRef> certificateChain; 159 if (!CoreIPC::decode(decoder, certificateChain)) 160 return false; 161 162 certificateInfo.setCertificateChain(certificateChain.get()); 163 164 return true; 165 } 166 135 167 static NSString* nsString(const String& string) 136 168 { … … 169 201 id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"]; 170 202 ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]); 171 encoder << PlatformCertificateInfo((CFArrayRef)peerCertificateChain);203 encoder << CertificateInfo((CFArrayRef)peerCertificateChain); 172 204 } 173 205 … … 195 227 return false; 196 228 197 PlatformCertificateInfo certificate;229 CertificateInfo certificate; 198 230 if (!decoder.decode(certificate)) 199 231 return false; -
trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
r141639 r157445 2 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 3 * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved. 4 * Portions Copyright (c) 2013 Company 100 Inc. All rights reserved. 4 5 * 5 6 * Redistribution and use in source and binary forms, with or without … … 26 27 27 28 #include "config.h" 29 #include "DataReference.h" 28 30 #include "WebCoreArgumentCoders.h" 29 31 30 #include "PlatformCertificateInfo.h"32 #include <WebCore/CertificateInfo.h> 31 33 #include <WebCore/ResourceError.h> 32 34 #include <WebCore/ResourceRequest.h> … … 35 37 36 38 using namespace WebCore; 37 using namespace WebKit;38 39 39 40 namespace CoreIPC { … … 69 70 70 71 72 void ArgumentCoder<CertificateInfo>::encodePlatformData(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo) 73 { 74 if (!certificateInfo.certificate()) { 75 encoder << false; 76 return; 77 } 78 79 GByteArray* certificateData = 0; 80 g_object_get(G_OBJECT(certificateInfo.certificate()), "certificate", &certificateData, NULL); 81 if (!certificateData) { 82 encoder << false; 83 return; 84 } 85 86 encoder << true; 87 GRefPtr<GByteArray> certificate = adoptGRef(certificateData); 88 encoder.encodeVariableLengthByteArray(CoreIPC::DataReference(certificate->data, certificate->len)); 89 encoder << static_cast<uint32_t>(certificateInfo.tlsErrors()); 90 } 91 92 bool ArgumentCoder<CertificateInfo>::decodePlatformData(ArgumentDecoder& decoder, CertificateInfo& certificateInfo) 93 { 94 bool hasCertificate; 95 if (!decoder.decode(hasCertificate)) 96 return false; 97 98 if (!hasCertificate) 99 return true; 100 101 CoreIPC::DataReference certificateDataReference; 102 if (!decoder.decodeVariableLengthByteArray(certificateDataReference)) 103 return false; 104 105 GByteArray* certificateData = g_byte_array_sized_new(certificateDataReference.size()); 106 certificateData = g_byte_array_append(certificateData, certificateDataReference.data(), certificateDataReference.size()); 107 GRefPtr<GByteArray> certificateBytes = adoptGRef(certificateData); 108 109 GTlsBackend* backend = g_tls_backend_get_default(); 110 GRefPtr<GTlsCertificate> certificate = adoptGRef(G_TLS_CERTIFICATE(g_initable_new(g_tls_backend_get_certificate_type(backend), 0, 0, 111 "certificate", certificateBytes.get(), 0))); 112 certificateInfo.setCertificate(certificate.get()); 113 114 uint32_t tlsErrors; 115 if (!decoder.decode(tlsErrors)) 116 return false; 117 certificateInfo.setTLSErrors(static_cast<GTlsCertificateFlags>(tlsErrors)); 118 119 return true; 120 } 121 122 71 123 void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError) 72 124 { 73 encoder << PlatformCertificateInfo(resourceError);125 encoder << resourceError.certificateInfo(); 74 126 } 75 127 76 128 bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError) 77 129 { 78 PlatformCertificateInfo certificateInfo;130 CertificateInfo certificateInfo; 79 131 if (!decoder.decode(certificateInfo)) 80 132 return false; 81 133 82 resourceError.setCertificate(certificateInfo.certificate()); 83 resourceError.setTLSErrors(certificateInfo.tlsErrors()); 134 resourceError.setCertificateInfo(certificateInfo); 84 135 return true; 85 136 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
r155347 r157445 23 23 24 24 #include "ImageOptions.h" 25 #include "PlatformCertificateInfo.h"26 25 #include "WebCertificateInfo.h" 27 26 #include "WebContextMenuItem.h" … … 60 59 #include "WebKitWindowPropertiesPrivate.h" 61 60 #include <JavaScriptCore/APICast.h> 61 #include <WebCore/CertificateInfo.h> 62 62 #include <WebCore/DragIcon.h> 63 63 #include <WebCore/GOwnPtrGtk.h> … … 2988 2988 return FALSE; 2989 2989 2990 const PlatformCertificateInfo& certificateInfo = mainFrame->certificateInfo()->platformCertificateInfo();2990 const WebCore::CertificateInfo& certificateInfo = mainFrame->certificateInfo()->certificateInfo(); 2991 2991 if (certificate) 2992 2992 *certificate = certificateInfo.certificate(); -
trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp
r137862 r157445 67 67 else { 68 68 WebCertificateInfo* certificateInfo = credential->certificateInfo(); 69 PlatformCertificateInfo platformInfo = certificateInfo ? certificateInfo->platformCertificateInfo() : PlatformCertificateInfo();69 WebCore::CertificateInfo platformInfo = certificateInfo ? certificateInfo->certificateInfo() : WebCore::CertificateInfo(); 70 70 m_connection->send(Messages::AuthenticationManager::UseCredentialForChallenge(m_challengeID, credential->core(), platformInfo), 0); 71 71 } -
trunk/Source/WebKit2/UIProcess/WebContext.cpp
r156847 r157445 1068 1068 #if ENABLE(NETWORK_PROCESS) 1069 1069 if (m_usesNetworkProcess && m_networkProcess) { 1070 m_networkProcess->send(Messages::NetworkProcess::AllowSpecificHTTPSCertificateForHost(certificate-> platformCertificateInfo(), host), 0);1070 m_networkProcess->send(Messages::NetworkProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0); 1071 1071 return; 1072 1072 } -
trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp
r150689 r157445 139 139 } 140 140 141 void WebFrameProxy::didCommitLoad(const String& contentType, const PlatformCertificateInfo& certificateInfo)141 void WebFrameProxy::didCommitLoad(const String& contentType, const WebCore::CertificateInfo& certificateInfo) 142 142 { 143 143 ASSERT(m_loadState == LoadStateProvisional); -
trunk/Source/WebKit2/UIProcess/WebFrameProxy.h
r147403 r157445 41 41 } 42 42 43 namespace WebCore { 44 class CertificateInfo; 45 } 46 43 47 namespace WebKit { 44 48 45 49 class ImmutableArray; 46 class PlatformCertificateInfo; 50 47 51 class WebCertificateInfo; 48 52 class WebFormSubmissionListenerProxy; … … 107 111 void didReceiveServerRedirectForProvisionalLoad(const String& url); 108 112 void didFailProvisionalLoad(); 109 void didCommitLoad(const String& contentType, const PlatformCertificateInfo&);113 void didCommitLoad(const String& contentType, const WebCore::CertificateInfo&); 110 114 void didFinishLoad(); 111 115 void didFailLoad(); -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r157319 r157445 2191 2191 } 2192 2192 2193 void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const PlatformCertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)2193 void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const CertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder) 2194 2194 { 2195 2195 RefPtr<APIObject> userData; -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r157319 r157445 99 99 class GraphicsLayer; 100 100 class IntSize; 101 class CertificateInfo; 101 102 class ProtectionSpace; 102 103 class SharedBuffer; … … 126 127 class NativeWebWheelEvent; 127 128 class PageClient; 128 class PlatformCertificateInfo;129 129 class StringPairVector; 130 130 class WebBackForwardList; … … 785 785 void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String&, CoreIPC::MessageDecoder&); 786 786 void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&); 787 void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const PlatformCertificateInfo&, CoreIPC::MessageDecoder&);787 void didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t frameLoadType, const WebCore::CertificateInfo&, CoreIPC::MessageDecoder&); 788 788 void didFinishDocumentLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&); 789 789 void didFinishLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&); -
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
r156847 r157445 112 112 113 113 # Frame load messages 114 DidCommitLoadForFrame(uint64_t frameID, WTF::String mimeType, uint32_t loadType, Web Kit::PlatformCertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic114 DidCommitLoadForFrame(uint64_t frameID, WTF::String mimeType, uint32_t loadType, WebCore::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic 115 115 DidFailLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic 116 116 DidFailProvisionalLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r157320 r157445 1033 1033 BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */; }; 1034 1034 BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */; }; 1035 BCF505E71243047B005955AE /* PlatformCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF505E51243047B005955AE /* PlatformCertificateInfo.h */; };1036 BCF505E81243047B005955AE /* PlatformCertificateInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */; };1037 1035 BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; }; 1038 1036 BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */; }; … … 2464 2462 BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessSupplement.h; path = Network/NetworkProcessSupplement.h; sourceTree = "<group>"; }; 2465 2463 BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextSupplement.h; sourceTree = "<group>"; }; 2466 BCF505E51243047B005955AE /* PlatformCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCertificateInfo.h; sourceTree = "<group>"; };2467 BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCertificateInfo.mm; sourceTree = "<group>"; };2468 2464 BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 2469 2465 BCF50726124329AA005955AE /* WebCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCertificateInfo.h; sourceTree = "<group>"; }; … … 4160 4156 E19582D2153CBFD700B60875 /* PDFKitImports.h */, 4161 4157 E19582D4153CC05300B60875 /* PDFKitImports.mm */, 4162 BCF505E51243047B005955AE /* PlatformCertificateInfo.h */,4163 BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */,4164 4158 E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */, 4165 4159 1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */, … … 5120 5114 E19582D3153CBFD700B60875 /* PDFKitImports.h in Headers */, 5121 5115 51FCB18917BBFE0300394CD8 /* SynchronousNetworkLoaderClient.h in Headers */, 5122 BCF505E71243047B005955AE /* PlatformCertificateInfo.h in Headers */,5123 5116 BCC43ABB127B95DC00317F16 /* PlatformPopupMenuData.h in Headers */, 5124 5117 BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */, … … 6281 6274 2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */, 6282 6275 2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */, 6283 BCF505E81243047B005955AE /* PlatformCertificateInfo.mm in Sources */,6284 6276 BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */, 6285 6277 1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */, -
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
r157225 r157445 33 33 #include "NetworkProcessConnection.h" 34 34 #include "NetworkResourceLoaderMessages.h" 35 #include "PlatformCertificateInfo.h"36 35 #include "WebCoreArgumentCoders.h" 37 36 #include "WebErrors.h" 38 37 #include "WebProcess.h" 38 #include <WebCore/CertificateInfo.h> 39 39 #include <WebCore/DocumentLoader.h> 40 40 #include <WebCore/ResourceBuffer.h> … … 100 100 } 101 101 102 void WebResourceLoader::didReceiveResponseWithCertificateInfo(const ResourceResponse& response, const PlatformCertificateInfo& certificateInfo, bool needsContinueDidReceiveResponseMessage)102 void WebResourceLoader::didReceiveResponseWithCertificateInfo(const ResourceResponse& response, const CertificateInfo& certificateInfo, bool needsContinueDidReceiveResponseMessage) 103 103 { 104 104 LOG(Network, "(WebProcess) WebResourceLoader::didReceiveResponseWithCertificateInfo for '%s'. Status %d.", m_coreLoader->url().string().utf8().data(), response.httpStatusCode()); … … 107 107 108 108 ResourceResponse responseCopy(response); 109 responseCopy.setCertificate Chain(certificateInfo.certificateChain());109 responseCopy.setCertificateInfo(certificateInfo); 110 110 m_coreLoader->didReceiveResponse(responseCopy); 111 111 -
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
r157225 r157445 41 41 42 42 namespace WebCore { 43 class CertificateInfo; 43 44 class ProtectionSpace; 44 45 class ResourceBuffer; … … 51 52 namespace WebKit { 52 53 53 class PlatformCertificateInfo;54 54 typedef uint64_t ResourceLoadIdentifier; 55 55 … … 77 77 void willSendRequest(const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse); 78 78 void didSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent); 79 void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const PlatformCertificateInfo&, bool needsContinueDidReceiveResponseMessage);79 void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const WebCore::CertificateInfo&, bool needsContinueDidReceiveResponseMessage); 80 80 void didReceiveData(const CoreIPC::DataReference&, int64_t encodedDataLength); 81 81 void didFinishResourceLoad(double finishTime); -
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
r157225 r157445 30 30 WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse) 31 31 DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent) 32 DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, Web Kit::PlatformCertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)32 DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebCore::CertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage) 33 33 DidReceiveData(CoreIPC::DataReference data, int64_t encodedDataLength) 34 34 DidFinishResourceLoad(double finishTime) -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r156946 r157445 34 34 #include "InjectedBundleNavigationAction.h" 35 35 #include "InjectedBundleUserMessageCoders.h" 36 #include "PlatformCertificateInfo.h"37 36 #include "PluginView.h" 38 37 #include "WebBackForwardListProxy.h" … … 52 51 #include <JavaScriptCore/APICast.h> 53 52 #include <JavaScriptCore/JSObject.h> 53 #include <WebCore/CertificateInfo.h> 54 54 #include <WebCore/Chrome.h> 55 55 #include <WebCore/DOMWrapperWorld.h> … … 442 442 // Notify the UIProcess. 443 443 444 webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), response.mimeType(), m_frame->coreFrame()->loader().loadType(), PlatformCertificateInfo(response), InjectedBundleUserMessageEncoder(userData.get())));444 webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), response.mimeType(), m_frame->coreFrame()->loader().loadType(), response.certificateInfo(), InjectedBundleUserMessageEncoder(userData.get()))); 445 445 446 446 webPage->didCommitLoad(m_frame);
Note: See TracChangeset
for help on using the changeset viewer.