Changeset 157445 in webkit


Ignore:
Timestamp:
Oct 15, 2013 3:24:29 AM (11 years ago)
Author:
Csaba Osztrogonác
Message:

Move PlatformCertificateInfo to WebCore and make the ResourceResponse primitives work in terms of that platform agnostic object
​https://bugs.webkit.org/show_bug.cgi?id=118520

Reviewed by Anders Carlsson.

Added PlatformCertificateInfo getter and setter to ResourceErrorBase
and ResourceResponseBase so that getting and setting certificates
becomes cross platform.

Changed the existing platform specific certificate getters and setters
of ResourceError and ResourceResponse to use the
PlatformCertificateInfo member.

Original patch by Kwang Yul Seo <​skyul@company100.net>

Source/WebCore:

The following things were fixed by Csaba Osztrogonác:

  • trivial conflicts resolved in WebCore.exp.in, project.pbxproj, NetworkResourceLoader.cpp, WebPageProxy.h, WebFrameLoaderClient.cpp and PlatformEfl.cmake.
  • trivial fix in the new AsynchronousNetworkLoaderClient.cpp
  • style fixed (NULL -> 0 and smaller indentation in WebCoreArgumentCodersSoup.cpp)
  • obsolete change removed from NetworkResourceLoader.cpp
  • unneeded typo removed from ResourceHandleSoup.cpp
  • Fixed the if guard of including RetainPtr.h in PlatformCertificateInfo.h to make Windows build happy.
  • add PlatformCertificateInfoCFNet.cpp with empty constructor and destructor to make Windows build happy.
  • resolved conflict in Source/WebCore/WebCore.xcodeproj/project.pbxproj after r156488
  • renamed KURL to URL after r156550.
  • removed obsolete Qt changes
  • added back initializers for m_soupFlags
  • included gio/gio.h instead of libsoup/soup.h in PlatformCertificateInfo.h
  • removed unused class forward declarations and includes
  • GNUmakefile.list.am:
  • PlatformEfl.cmake:
  • Target.pri:
  • WebCore.exp.in:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/network/PlatformCertificateInfo.h: Renamed from Source/WebKit2/Shared/soup/PlatformCertificateInfo.h.

(WebCore::PlatformCertificateInfo::certificate):
(WebCore::PlatformCertificateInfo::setCertificate):
(WebCore::PlatformCertificateInfo::tlsErrors):
(WebCore::PlatformCertificateInfo::setTLSErrors):

  • platform/network/ResourceErrorBase.h:

(WebCore::ResourceErrorBase::platformCertificateInfo):
(WebCore::ResourceErrorBase::setPlatformCertificateInfo):

  • platform/network/ResourceResponseBase.h:

(WebCore::ResourceResponseBase::platformCertificateInfo):
(WebCore::ResourceResponseBase::setPlatformCertificateInfo):

  • platform/network/cf/ResourceResponse.h:
  • platform/network/mac/PlatformCertificateInfoMac.mm: Renamed from Source/WebKit2/Shared/mac/PlatformCertificateInfo.mm.

(WebCore::PlatformCertificateInfo::PlatformCertificateInfo):
(WebCore::PlatformCertificateInfo::~PlatformCertificateInfo):
(WebCore::PlatformCertificateInfo::setCertificateChain):
(WebCore::PlatformCertificateInfo::certificateChain):
(WebCore::PlatformCertificateInfo::dump):

  • platform/network/mac/ResourceResponseMac.mm:

(WebCore::ResourceResponse::setCertificateChain):
(WebCore::ResourceResponse::certificateChain):

  • platform/network/soup/PlatformCertificateInfoSoup.cpp:

(WebCore::PlatformCertificateInfo::PlatformCertificateInfo):
(WebCore::PlatformCertificateInfo::~PlatformCertificateInfo):

  • 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::platformCopy):

  • 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:

The following things were fixed by Csaba Osztrogonác:

  • trivial conflicts resolved in WebCore.exp.in, project.pbxproj, NetworkResourceLoader.cpp, WebPageProxy.h, WebFrameLoaderClient.cpp and PlatformEfl.cmake.
  • trivial fix in the new AsynchronousNetworkLoaderClient.cpp
  • style fixed (NULL -> 0 and smaller indentation in WebCoreArgumentCodersSoup.cpp)
  • obsolete change removed from NetworkResourceLoader.cpp
  • unneeded typo removed from ResourceHandleSoup.cpp
  • Fixed the if guard of including RetainPtr.h in PlatformCertificateInfo.h to make Windows build happy.
  • add PlatformCertificateInfoCFNet.cpp with empty constructor and destructor to make Windows build happy.
  • resolve conflict in Source/WebCore/WebCore.xcodeproj/project.pbxproj after r156488
  • rename KURL to URL after r156550.
  • remove obsolete Qt changes
  • added back initializers for m_soupFlags
  • included gio/gio.h instead of libsoup/soup.h in PlatformCertificateInfo.h
  • removed unused class forward declarations and includes
  • GNUmakefile.list.am:
  • NetworkProcess/AsynchronousNetworkLoaderClient.cpp:

(WebKit::AsynchronousNetworkLoaderClient::didReceiveResponse):

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/NetworkProcess.messages.in:
  • NetworkProcess/NetworkResourceLoader.cpp:
  • NetworkProcess/mac/NetworkProcessMac.mm:
  • PlatformEfl.cmake:
  • PlatformGTK.cmake:
  • Shared/API/c/mac/WKCertificateInfoMac.mm:

(WKCertificateInfoCreateWithCertficateChain):

  • Shared/Authentication/AuthenticationManager.h:
  • Shared/Authentication/AuthenticationManager.messages.in:
  • Shared/Authentication/mac/AuthenticationManager.mac.mm:
  • Shared/UserMessageCoders.h:

(WebKit::UserMessageDecoder::baseDecode):

  • Shared/WebCertificateInfo.h:

(WebKit::WebCertificateInfo::create):
(WebKit::WebCertificateInfo::platformCertificateInfo):
(WebKit::WebCertificateInfo::WebCertificateInfo):

  • Shared/WebCoreArgumentCoders.cpp:

(CoreIPC::::decode):
(CoreIPC::::encode):

  • Shared/WebCoreArgumentCoders.h:
  • Shared/mac/WebCoreArgumentCodersMac.mm:

(CoreIPC::::encodePlatformData):
(CoreIPC::::decodePlatformData):

  • Shared/soup/PlatformCertificateInfo.cpp: Removed.
  • Shared/soup/WebCoreArgumentCodersSoup.cpp:

(CoreIPC::::encodePlatformData):
(CoreIPC::::decodePlatformData):

  • Target.pri:
  • UIProcess/API/gtk/WebKitWebView.cpp:

(webkit_web_view_get_tls_info):

  • UIProcess/Authentication/AuthenticationChallengeProxy.cpp:

(WebKit::AuthenticationChallengeProxy::useCredential):

  • UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::didCommitLoad):

  • UIProcess/WebFrameProxy.h:
  • 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):

Location:
trunk/Source
Files:
1 deleted
48 edited
1 copied
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r157444 r157445  
     12013-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
    1832013-10-15  Ryosuke Niwa  <rniwa@webkit.org>
    284

  • trunk/Source/WebCore/GNUmakefile.list.am

    r157430 r157445  
    54125412        Source/WebCore/platform/network/BlobResourceHandle.h \
    54135413        Source/WebCore/platform/network/BlobStorageData.h \
     5414        Source/WebCore/platform/network/CertificateInfo.h \
    54145415        Source/WebCore/platform/network/CookieStorage.h \
    54155416        Source/WebCore/platform/network/FormDataBuilder.cpp \
    … …  
    54465447        Source/WebCore/platform/network/soup/AuthenticationChallenge.h \
    54475448        Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp \
     5449        Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp \
    54485450        Source/WebCore/platform/network/soup/CookieJarSoup.cpp \
    54495451        Source/WebCore/platform/network/soup/CookieJarSoup.h \

  • trunk/Source/WebCore/PlatformEfl.cmake

    r157418 r157445  
    151151
    152152    platform/network/soup/AuthenticationChallengeSoup.cpp
     153    platform/network/soup/CertificateInfoSoup.cpp
    153154    platform/network/soup/CookieJarSoup.cpp
    154155    platform/network/soup/CookieStorageSoup.cpp

  • trunk/Source/WebCore/WebCore.exp.in

    r157444 r157445  
    763763__ZN7WebCore23MutableStylePropertySet25ensureCSSStyleDeclarationEv
    764764__ZN7WebCore23MutableStylePropertySetD1Ev
     765__ZN7WebCore15CertificateInfo19setCertificateChainEPK9__CFArray
     766__ZN7WebCore15CertificateInfoC1EPK9__CFArray
     767__ZN7WebCore15CertificateInfoC1Ev
     768__ZN7WebCore15CertificateInfoD1Ev
     769__ZNK7WebCore15CertificateInfo16certificateChainEv
    765770__ZN7WebCore23SynchronousLoaderClient24platformBadResponseErrorEv
    766771__ZN7WebCore23dataForURLComponentTypeEP5NSURLl

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r157419 r157445  
    79707970    <ClCompile Include="..\platform\network\SynchronousLoaderClient.cpp" />
    79717971    <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">
    79727978      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    79737979      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
    … …  
    1904619052    <ClInclude Include="..\platform\network\BlobResourceHandle.h" />
    1904719053    <ClInclude Include="..\platform\network\BlobStorageData.h" />
     19054    <ClInclude Include="..\platform\network\CertificateInfo.h" />
    1904819055    <ClInclude Include="..\platform\network\CookieStorage.h" />
    1904919056    <ClInclude Include="..\platform\network\Credential.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r157430 r157445  
    85398539      <Filter>platform\network</Filter>
    85408540    </ClInclude>
     8541    <ClInclude Include="..\platform\network\CertificateInfo.h">
     8542      <Filter>platform\network</Filter>
     8543    </ClInclude>
    85418544    <ClInclude Include="..\platform\network\CookieStorage.h">
    85428545      <Filter>platform\network</Filter>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r157430 r157445  
    18631863                5DFE8F560D16477B0076E937 /* ScheduledAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */; };
    18641864                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, ); }; };
    18651867                5FC7DC26CFE2563200B85AE4 /* JSEventTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FC7DC26CFE2563200B85AE5 /* JSEventTarget.h */; };
     1868                5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FE1D291178FD1F3001AA3C3 /* Security.framework */; };
    18661869                626CDE0E1140424C001E5A68 /* SpatialNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 626CDE0C1140424C001E5A68 /* SpatialNavigation.cpp */; };
    18671870                626CDE0F1140424C001E5A68 /* SpatialNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 626CDE0D1140424C001E5A68 /* SpatialNavigation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    84388441                5DB1BC6810715A6400EFAA49 /* TransformSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformSource.h; sourceTree = "<group>"; };
    84398442                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>"; };
    84408445                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>"; };
    84418447                626CDE0C1140424C001E5A68 /* SpatialNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpatialNavigation.cpp; sourceTree = "<group>"; };
    84428448                626CDE0D1140424C001E5A68 /* SpatialNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpatialNavigation.h; sourceTree = "<group>"; };
    … …  
    1322813234                        buildActionMask = 2147483647;
    1322913235                        files = (
     13236                                5FE1D292178FD1F3001AA3C3 /* Security.framework in Frameworks */,
    1323013237                                FD2DBF1212B048A300ED98C6 /* Accelerate.framework in Frameworks */,
    1323113238                                93F19B1308245E59001E9ABC /* ApplicationServices.framework in Frameworks */,
    … …  
    1356313570                        isa = PBXGroup;
    1356413571                        children = (
     13572                                5FE1D291178FD1F3001AA3C3 /* Security.framework */,
    1356513573                                65C97AF208EA908800ACD273 /* config.h */,
    1356613574                                EDEC98020AED7E170059137F /* WebCorePrefix.h */,
    … …  
    1504215050                                2EB4BCD1121F03E300EC4885 /* BlobResourceHandle.h */,
    1504315051                                2EDEF1F2121B0EFC00726DB2 /* BlobStorageData.h */,
     15052                                5F2DBBE8178E336900141486 /* CertificateInfo.h */,
    1504415053                                E13F01EA1270E10D00DFBA71 /* CookieStorage.h */,
    1504515054                                514C76580CE923A1007EF3CD /* Credential.cpp */,
    … …  
    1510215111                                514C76420CE9234E007EF3CD /* AuthenticationMac.h */,
    1510315112                                514C76430CE9234E007EF3CD /* AuthenticationMac.mm */,
     15113                                5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */,
    1510415114                                E1424C8F164B460B00F32D40 /* CookieJarMac.mm */,
    1510515115                                E13F01F01270E19000DFBA71 /* CookieStorageMac.mm */,
    … …  
    2356923579                                499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */,
    2357023580                                493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */,
     23581                                5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
    2357123582                                07C59B5417F4AC15000FBCBB /* AudioStreamTrack.h in Headers */,
    2357223583                                E1424C8A164B3B4E00F32D40 /* PlatformCookieJar.h in Headers */,
    … …  
    2766327674                                977E2E0E12F0FC9C00C13380 /* XSSAuditorDelegate.cpp in Sources */,
    2766427675                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
     27676                                5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */,
    2766527677                                FD1762DF176686D900D836A8 /* UpSampler.cpp in Sources */,
    2766627678                                FD1762E3176686EA00D836A8 /* DownSampler.cpp in Sources */,

  • trunk/Source/WebCore/platform/network/CertificateInfo.h

    r157444 r157445  
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
    33 * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
     4 * Portions Copyright (c) 2013 Company 100 Inc. All rights reserved.
    45 *
    56 * Redistribution and use in source and binary forms, with or without
    … …  
    2526 */
    2627
    27 #ifndef PlatformCertificateInfo_h
    28 #define PlatformCertificateInfo_h
     28#ifndef CertificateInfo_h
     29#define CertificateInfo_h
    2930
    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>
    3135#include <wtf/gobject/GRefPtr.h>
    32 
    33 namespace CoreIPC {
    34 class ArgumentDecoder;
    35 class ArgumentEncoder;
    36 }
     36#endif
    3737
    3838namespace WebCore {
    39 class ResourceError;
    40 class ResourceResponse;
    41 }
    4239
    43 namespace WebKit {
     40class CertificateInfo {
     41public:
     42    CertificateInfo();
    4443
    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
    5147
     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)
    5258    GTlsCertificate* certificate() const { return m_certificate.get(); }
     59    void setCertificate(GTlsCertificate* certificate) { m_certificate = certificate; }
     60
    5361    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
    5764
    5865private:
     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)
    5970    GRefPtr<GTlsCertificate> m_certificate;
    6071    GTlsCertificateFlags m_tlsErrors;
     72#endif
    6173};
    6274
    63 } // namespace WebKit
     75} // namespace WebCore
    6476
    65 #endif // PlatformCertificateInfo_h
     77#endif // CertificateInfo_h

  • trunk/Source/WebCore/platform/network/ResourceErrorBase.h

    r127757 r157445  
    2727#define ResourceErrorBase_h
    2828
     29#include "CertificateInfo.h"
    2930#include <wtf/text/WTFString.h>
    3031
    … …  
    5253    void setIsTimeout(bool isTimeout) { m_isTimeout = isTimeout; }
    5354    bool isTimeout() const { return m_isTimeout; }
     55
     56    const CertificateInfo& certificateInfo() const { return m_certificateInfo; }
     57    void setCertificateInfo(const CertificateInfo& certificateInfo) { m_certificateInfo = certificateInfo; }
    5458
    5559    static bool compare(const ResourceError&, const ResourceError&);
    … …  
    9094    String m_failingURL;
    9195    String m_localizedDescription;
     96    CertificateInfo m_certificateInfo;
    9297    bool m_isNull;
    9398    bool m_isCancellation;

  • trunk/Source/WebCore/platform/network/ResourceResponseBase.h

    r156550 r157445  
    2828#define ResourceResponseBase_h
    2929
     30#include "CertificateInfo.h"
    3031#include "HTTPHeaderMap.h"
     32#include "ResourceLoadTiming.h"
    3133#include "URL.h"
    32 #include "ResourceLoadTiming.h"
    3334
    3435#include <wtf/PassOwnPtr.h>
    … …  
    112113    ResourceLoadTiming* resourceLoadTiming() const;
    113114    void setResourceLoadTiming(PassRefPtr<ResourceLoadTiming>);
     115
     116    const CertificateInfo& certificateInfo() const { return m_certificateInfo; }
     117    void setCertificateInfo(const CertificateInfo& certificateInfo) { m_certificateInfo = certificateInfo; }
    114118
    115119    // The ResourceResponse subclass may "shadow" this method to provide platform-specific memory usage information
    … …  
    153157    bool m_connectionReused : 1;
    154158    RefPtr<ResourceLoadTiming> m_resourceLoadTiming;
     159    CertificateInfo m_certificateInfo;
    155160
    156161    bool m_isNull : 1;

  • trunk/Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp

    r157444 r157445  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013 Company 100 Inc.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifndef PlatformCertificateInfo_h
    27 #define PlatformCertificateInfo_h
     26#include "config.h"
     27#include "CertificateInfo.h"
    2828
    29 #include <WebCore/ResourceResponse.h>
    30 #include <wtf/RetainPtr.h>
     29namespace WebCore {
    3130
    32 namespace CoreIPC {
    33     class ArgumentDecoder;
    34     class ArgumentEncoder;
     31CertificateInfo::CertificateInfo()
     32{
    3533}
    3634
    37 namespace WebKit {
     35CertificateInfo::~CertificateInfo()
     36{
     37}
    3838
    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  
    118118    mutable RetainPtr<NSURLResponse> m_nsResponse;
    119119#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 #endif
    124120    InitLevel m_initLevel;
    125121    bool m_platformResponseIsUpToDate;

  • trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm

    r157444 r157445  
    11/*
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
     3 * Copyright (C) 2013 Company 100 Inc. All rights reserved.
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    2526
    2627#import "config.h"
    27 #import "PlatformCertificateInfo.h"
     28#import "CertificateInfo.h"
    2829
    29 #import "ArgumentCodersCF.h"
    30 #import "ArgumentDecoder.h"
    31 #import "ArgumentEncoder.h"
     30namespace WebCore {
    3231
    33 using namespace WebCore;
    34 
    35 namespace WebKit {
    36 
    37 PlatformCertificateInfo::PlatformCertificateInfo()
     32CertificateInfo::CertificateInfo()
    3833{
    3934}
    4035
    41 PlatformCertificateInfo::PlatformCertificateInfo(const ResourceResponse& response)
    42     : m_certificateChain(response.certificateChain())
    43 {
    44 }
    4536
    46 PlatformCertificateInfo::PlatformCertificateInfo(CFArrayRef certificateChain)
     37CertificateInfo::CertificateInfo(CFArrayRef certificateChain)
    4738    : m_certificateChain(certificateChain)
    4839{
    4940}
    5041
    51 void PlatformCertificateInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
     42CertificateInfo::~CertificateInfo()
    5243{
    53     if (!m_certificateChain) {
    54         encoder << false;
    55         return;
    56     }
    57 
    58     encoder << true;
    59     CoreIPC::encode(encoder, m_certificateChain.get());
    6044}
    6145
    62 bool PlatformCertificateInfo::decode(CoreIPC::ArgumentDecoder& decoder, PlatformCertificateInfo& c)
     46void CertificateInfo::setCertificateChain(CFArrayRef certificateChain)
    6347{
    64     bool hasCertificateChain;
    65     if (!decoder.decode(hasCertificateChain))
    66         return false;
     48    m_certificateChain = certificateChain;
     49}
    6750
    68     if (!hasCertificateChain)
    69         return true;
    70 
    71     if (!CoreIPC::decode(decoder, c.m_certificateChain))
    72         return false;
    73 
    74     return true;
     51CFArrayRef CertificateInfo::certificateChain() const
     52{
     53    return m_certificateChain.get();
    7554}
    7655
    7756#ifndef NDEBUG
    78 void PlatformCertificateInfo::dump() const
     57void CertificateInfo::dump() const
    7958{
    8059    unsigned entries = m_certificateChain ? CFArrayGetCount(m_certificateChain.get()) : 0;
    8160
    82     NSLog(@"PlatformCertificateInfo\n");
     61    NSLog(@"CertificateInfo\n");
    8362    NSLog(@"  Entries: %d\n", entries);
    8463    for (unsigned i = 0; i < entries; ++i) {
    … …  
    8968#endif
    9069
    91 } // namespace WebKit
     70} // namespace WebCore

  • trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm

    r156715 r157445  
    182182{
    183183    ASSERT(!wkCopyNSURLResponseCertificateChain(nsURLResponse()));
    184     m_externalCertificateChain = certificateChain;
     184    m_certificateInfo.setCertificateChain(certificateChain);
    185185}
    186186
    187187RetainPtr<CFArrayRef> ResourceResponse::certificateChain() const
    188188{
    189     if (m_externalCertificateChain)
    190         return m_externalCertificateChain;
     189    if (m_certificateInfo.certificateChain())
     190        return adoptCF(m_certificateInfo.certificateChain());
    191191
    192192    return adoptCF(wkCopyNSURLResponseCertificateChain(nsURLResponse()));

  • trunk/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp

    r157444 r157445  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2012 Igalia S.L.
     3 * Copyright (C) 2013 Company 100 Inc.
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    2425 */
    2526
    26 #import "config.h"
    27 #import "WKCertificateInfoMac.h"
     27#include "config.h"
     28#include "CertificateInfo.h"
    2829
    29 #import "WKAPICast.h"
    30 #import "WebCertificateInfo.h"
     30namespace WebCore {
    3131
    32 using namespace WebKit;
    33 
    34 WKCertificateInfoRef WKCertificateInfoCreateWithCertficateChain(CFArrayRef certificateChain)
     32CertificateInfo::CertificateInfo()
     33    : m_tlsErrors(static_cast<GTlsCertificateFlags>(0))
    3534{
    36     RefPtr<WebCertificateInfo> certificateInfo = WebCertificateInfo::create(PlatformCertificateInfo(certificateChain));
    37     return toAPI(certificateInfo.release().leakRef());
    3835}
    3936
    40 CFArrayRef WKCertificateInfoGetCertificateChain(WKCertificateInfoRef certificateInfoRef)
     37CertificateInfo::~CertificateInfo()
    4138{
    42     return toImpl(certificateInfoRef)->platformCertificateInfo().certificateChain();
    4339}
     40
     41} // namespace WebCore

  • trunk/Source/WebCore/platform/network/soup/ResourceError.h

    r149642 r157445  
    4141    ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
    4242        : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
    43         , m_tlsErrors(0)
    4443    {
    4544    }
    4645
    4746    ResourceError()
    48         : m_tlsErrors(0)
    4947    {
    5048    }
    … …  
    5755    static ResourceError authenticationError(SoupMessage*);
    5856
    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 
    6457private:
    6558    void platformCopy(ResourceError&) const;
    6659    static bool platformCompare(const ResourceError& a, const ResourceError& b);
    67 
    68     unsigned m_tlsErrors;
    69     GRefPtr<GTlsCertificate> m_certificate;
    7060};
    7161

  • trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp

    r149642 r157445  
    11/*
    22 * Copyright (C) 2012 Igalia S.L.
     3 * Copyright (C) 2013 Company 100 Inc.
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    7980    ResourceError resourceError(g_quark_to_string(SOUP_HTTP_ERROR), SOUP_STATUS_SSL_FAILED,
    8081        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);
    8384    return resourceError;
    8485}
    … …  
    99100void ResourceError::platformCopy(ResourceError& errorCopy) const
    100101{
    101     errorCopy.m_certificate = m_certificate;
    102     errorCopy.m_tlsErrors = m_tlsErrors;
     102    errorCopy.setCertificateInfo(m_certificateInfo);
    103103}
    104104
    105105bool ResourceError::platformCompare(const ResourceError& a, const ResourceError& b)
    106106{
    107     return a.tlsErrors() == b.tlsErrors();
     107    return a.m_certificateInfo.tlsErrors() == b.m_certificateInfo.tlsErrors();
    108108}
    109109

  • trunk/Source/WebCore/platform/network/soup/ResourceResponse.h

    r156550 r157445  
    3939        : ResourceResponseBase()
    4040        , m_soupFlags(static_cast<SoupMessageFlags>(0))
    41         , m_tlsErrors(static_cast<GTlsCertificateFlags>(0))
    4241    {
    4342    }
    … …  
    4645        : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
    4746        , m_soupFlags(static_cast<SoupMessageFlags>(0))
    48         , m_tlsErrors(static_cast<GTlsCertificateFlags>(0))
    4947    {
    5048    }
    … …  
    5351        : ResourceResponseBase()
    5452        , m_soupFlags(static_cast<SoupMessageFlags>(0))
    55         , m_tlsErrors(static_cast<GTlsCertificateFlags>(0))
    5653    {
    5754        updateFromSoupMessage(soupMessage);
    … …  
    6865    void setSniffedContentType(const String& value) { m_sniffedContentType = value; }
    6966
    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); }
    7269
    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); }
    7572
    7673    bool platformResponseIsUpToDate() const { return false; }
    … …  
    8178    SoupMessageFlags m_soupFlags;
    8279    String m_sniffedContentType;
    83     GRefPtr<GTlsCertificate> m_certificate;
    84     GTlsCertificateFlags m_tlsErrors;
    8580
    8681    void doUpdateResourceResponse() { }

  • trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp

    r142902 r157445  
    5353    soup_message_set_flags(soupMessage, m_soupFlags);
    5454
    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);
    5656
    5757    // Body data is not in the message.
    … …  
    6969
    7070    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);
    7375
    7476    updateFromSoupMessageHeaders(soupMessage->response_headers);

  • trunk/Source/WebKit2/ChangeLog

    r157406 r157445  
     12013-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
    1832013-10-14  Csaba Osztrogonác  <ossy@webkit.org>
    284

  • trunk/Source/WebKit2/GNUmakefile.list.am

    r157320 r157445  
    482482        Source/WebKit2/Shared/StatisticsData.cpp \
    483483        Source/WebKit2/Shared/StatisticsData.h \
    484         Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp \
    485         Source/WebKit2/Shared/soup/PlatformCertificateInfo.h \
    486484        Source/WebKit2/Shared/soup/SoupCookiePersistentStorageType.h \
    487485        Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
    … …  
    13541352        Source/WebKit2/Shared/gtk/WebEventFactory.cpp \
    13551353        Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp \
    1356         Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp \
    1357         Source/WebKit2/Shared/soup/PlatformCertificateInfo.h \
    13581354        Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
    13591355        Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \

  • trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp

    r154895 r157445  
    2929#include "DataReference.h"
    3030#include "NetworkResourceLoader.h"
    31 #include "PlatformCertificateInfo.h"
    3231#include "WebCoreArgumentCoders.h"
    3332#include "WebResourceLoaderMessages.h"
     33#include <WebCore/CertificateInfo.h>
    3434#include <WebCore/ResourceError.h>
     35#include <WebCore/ResourceResponse.h>
    3536#include <WebCore/SharedBuffer.h>
    3637#include <wtf/CurrentTime.h>
    … …  
    6465void AsynchronousNetworkLoaderClient::didReceiveResponse(NetworkResourceLoader* loader, const ResourceResponse& response)
    6566{
    66     loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(response, PlatformCertificateInfo(response), loader->isLoadingMainResource()));
     67    loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(response, response.certificateInfo(), loader->isLoadingMainResource()));
    6768}
    6869

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

    r156354 r157445  
    3737
    3838namespace WebCore {
    39     class RunLoop;
     39class CertificateInfo;
     40class RunLoop;
    4041}
    4142
    … …  
    4546class NetworkConnectionToWebProcess;
    4647class NetworkProcessSupplement;
    47 class PlatformCertificateInfo;
    4848struct NetworkProcessCreationParameters;
    4949
    … …  
    109109    void cancelDownload(uint64_t downloadID);
    110110    void setCacheModel(uint32_t);
    111     void allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo&, const String& host);
     111    void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
    112112    void getNetworkProcessStatistics(uint64_t callbackID);
    113113    void clearCacheForAllOrigins(uint32_t cachesToClear);

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in

    r147251 r157445  
    4040#endif
    4141
    42     AllowSpecificHTTPSCertificateForHost(WebKit::PlatformCertificateInfo certificate, WTF::String host)
     42    AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, WTF::String host)
    4343   
    4444    GetNetworkProcessStatistics(uint64_t callbackID)

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

    r157251 r157445  
    3838#include "NetworkProcessConnectionMessages.h"
    3939#include "NetworkResourceLoadParameters.h"
    40 #include "PlatformCertificateInfo.h"
    4140#include "RemoteNetworkingContext.h"
    4241#include "ShareableResource.h"

  • trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm

    r156550 r157445  
    3131#import "NetworkProcessCreationParameters.h"
    3232#import "NetworkResourceLoader.h"
    33 #import "PlatformCertificateInfo.h"
    3433#import "ResourceCachesToClear.h"
    3534#import "SandboxExtension.h"
    … …  
    3837#import <WebCore/FileSystem.h>
    3938#import <WebCore/LocalizedStrings.h>
     39#import <WebCore/CertificateInfo.h>
    4040#import <WebKitSystemInterface.h>
    4141#import <mach/host_info.h>
    … …  
    186186}
    187187
    188 void NetworkProcess::allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo& certificateInfo, const String& host)
     188void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
    189189{
    190190    [NSURLRequest setAllowsSpecificHTTPSCertificate:(NSArray *)certificateInfo.certificateChain() forHost:(NSString *)host];

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r157289 r157445  
    4747    Shared/linux/SeccompFilters/SyscallPolicy.cpp
    4848
    49     Shared/soup/PlatformCertificateInfo.cpp
    5049    Shared/soup/WebCoreArgumentCodersSoup.cpp
    5150

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r156265 r157445  
    6262    Shared/linux/SeccompFilters/SyscallPolicy.cpp
    6363
    64     Shared/soup/PlatformCertificateInfo.cpp
    6564    Shared/soup/WebCoreArgumentCodersSoup.cpp
    6665

  • trunk/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm

    r95901 r157445  
    3030#import "WebCertificateInfo.h"
    3131
     32using namespace WebCore;
    3233using namespace WebKit;
    3334
    3435WKCertificateInfoRef WKCertificateInfoCreateWithCertficateChain(CFArrayRef certificateChain)
    3536{
    36     RefPtr<WebCertificateInfo> certificateInfo = WebCertificateInfo::create(PlatformCertificateInfo(certificateChain));
     37    RefPtr<WebCertificateInfo> certificateInfo = WebCertificateInfo::create(CertificateInfo(certificateChain));
    3738    return toAPI(certificateInfo.release().leakRef());
    3839}
    … …  
    4041CFArrayRef WKCertificateInfoGetCertificateChain(WKCertificateInfoRef certificateInfoRef)
    4142{
    42     return toImpl(certificateInfoRef)->platformCertificateInfo().certificateChain();
     43    return toImpl(certificateInfoRef)->certificateInfo().certificateChain();
    4344}

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp

    r146929 r157445  
    9999// Currently, only Mac knows how to respond to authentication challenges with certificate info.
    100100#if !USE(SECURITY_FRAMEWORK)
    101 bool AuthenticationManager::tryUsePlatformCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const PlatformCertificateInfo&)
     101bool AuthenticationManager::tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const CertificateInfo&)
    102102{
    103103    return false;
    … …  
    105105#endif
    106106
    107 void AuthenticationManager::useCredentialForChallenge(uint64_t challengeID, const Credential& credential, const PlatformCertificateInfo& certificateInfo)
     107void AuthenticationManager::useCredentialForChallenge(uint64_t challengeID, const Credential& credential, const CertificateInfo& certificateInfo)
    108108{
    109109    ASSERT(isMainThread());
    … …  
    112112    ASSERT(!challenge.isNull());
    113113   
    114     if (tryUsePlatformCertificateInfoForChallenge(challenge, certificateInfo))
     114    if (tryUseCertificateInfoForChallenge(challenge, certificateInfo))
    115115        return;
    116116   

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h

    r142651 r157445  
    3737    class AuthenticationChallenge;
    3838    class Credential;
     39    class CertificateInfo;
    3940}
    4041
    … …  
    4344class ChildProcess;
    4445class Download;
    45 class PlatformCertificateInfo;
    4646class WebFrame;
    4747
    … …  
    6060    void didReceiveAuthenticationChallenge(Download*, const WebCore::AuthenticationChallenge&);
    6161
    62     void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const PlatformCertificateInfo&);
     62    void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const WebCore::CertificateInfo&);
    6363    void continueWithoutCredentialForChallenge(uint64_t challengeID);
    6464    void cancelChallenge(uint64_t challengeID);
    … …  
    7070    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    7171
    72     bool tryUsePlatformCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const PlatformCertificateInfo&);
     72    bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&);
    7373
    7474    uint64_t establishIdentifierForChallenge(const WebCore::AuthenticationChallenge&);

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in

    r141710 r157445  
    2222
    2323messages -> AuthenticationManager {
    24     void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, WebKit::PlatformCertificateInfo certificate);
     24    void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, WebCore::CertificateInfo certificate);
    2525    void ContinueWithoutCredentialForChallenge(uint64_t challengeID);
    2626    void CancelChallenge(uint64_t challengeID);

  • trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm

    r140874 r157445  
    2929#if USE(SECURITY_FRAMEWORK)
    3030
    31 #include "PlatformCertificateInfo.h"
    3231#include <Security/SecIdentity.h>
    3332#include <WebCore/AuthenticationChallenge.h>
     33#include <WebCore/CertificateInfo.h>
    3434
    3535using namespace WebCore;
    … …  
    3737namespace WebKit {
    3838
    39 bool AuthenticationManager::tryUsePlatformCertificateInfoForChallenge(const AuthenticationChallenge& challenge, const PlatformCertificateInfo& certificateInfo)
     39bool AuthenticationManager::tryUseCertificateInfoForChallenge(const AuthenticationChallenge& challenge, const CertificateInfo& certificateInfo)
    4040{
    4141    CFArrayRef chain = certificateInfo.certificateChain();

  • trunk/Source/WebKit2/Shared/UserMessageCoders.h

    r149848 r157445  
    216216        case APIObject::TypeCertificateInfo: {
    217217            WebCertificateInfo* certificateInfo = static_cast<WebCertificateInfo*>(m_root);
    218             encoder << certificateInfo->platformCertificateInfo();
     218            encoder << certificateInfo->certificateInfo();
    219219            return true;
    220220        }
    … …  
    505505        }
    506506        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);
    511511            break;
    512512        }

  • trunk/Source/WebKit2/Shared/WebCertificateInfo.h

    r147403 r157445  
    2828
    2929#include "APIObject.h"
    30 #include "PlatformCertificateInfo.h"
     30#include <WebCore/CertificateInfo.h>
    3131#include <wtf/PassRefPtr.h>
    3232
    … …  
    3535class WebCertificateInfo : public TypedAPIObject<APIObject::TypeCertificateInfo> {
    3636public:
    37     static PassRefPtr<WebCertificateInfo> create(const PlatformCertificateInfo& info)
     37    static PassRefPtr<WebCertificateInfo> create(const WebCore::CertificateInfo& info)
    3838    {
    3939        return adoptRef(new WebCertificateInfo(info));
    4040    }
    4141
    42     const PlatformCertificateInfo& platformCertificateInfo() const { return m_platformCertificateInfo; }
     42    const WebCore::CertificateInfo& certificateInfo() const { return m_certificateInfo; }
    4343
    4444private:
    45     explicit WebCertificateInfo(const PlatformCertificateInfo& info)
    46         : m_platformCertificateInfo(info)
     45    explicit WebCertificateInfo(const WebCore::CertificateInfo& info)
     46        : m_certificateInfo(info)
    4747    {
    4848    }
    4949
    50     PlatformCertificateInfo m_platformCertificateInfo;
     50    WebCore::CertificateInfo m_certificateInfo;
    5151};
    5252

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

    r156588 r157445  
    2929#include "ShareableBitmap.h"
    3030#include <WebCore/AuthenticationChallenge.h>
     31#include <WebCore/CertificateInfo.h>
    3132#include <WebCore/Cookie.h>
    3233#include <WebCore/Credential.h>
    … …  
    4041#include <WebCore/GraphicsLayer.h>
    4142#include <WebCore/Image.h>
    42 #include <WebCore/URL.h>
    4343#include <WebCore/PluginData.h>
    4444#include <WebCore/ProtectionSpace.h>
    … …  
    4747#include <WebCore/ResourceResponse.h>
    4848#include <WebCore/TextCheckerClient.h>
     49#include <WebCore/URL.h>
    4950#include <WebCore/UserScript.h>
    5051#include <WebCore/UserStyleSheet.h>
    … …  
    545546    resourceResponse = response;
    546547
     548    return true;
     549}
     550
     551void ArgumentCoder<CertificateInfo>::encode(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
     552{
     553    encodePlatformData(encoder, certificateInfo);
     554}
     555
     556bool ArgumentCoder<CertificateInfo>::decode(ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
     557{
     558    CertificateInfo certificate;
     559
     560    if (!decodePlatformData(decoder, certificate))
     561        return false;
     562
     563    certificateInfo = certificate;
    547564    return true;
    548565}

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

    r156588 r157445  
    4646    class URL;
    4747    class Notification;
     48    class CertificateInfo;
    4849    class ProtectionSpace;
    4950    class ResourceError;
    … …  
    171172};
    172173
     174template<> 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
    173181template<> struct ArgumentCoder<WebCore::ResourceError> {
    174182#if PLATFORM(MAC)

  • trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm

    r149491 r157445  
    11/*
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
     3 * Copyright (C) 2013 Company 100 Inc. All rights reserved.
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    2829
    2930#import "ArgumentCodersCF.h"
    30 #import "PlatformCertificateInfo.h"
    3131#import "WebKitSystemInterface.h"
    3232#import <WebCore/KeyboardEvent.h>
     33#import <WebCore/CertificateInfo.h>
    3334#import <WebCore/ResourceError.h>
    3435#import <WebCore/ResourceRequest.h>
     36#import <WebCore/ResourceResponse.h>
    3537
    3638using namespace WebCore;
    37 using namespace WebKit;
    3839
    3940namespace CoreIPC {
    … …  
    133134}
    134135
     136
     137void 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
     149bool 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
    135167static NSString* nsString(const String& string)
    136168{
    … …  
    169201    id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"];
    170202    ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]);
    171     encoder << PlatformCertificateInfo((CFArrayRef)peerCertificateChain);
     203    encoder << CertificateInfo((CFArrayRef)peerCertificateChain);
    172204}
    173205
    … …  
    195227        return false;
    196228
    197     PlatformCertificateInfo certificate;
     229    CertificateInfo certificate;
    198230    if (!decoder.decode(certificate))
    199231        return false;

  • trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp

    r141639 r157445  
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
    33 * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
     4 * Portions Copyright (c) 2013 Company 100 Inc. All rights reserved.
    45 *
    56 * Redistribution and use in source and binary forms, with or without
    … …  
    2627
    2728#include "config.h"
     29#include "DataReference.h"
    2830#include "WebCoreArgumentCoders.h"
    2931
    30 #include "PlatformCertificateInfo.h"
     32#include <WebCore/CertificateInfo.h>
    3133#include <WebCore/ResourceError.h>
    3234#include <WebCore/ResourceRequest.h>
    … …  
    3537
    3638using namespace WebCore;
    37 using namespace WebKit;
    3839
    3940namespace CoreIPC {
    … …  
    6970
    7071
     72void 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
     92bool 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
    71123void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
    72124{
    73     encoder << PlatformCertificateInfo(resourceError);
     125    encoder << resourceError.certificateInfo();
    74126}
    75127
    76128bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError)
    77129{
    78     PlatformCertificateInfo certificateInfo;
     130    CertificateInfo certificateInfo;
    79131    if (!decoder.decode(certificateInfo))
    80132        return false;
    81133
    82     resourceError.setCertificate(certificateInfo.certificate());
    83     resourceError.setTLSErrors(certificateInfo.tlsErrors());
     134    resourceError.setCertificateInfo(certificateInfo);
    84135    return true;
    85136}

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r155347 r157445  
    2323
    2424#include "ImageOptions.h"
    25 #include "PlatformCertificateInfo.h"
    2625#include "WebCertificateInfo.h"
    2726#include "WebContextMenuItem.h"
    … …  
    6059#include "WebKitWindowPropertiesPrivate.h"
    6160#include <JavaScriptCore/APICast.h>
     61#include <WebCore/CertificateInfo.h>
    6262#include <WebCore/DragIcon.h>
    6363#include <WebCore/GOwnPtrGtk.h>
    … …  
    29882988        return FALSE;
    29892989
    2990     const PlatformCertificateInfo& certificateInfo = mainFrame->certificateInfo()->platformCertificateInfo();
     2990    const WebCore::CertificateInfo& certificateInfo = mainFrame->certificateInfo()->certificateInfo();
    29912991    if (certificate)
    29922992        *certificate = certificateInfo.certificate();

  • trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp

    r137862 r157445  
    6767    else {
    6868        WebCertificateInfo* certificateInfo = credential->certificateInfo();
    69         PlatformCertificateInfo platformInfo = certificateInfo ? certificateInfo->platformCertificateInfo() : PlatformCertificateInfo();
     69        WebCore::CertificateInfo platformInfo = certificateInfo ? certificateInfo->certificateInfo() : WebCore::CertificateInfo();
    7070        m_connection->send(Messages::AuthenticationManager::UseCredentialForChallenge(m_challengeID, credential->core(), platformInfo), 0);
    7171    }

  • trunk/Source/WebKit2/UIProcess/WebContext.cpp

    r156847 r157445  
    10681068#if ENABLE(NETWORK_PROCESS)
    10691069    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);
    10711071        return;
    10721072    }

  • trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp

    r150689 r157445  
    139139}
    140140
    141 void WebFrameProxy::didCommitLoad(const String& contentType, const PlatformCertificateInfo& certificateInfo)
     141void WebFrameProxy::didCommitLoad(const String& contentType, const WebCore::CertificateInfo& certificateInfo)
    142142{
    143143    ASSERT(m_loadState == LoadStateProvisional);

  • trunk/Source/WebKit2/UIProcess/WebFrameProxy.h

    r147403 r157445  
    4141}
    4242
     43namespace WebCore {
     44class CertificateInfo;
     45}
     46
    4347namespace WebKit {
    4448
    4549class ImmutableArray;
    46 class PlatformCertificateInfo;
     50
    4751class WebCertificateInfo;
    4852class WebFormSubmissionListenerProxy;
    … …  
    107111    void didReceiveServerRedirectForProvisionalLoad(const String& url);
    108112    void didFailProvisionalLoad();
    109     void didCommitLoad(const String& contentType, const PlatformCertificateInfo&);
     113    void didCommitLoad(const String& contentType, const WebCore::CertificateInfo&);
    110114    void didFinishLoad();
    111115    void didFailLoad();

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r157319 r157445  
    21912191}
    21922192
    2193 void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const PlatformCertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)
     2193void WebPageProxy::didCommitLoadForFrame(uint64_t frameID, const String& mimeType, uint32_t opaqueFrameLoadType, const CertificateInfo& certificateInfo, CoreIPC::MessageDecoder& decoder)
    21942194{
    21952195    RefPtr<APIObject> userData;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r157319 r157445  
    9999    class GraphicsLayer;
    100100    class IntSize;
     101    class CertificateInfo;
    101102    class ProtectionSpace;
    102103    class SharedBuffer;
    … …  
    126127class NativeWebWheelEvent;
    127128class PageClient;
    128 class PlatformCertificateInfo;
    129129class StringPairVector;
    130130class WebBackForwardList;
    … …  
    785785    void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String&, CoreIPC::MessageDecoder&);
    786786    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&);
    788788    void didFinishDocumentLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
    789789    void didFinishLoadForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r156847 r157445  
    112112
    113113    # Frame load messages
    114     DidCommitLoadForFrame(uint64_t frameID, WTF::String mimeType, uint32_t loadType, WebKit::PlatformCertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     114    DidCommitLoadForFrame(uint64_t frameID, WTF::String mimeType, uint32_t loadType, WebCore::CertificateInfo certificateInfo, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    115115    DidFailLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
    116116    DidFailProvisionalLoadForFrame(uint64_t frameID, WebCore::ResourceError error, WebKit::InjectedBundleUserMessageEncoder userData) Variadic

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r157320 r157445  
    10331033                BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */; };
    10341034                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 */; };
    10371035                BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; };
    10381036                BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */; };
    … …  
    24642462                BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessSupplement.h; path = Network/NetworkProcessSupplement.h; sourceTree = "<group>"; };
    24652463                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>"; };
    24682464                BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
    24692465                BCF50726124329AA005955AE /* WebCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCertificateInfo.h; sourceTree = "<group>"; };
    … …  
    41604156                                E19582D2153CBFD700B60875 /* PDFKitImports.h */,
    41614157                                E19582D4153CC05300B60875 /* PDFKitImports.mm */,
    4162                                 BCF505E51243047B005955AE /* PlatformCertificateInfo.h */,
    4163                                 BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */,
    41644158                                E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */,
    41654159                                1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */,
    … …  
    51205114                                E19582D3153CBFD700B60875 /* PDFKitImports.h in Headers */,
    51215115                                51FCB18917BBFE0300394CD8 /* SynchronousNetworkLoaderClient.h in Headers */,
    5122                                 BCF505E71243047B005955AE /* PlatformCertificateInfo.h in Headers */,
    51235116                                BCC43ABB127B95DC00317F16 /* PlatformPopupMenuData.h in Headers */,
    51245117                                BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */,
    … …  
    62816274                                2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */,
    62826275                                2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
    6283                                 BCF505E81243047B005955AE /* PlatformCertificateInfo.mm in Sources */,
    62846276                                BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
    62856277                                1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp

    r157225 r157445  
    3333#include "NetworkProcessConnection.h"
    3434#include "NetworkResourceLoaderMessages.h"
    35 #include "PlatformCertificateInfo.h"
    3635#include "WebCoreArgumentCoders.h"
    3736#include "WebErrors.h"
    3837#include "WebProcess.h"
     38#include <WebCore/CertificateInfo.h>
    3939#include <WebCore/DocumentLoader.h>
    4040#include <WebCore/ResourceBuffer.h>
    … …  
    100100}
    101101
    102 void WebResourceLoader::didReceiveResponseWithCertificateInfo(const ResourceResponse& response, const PlatformCertificateInfo& certificateInfo, bool needsContinueDidReceiveResponseMessage)
     102void WebResourceLoader::didReceiveResponseWithCertificateInfo(const ResourceResponse& response, const CertificateInfo& certificateInfo, bool needsContinueDidReceiveResponseMessage)
    103103{
    104104    LOG(Network, "(WebProcess) WebResourceLoader::didReceiveResponseWithCertificateInfo for '%s'. Status %d.", m_coreLoader->url().string().utf8().data(), response.httpStatusCode());
    … …  
    107107
    108108    ResourceResponse responseCopy(response);
    109     responseCopy.setCertificateChain(certificateInfo.certificateChain());
     109    responseCopy.setCertificateInfo(certificateInfo);
    110110    m_coreLoader->didReceiveResponse(responseCopy);
    111111

  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h

    r157225 r157445  
    4141
    4242namespace WebCore {
     43class CertificateInfo;
    4344class ProtectionSpace;
    4445class ResourceBuffer;
    … …  
    5152namespace WebKit {
    5253
    53 class PlatformCertificateInfo;
    5454typedef uint64_t ResourceLoadIdentifier;
    5555
    … …  
    7777    void willSendRequest(const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
    7878    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);
    8080    void didReceiveData(const CoreIPC::DataReference&, int64_t encodedDataLength);
    8181    void didFinishResourceLoad(double finishTime);

  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in

    r157225 r157445  
    3030    WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
    3131    DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
    32     DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebKit::PlatformCertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)
     32    DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebCore::CertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)
    3333    DidReceiveData(CoreIPC::DataReference data, int64_t encodedDataLength)
    3434    DidFinishResourceLoad(double finishTime)

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r156946 r157445  
    3434#include "InjectedBundleNavigationAction.h"
    3535#include "InjectedBundleUserMessageCoders.h"
    36 #include "PlatformCertificateInfo.h"
    3736#include "PluginView.h"
    3837#include "WebBackForwardListProxy.h"
    … …  
    5251#include <JavaScriptCore/APICast.h>
    5352#include <JavaScriptCore/JSObject.h>
     53#include <WebCore/CertificateInfo.h>
    5454#include <WebCore/Chrome.h>
    5555#include <WebCore/DOMWrapperWorld.h>
    … …  
    442442    // Notify the UIProcess.
    443443
    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())));
    445445
    446446    webPage->didCommitLoad(m_frame);
Note: See TracChangeset for help on using the changeset viewer.