- WebKit2/ChangeLog +75 lines
Lines 1-3 WebKit2/ChangeLog_sec1
1
2010-09-17  Sam Weinig  <sam@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        Make certificate data available to the WKFrameRef after it is committed
6
        https://bugs.webkit.org/show_bug.cgi?id=45998
7
8
        * Shared/APIObject.h:
9
        Add new type.
10
11
        * Shared/WebCertificateInfo.h: Added.
12
        (WebKit::WebCertificateInfo::create):
13
        (WebKit::WebCertificateInfo::platformCertificateInfo):
14
        (WebKit::WebCertificateInfo::setPlatformCertificateInfo):
15
        (WebKit::WebCertificateInfo::WebCertificateInfo):
16
        (WebKit::WebCertificateInfo::type):
17
        Add API type for vending,
18
19
        * Shared/mac/PlatformCertificateInfo.h: Added.
20
        (WebKit::PlatformCertificateInfo::peerCertificates):
21
        * Shared/mac/PlatformCertificateInfo.mm: Added.
22
        (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
23
        (WebKit::PlatformCertificateInfo::dump):
24
        (WebKit::PlatformCertificateInfo::encode):
25
        (WebKit::PlatformCertificateInfo::decode):
26
        * Shared/qt/PlatformCertificateInfo.h: Added.
27
        (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
28
        (WebKit::PlatformCertificateInfo::encode):
29
        (WebKit::PlatformCertificateInfo::decode):
30
        * Shared/win/PlatformCertificateInfo.h: Added.
31
        (WebKit::PlatformCertificateInfo::PlatformCertificateInfo):
32
        (WebKit::PlatformCertificateInfo::encode):
33
        (WebKit::PlatformCertificateInfo::decode):
34
        Add platform specific holder for certificate data and encode/decode functions
35
        to send it over the wire. Right now, this only implemented for the mac.
36
37
        * UIProcess/API/C/WKAPICast.h:
38
        * UIProcess/API/C/WKBase.h:
39
        * UIProcess/API/C/WKCertificateInfo.cpp: Added.
40
        (WKCertificateInfoGetTypeID):
41
        * UIProcess/API/C/WKCertificateInfo.h: Added.
42
        Add wrapper for WebCertificateInfo.
43
44
        * UIProcess/API/C/WKFrame.cpp:
45
        (WKFrameGetCertificateInfo):
46
        * UIProcess/API/C/WKFrame.h:
47
        Add getter for a WKCertificateInfo.
48
49
        * UIProcess/API/C/mac/WKCertificateInfoMac.h: Added.
50
        * UIProcess/API/C/mac/WKCertificateInfoMac.mm: Added.
51
        (WKCertificateInfoGetPeerCertificates):
52
        Add mac specific getters for the platform specific certificate
53
        data.
54
55
        * UIProcess/WebFrameProxy.cpp:
56
        (WebKit::WebFrameProxy::WebFrameProxy):
57
        (WebKit::WebFrameProxy::setPlatformCertificateInfo):
58
        * UIProcess/WebFrameProxy.h:
59
        (WebKit::WebFrameProxy::certificateInfo):
60
        * UIProcess/WebPageProxy.cpp:
61
        (WebKit::WebPageProxy::didReceiveMessage):
62
        (WebKit::WebPageProxy::didCommitLoadForFrame):
63
        * UIProcess/WebPageProxy.h:
64
        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
65
        (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
66
        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
67
        Pipe the certificate info through to the WebFrameProxy on
68
        commit.
69
70
        * WebKit2.pro:
71
        * WebKit2.xcodeproj/project.pbxproj:
72
        * win/WebKit2.vcproj:
73
        * win/WebKit2Generated.make:
74
        Add new files.
75
1
2010-09-17  Sam Weinig  <sam@webkit.org>
76
2010-09-17  Sam Weinig  <sam@webkit.org>
2
77
3
        Reviewed by Anders Carlsson.
78
        Reviewed by Anders Carlsson.
- WebKit2/WebKit2.pro -1 / +5 lines
Lines 162-170 HEADERS += \ WebKit2/WebKit2.pro_sec1
162
    Shared/MutableArray.h \
162
    Shared/MutableArray.h \
163
    Shared/MutableDictionary.h \
163
    Shared/MutableDictionary.h \
164
    Shared/NotImplemented.h \
164
    Shared/NotImplemented.h \
165
    Shared/qt/PlatformCertificateInfo.h \
165
    Shared/qt/WebEventFactoryQt.h \
166
    Shared/qt/WebEventFactoryQt.h \
166
    Shared/UserMessageCoders.h \
167
    Shared/UserMessageCoders.h \
167
    Shared/VisitedLinkTable.h \
168
    Shared/VisitedLinkTable.h \
169
    Shared/WebCertificateInfo.h \
168
    Shared/WebEventConversion.h \
170
    Shared/WebEventConversion.h \
169
    Shared/WebEvent.h \
171
    Shared/WebEvent.h \
170
    Shared/WebNumber.h \
172
    Shared/WebNumber.h \
Lines 178-183 HEADERS += \ WebKit2/WebKit2.pro_sec2
178
    UIProcess/API/C/WebKit2.h \
180
    UIProcess/API/C/WebKit2.h \
179
    UIProcess/API/C/WKAPICast.h \
181
    UIProcess/API/C/WKAPICast.h \
180
    UIProcess/API/C/WKBase.h \
182
    UIProcess/API/C/WKBase.h \
183
    UIProcess/API/C/WKCertificateInfo.h \
181
    UIProcess/API/C/WKContext.h \
184
    UIProcess/API/C/WKContext.h \
182
    UIProcess/API/C/WKContextPrivate.h \
185
    UIProcess/API/C/WKContextPrivate.h \
183
    UIProcess/API/C/WKFrame.h \
186
    UIProcess/API/C/WKFrame.h \
Lines 292-297 SOURCES += \ WebKit2/WebKit2.pro_sec3
292
    Shared/qt/WebCoreArgumentCodersQt.cpp \
295
    Shared/qt/WebCoreArgumentCodersQt.cpp \
293
    Shared/qt/WebURLRequestQt.cpp \
296
    Shared/qt/WebURLRequestQt.cpp \
294
    Shared/qt/WebURLResponseQt.cpp \
297
    Shared/qt/WebURLResponseQt.cpp \
298
    UIProcess/API/C/WKCertificateInfo.cpp \
295
    UIProcess/API/C/WKContext.cpp \
299
    UIProcess/API/C/WKContext.cpp \
296
    UIProcess/API/C/WKFrame.cpp \
300
    UIProcess/API/C/WKFrame.cpp \
297
    UIProcess/API/C/WKFramePolicyListener.cpp \
301
    UIProcess/API/C/WKFramePolicyListener.cpp \
Lines 370-376 SOURCES += \ WebKit2/WebKit2.pro_sec4
370
    WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
374
    WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
371
    WebProcess/WebCoreSupport/WebPopupMenu.cpp \
375
    WebProcess/WebCoreSupport/WebPopupMenu.cpp \
372
    WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
376
    WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
373
    WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \
377
    WebProcess/WebCoreSupport/qt/'sQt.cpp \
374
    WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp \
378
    WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp \
375
    WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
379
    WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
376
    WebProcess/WebPage/DrawingArea.cpp \
380
    WebProcess/WebPage/DrawingArea.cpp \
- WebKit2/Shared/APIObject.h -1 / +2 lines
Lines 34-41 class APIObject : public RefCounted<APIO WebKit2/Shared/APIObject.h_sec1
34
public:
34
public:
35
    enum Type {
35
    enum Type {
36
        // Base types
36
        // Base types
37
        TypeNull,
37
        TypeNull = 0,
38
        TypeArray,
38
        TypeArray,
39
        TypeCertificateInfo,
39
        TypeData,
40
        TypeData,
40
        TypeDictionary,
41
        TypeDictionary,
41
        TypeError,
42
        TypeError,
- WebKit2/Shared/WebCertificateInfo.h +59 lines
Line 0 WebKit2/Shared/WebCertificateInfo.h_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef WebCertificateInfo_h
27
#define WebCertificateInfo_h
28
29
#include "APIObject.h"
30
#include "PlatformCertificateInfo.h"
31
#include <wtf/PassRefPtr.h>
32
33
namespace WebKit {
34
35
class WebCertificateInfo : public APIObject {
36
public:
37
    static const Type APIType = TypeCertificateInfo;
38
39
    static PassRefPtr<WebCertificateInfo> create()
40
    {
41
        return adoptRef(new WebCertificateInfo);
42
    }
43
44
    const PlatformCertificateInfo& platformCertificateInfo() const { return m_platformCertificateInfo; }
45
    void setPlatformCertificateInfo(const PlatformCertificateInfo& info) { m_platformCertificateInfo = info; }
46
47
private:
48
    WebCertificateInfo()
49
    {
50
    }
51
52
    virtual Type type() const { return APIType; }
53
54
    PlatformCertificateInfo m_platformCertificateInfo;
55
};
56
57
} // namespace WebKit
58
59
#endif // WebCertificateInfo_h
- WebKit2/Shared/mac/PlatformCertificateInfo.h +58 lines
Line 0 WebKit2/Shared/mac/PlatformCertificateInfo.h_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef PlatformCertificateInfo_h
27
#define PlatformCertificateInfo_h
28
29
#include <WebCore/ResourceResponse.h>
30
#include <wtf/RetainPtr.h>
31
32
namespace CoreIPC {
33
    class ArgumentDecoder;
34
    class ArgumentEncoder;
35
}
36
37
namespace WebKit {
38
39
class PlatformCertificateInfo {
40
public:
41
    PlatformCertificateInfo();
42
    explicit PlatformCertificateInfo(const WebCore::ResourceResponse&);
43
44
    CFArrayRef peerCertificates() const { return m_peerCertificates.get(); }
45
46
    void encode(CoreIPC::ArgumentEncoder* encoder) const;
47
    static bool decode(CoreIPC::ArgumentDecoder* decoder, PlatformCertificateInfo& t);
48
49
    // Debug routine.
50
    void dump() const;
51
52
private:
53
    RetainPtr<CFArrayRef> m_peerCertificates;
54
};
55
56
} // namespace WebKit
57
58
#endif // PlatformCertificateInfo_h
- WebKit2/Shared/mac/PlatformCertificateInfo.mm +109 lines
Line 0 WebKit2/Shared/mac/PlatformCertificateInfo.mm_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#include "PlatformCertificateInfo.h"
27
28
#include "ArgumentDecoder.h"
29
#include "ArgumentEncoder.h"
30
#include <WebKitSystemInterface.h>
31
#include <Security/Security.h>
32
33
using namespace WebCore;
34
35
namespace WebKit {
36
37
PlatformCertificateInfo::PlatformCertificateInfo()
38
{
39
}
40
41
PlatformCertificateInfo::PlatformCertificateInfo(const ResourceResponse& response)
42
{
43
    m_peerCertificates.adoptCF(WKCopyNSURLResponsePeerCertificates(response.nsURLResponse()));
44
}
45
46
void PlatformCertificateInfo::dump() const
47
{
48
    unsigned entries = m_peerCertificates ? CFArrayGetCount(m_peerCertificates.get()) : 0;
49
50
    NSLog(@"PlatformCertificateInfo\n");
51
    NSLog(@"  Entries: %d\n", entries);
52
    for (unsigned i = 0; i < entries; ++i) {
53
        RetainPtr<CFStringRef> summary(AdoptCF, SecCertificateCopySubjectSummary((SecCertificateRef)CFArrayGetValueAtIndex(m_peerCertificates.get(), i)));
54
        NSLog(@"  %@", (NSString *)summary.get());
55
    }
56
}
57
58
void PlatformCertificateInfo::encode(CoreIPC::ArgumentEncoder* encoder) const
59
{
60
    if (!m_peerCertificates) {
61
        encoder->encodeBool(false);
62
        return;
63
    } else
64
        encoder->encodeBool(true);
65
66
    uint64_t length = CFArrayGetCount(m_peerCertificates.get());
67
    encoder->encode(length);
68
69
    size_t totalSize = 0;
70
71
    for (size_t i = 0; i < length; ++i) {
72
        RetainPtr<CFDataRef> data(AdoptCF, SecCertificateCopyData((SecCertificateRef)CFArrayGetValueAtIndex(m_peerCertificates.get(), i)));
73
        encoder->encodeBytes(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
74
        totalSize += CFDataGetLength(data.get());
75
    }
76
    
77
    printf("PlatformCertificateInfo::encode Total Size %d", (int)totalSize);
78
}
79
80
bool PlatformCertificateInfo::decode(CoreIPC::ArgumentDecoder* decoder, PlatformCertificateInfo& c)
81
{
82
    bool hasCert;
83
    if (!decoder->decode(hasCert))
84
        return false;
85
86
    if (!hasCert)
87
        return true;
88
89
    uint64_t length;
90
    if (!decoder->decode(length))
91
        return false;
92
93
    RetainPtr<CFMutableArrayRef> array(AdoptCF, CFArrayCreateMutable(0, length, &kCFTypeArrayCallBacks));
94
95
    for (size_t i = 0; i < length; ++i) {
96
        Vector<uint8_t> bytes;
97
        if (!decoder->decodeBytes(bytes))
98
            return false;
99
100
        RetainPtr<CFDataRef> data(AdoptCF, CFDataCreateWithBytesNoCopy(0, bytes.data(), bytes.size(), kCFAllocatorNull));
101
        RetainPtr<SecCertificateRef> certificate(AdoptCF, SecCertificateCreateWithData(0, data.get()));
102
        CFArrayAppendValue(array.get(), certificate.get());
103
    }
104
105
    c.m_peerCertificates = array;
106
    return true;
107
}
108
109
} // namespace WebKit
- WebKit2/Shared/qt/PlatformCertificateInfo.h +56 lines
Line 0 WebKit2/Shared/qt/PlatformCertificateInfo.h_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef PlatformCertificateInfo_h
27
#define PlatformCertificateInfo_h
28
29
#include "ArgumentDecoder.h"
30
#include "ArgumentEncoder.h"
31
#include <WebCore/ResourceResponse.h>
32
33
namespace WebKit {
34
35
class PlatformCertificateInfo {
36
public:
37
    PlatformCertificateInfo()
38
    {
39
    }
40
41
    PlatformCertificateInfo(const WebCore::ResourceResponse&)
42
    {
43
    }
44
45
    void encode(CoreIPC::ArgumentEncoder*) const
46
    {
47
    }
48
49
    static bool decode(CoreIPC::ArgumentDecoder*, PlatformCertificateInfo&)
50
    {
51
    }
52
};
53
54
} // namespace WebKit
55
56
#endif // PlatformCertificateInfo_h
- WebKit2/Shared/win/PlatformCertificateInfo.h +57 lines
Line 0 WebKit2/Shared/win/PlatformCertificateInfo.h_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef PlatformCertificateInfo_h
27
#define PlatformCertificateInfo_h
28
29
#include "ArgumentDecoder.h"
30
#include "ArgumentEncoder.h"
31
#include <WebCore/ResourceResponse.h>
32
33
namespace WebKit {
34
35
class PlatformCertificateInfo {
36
public:
37
    PlatformCertificateInfo()
38
    {
39
    }
40
41
    PlatformCertificateInfo(const WebCore::ResourceResponse&)
42
    {
43
    }
44
45
    void encode(CoreIPC::ArgumentEncoder*) const
46
    {
47
    }
48
49
    static bool decode(CoreIPC::ArgumentDecoder*, PlatformCertificateInfo&)
50
    {
51
        
52
    }
53
};
54
55
} // namespace WebKit
56
57
#endif // PlatformCertificateInfo_h
- WebKit2/UIProcess/WebFrameProxy.cpp +7 lines
Lines 25-30 WebKit2/UIProcess/WebFrameProxy.cpp_sec1
25
25
26
#include "WebFrameProxy.h"
26
#include "WebFrameProxy.h"
27
27
28
#include "WebCertificateInfo.h"
28
#include "WebFormSubmissionListenerProxy.h"
29
#include "WebFormSubmissionListenerProxy.h"
29
#include "WebFramePolicyListenerProxy.h"
30
#include "WebFramePolicyListenerProxy.h"
30
#include "WebPageProxy.h"
31
#include "WebPageProxy.h"
Lines 37-42 namespace WebKit { WebKit2/UIProcess/WebFrameProxy.cpp_sec2
37
WebFrameProxy::WebFrameProxy(WebPageProxy* page, uint64_t frameID)
38
WebFrameProxy::WebFrameProxy(WebPageProxy* page, uint64_t frameID)
38
    : m_page(page)
39
    : m_page(page)
39
    , m_loadState(LoadStateFinished)
40
    , m_loadState(LoadStateFinished)
41
    , m_certificateInfo(WebCertificateInfo::create())
40
    , m_frameID(frameID)
42
    , m_frameID(frameID)
41
{
43
{
42
}
44
}
Lines 62-67 bool WebFrameProxy::isMainFrame() const WebKit2/UIProcess/WebFrameProxy.cpp_sec3
62
    return this == m_page->mainFrame();
64
    return this == m_page->mainFrame();
63
}
65
}
64
66
67
void WebFrameProxy::setPlatformCertificateInfo(const PlatformCertificateInfo& certificateInfo)
68
{
69
    m_certificateInfo->setPlatformCertificateInfo(certificateInfo);
70
}
71
65
void WebFrameProxy::didStartProvisionalLoad(const String& url)
72
void WebFrameProxy::didStartProvisionalLoad(const String& url)
66
{
73
{
67
    // FIXME: Add assertions.
74
    // FIXME: Add assertions.
- WebKit2/UIProcess/WebFrameProxy.h -2 / +8 lines
Lines 41-49 namespace CoreIPC { WebKit2/UIProcess/WebFrameProxy.h_sec1
41
41
42
namespace WebKit {
42
namespace WebKit {
43
43
44
class WebPageProxy;
44
class PlatformCertificateInfo;
45
class WebFramePolicyListenerProxy;
45
class WebCertificateInfo;
46
class WebFormSubmissionListenerProxy;
46
class WebFormSubmissionListenerProxy;
47
class WebFramePolicyListenerProxy;
48
class WebPageProxy;
47
49
48
class WebFrameProxy : public APIObject {
50
class WebFrameProxy : public APIObject {
49
public:
51
public:
Lines 72-77 public: WebKit2/UIProcess/WebFrameProxy.h_sec2
72
    const WTF::String& url() const { return m_url; }
74
    const WTF::String& url() const { return m_url; }
73
    const WTF::String& provisionalURL() const { return m_provisionalURL; }
75
    const WTF::String& provisionalURL() const { return m_provisionalURL; }
74
76
77
    void setPlatformCertificateInfo(const PlatformCertificateInfo&);
78
    WebCertificateInfo* certificateInfo() const { return m_certificateInfo.get(); }
79
75
    void didStartProvisionalLoad(const String& url);
80
    void didStartProvisionalLoad(const String& url);
76
    void didReceiveServerRedirectForProvisionalLoad(const String& url);
81
    void didReceiveServerRedirectForProvisionalLoad(const String& url);
77
    void didCommitLoad();
82
    void didCommitLoad();
Lines 91-96 private: WebKit2/UIProcess/WebFrameProxy.h_sec3
91
    LoadState m_loadState;
96
    LoadState m_loadState;
92
    WTF::String m_url;
97
    WTF::String m_url;
93
    WTF::String m_provisionalURL;
98
    WTF::String m_provisionalURL;
99
    RefPtr<WebCertificateInfo> m_certificateInfo;
94
    RefPtr<WebFrameListenerProxy> m_activeListener;
100
    RefPtr<WebFrameListenerProxy> m_activeListener;
95
    uint64_t m_frameID;
101
    uint64_t m_frameID;
96
};
102
};
- WebKit2/UIProcess/WebPageProxy.cpp -3 / +6 lines
Lines 28-33 WebKit2/UIProcess/WebPageProxy.cpp_sec1
28
#include "DrawingAreaProxy.h"
28
#include "DrawingAreaProxy.h"
29
#include "MessageID.h"
29
#include "MessageID.h"
30
#include "PageClient.h"
30
#include "PageClient.h"
31
#include "PlatformCertificateInfo.h"
31
#include "WebBackForwardList.h"
32
#include "WebBackForwardList.h"
32
#include "WebBackForwardListItem.h"
33
#include "WebBackForwardListItem.h"
33
#include "WebContext.h"
34
#include "WebContext.h"
Lines 555-563 void WebPageProxy::didReceiveMessage(Cor WebKit2/UIProcess/WebPageProxy.cpp_sec2
555
        }
556
        }
556
        case WebPageProxyMessage::DidCommitLoadForFrame: {
557
        case WebPageProxyMessage::DidCommitLoadForFrame: {
557
            uint64_t frameID;
558
            uint64_t frameID;
558
            if (!arguments->decode(frameID))
559
            PlatformCertificateInfo certificateInfo;
560
            if (!arguments->decode(CoreIPC::Out(frameID, certificateInfo)))
559
                return;
561
                return;
560
            didCommitLoadForFrame(process()->webFrame(frameID));
562
            didCommitLoadForFrame(process()->webFrame(frameID), certificateInfo);
561
            break;
563
            break;
562
        }
564
        }
563
        case WebPageProxyMessage::DidFinishDocumentLoadForFrame: {
565
        case WebPageProxyMessage::DidFinishDocumentLoadForFrame: {
Lines 933-940 void WebPageProxy::didFailProvisionalLoa WebKit2/UIProcess/WebPageProxy.cpp_sec3
933
    m_loaderClient.didFailProvisionalLoadWithErrorForFrame(this, frame);
935
    m_loaderClient.didFailProvisionalLoadWithErrorForFrame(this, frame);
934
}
936
}
935
937
936
void WebPageProxy::didCommitLoadForFrame(WebFrameProxy* frame)
938
void WebPageProxy::didCommitLoadForFrame(WebFrameProxy* frame, const PlatformCertificateInfo& certificateInfo)
937
{
939
{
940
    frame->setPlatformCertificateInfo(certificateInfo);
938
    frame->didCommitLoad();
941
    frame->didCommitLoad();
939
    m_loaderClient.didCommitLoadForFrame(this, frame);
942
    m_loaderClient.didCommitLoadForFrame(this, frame);
940
}
943
}
- WebKit2/UIProcess/WebPageProxy.h -1 / +2 lines
Lines 64-69 namespace WebKit { WebKit2/UIProcess/WebPageProxy.h_sec1
64
64
65
class DrawingAreaProxy;
65
class DrawingAreaProxy;
66
class PageClient;
66
class PageClient;
67
class PlatformCertificateInfo;
67
class WebBackForwardList;
68
class WebBackForwardList;
68
class WebBackForwardListItem;
69
class WebBackForwardListItem;
69
class WebData;
70
class WebData;
Lines 206-212 private: WebKit2/UIProcess/WebPageProxy.h_sec2
206
    void didStartProvisionalLoadForFrame(WebFrameProxy*, const String&);
207
    void didStartProvisionalLoadForFrame(WebFrameProxy*, const String&);
207
    void didReceiveServerRedirectForProvisionalLoadForFrame(WebFrameProxy*, const String&);
208
    void didReceiveServerRedirectForProvisionalLoadForFrame(WebFrameProxy*, const String&);
208
    void didFailProvisionalLoadForFrame(WebFrameProxy*);
209
    void didFailProvisionalLoadForFrame(WebFrameProxy*);
209
    void didCommitLoadForFrame(WebFrameProxy*);
210
    void didCommitLoadForFrame(WebFrameProxy*, const PlatformCertificateInfo&);
210
    void didFinishDocumentLoadForFrame(WebFrameProxy*);
211
    void didFinishDocumentLoadForFrame(WebFrameProxy*);
211
    void didFinishLoadForFrame(WebFrameProxy*);
212
    void didFinishLoadForFrame(WebFrameProxy*);
212
    void didFailLoadForFrame(WebFrameProxy*);
213
    void didFailLoadForFrame(WebFrameProxy*);
- WebKit2/UIProcess/API/C/WKAPICast.h +3 lines
Lines 47-52 class MutableArray; WebKit2/UIProcess/API/C/WKAPICast.h_sec1
47
class MutableDictionary;
47
class MutableDictionary;
48
class WebBackForwardList;
48
class WebBackForwardList;
49
class WebBackForwardListItem;
49
class WebBackForwardListItem;
50
class WebCertificateInfo;
50
class WebContext;
51
class WebContext;
51
class WebData;
52
class WebData;
52
class WebError;
53
class WebError;
Lines 66-71 template<> struct APITypeInfo<WKArrayRef WebKit2/UIProcess/API/C/WKAPICast.h_sec2
66
template<> struct APITypeInfo<WKBackForwardListItemRef>         { typedef WebBackForwardListItem* ImplType; };
67
template<> struct APITypeInfo<WKBackForwardListItemRef>         { typedef WebBackForwardListItem* ImplType; };
67
template<> struct APITypeInfo<WKBackForwardListRef>             { typedef WebBackForwardList* ImplType; };
68
template<> struct APITypeInfo<WKBackForwardListRef>             { typedef WebBackForwardList* ImplType; };
68
template<> struct APITypeInfo<WKBooleanRef>                     { typedef WebBoolean* ImplType; };
69
template<> struct APITypeInfo<WKBooleanRef>                     { typedef WebBoolean* ImplType; };
70
template<> struct APITypeInfo<WKCertificateInfoRef>             { typedef WebCertificateInfo* ImplType; };
69
template<> struct APITypeInfo<WKContextRef>                     { typedef WebContext* ImplType; };
71
template<> struct APITypeInfo<WKContextRef>                     { typedef WebContext* ImplType; };
70
template<> struct APITypeInfo<WKDataRef>                        { typedef WebData* ImplType; };
72
template<> struct APITypeInfo<WKDataRef>                        { typedef WebData* ImplType; };
71
template<> struct APITypeInfo<WKDictionaryRef>                  { typedef ImmutableDictionary* ImplType; };
73
template<> struct APITypeInfo<WKDictionaryRef>                  { typedef ImmutableDictionary* ImplType; };
Lines 97-102 template<> struct ImplTypeInfo<MutableDi WebKit2/UIProcess/API/C/WKAPICast.h_sec3
97
template<> struct ImplTypeInfo<WebBackForwardList*>             { typedef WKBackForwardListRef APIType; };
99
template<> struct ImplTypeInfo<WebBackForwardList*>             { typedef WKBackForwardListRef APIType; };
98
template<> struct ImplTypeInfo<WebBackForwardListItem*>         { typedef WKBackForwardListItemRef APIType; };
100
template<> struct ImplTypeInfo<WebBackForwardListItem*>         { typedef WKBackForwardListItemRef APIType; };
99
template<> struct ImplTypeInfo<WebBoolean*>                     { typedef WKBooleanRef APIType; };
101
template<> struct ImplTypeInfo<WebBoolean*>                     { typedef WKBooleanRef APIType; };
102
template<> struct ImplTypeInfo<WebCertificateInfo*>             { typedef WKCertificateInfoRef APIType; };
100
template<> struct ImplTypeInfo<WebContext*>                     { typedef WKContextRef APIType; };
103
template<> struct ImplTypeInfo<WebContext*>                     { typedef WKContextRef APIType; };
101
template<> struct ImplTypeInfo<WebData*>                        { typedef WKDataRef APIType; };
104
template<> struct ImplTypeInfo<WebData*>                        { typedef WKDataRef APIType; };
102
template<> struct ImplTypeInfo<WebDouble*>                      { typedef WKDoubleRef APIType; };
105
template<> struct ImplTypeInfo<WebDouble*>                      { typedef WKDoubleRef APIType; };
- WebKit2/UIProcess/API/C/WKBase.h +1 lines
Lines 44-49 typedef struct OpaqueWKDictionary* WKMut WebKit2/UIProcess/API/C/WKBase.h_sec1
44
typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
44
typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
45
typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
45
typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
46
typedef const struct OpaqueWKBoolean* WKBooleanRef;
46
typedef const struct OpaqueWKBoolean* WKBooleanRef;
47
typedef const struct OpaqueWKCertificateInfo* WKCertificateInfoRef;
47
typedef const struct OpaqueWKContext* WKContextRef;
48
typedef const struct OpaqueWKContext* WKContextRef;
48
typedef const struct OpaqueWKData* WKDataRef;
49
typedef const struct OpaqueWKData* WKDataRef;
49
typedef const struct OpaqueWKDouble* WKDoubleRef;
50
typedef const struct OpaqueWKDouble* WKDoubleRef;
- WebKit2/UIProcess/API/C/WKCertificateInfo.cpp +36 lines
Line 0 WebKit2/UIProcess/API/C/WKCertificateInfo.cpp_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#include "WKCertificateInfo.h"
27
28
#include "WebCertificateInfo.h"
29
#include "WKAPICast.h"
30
31
using namespace WebKit;
32
33
WKTypeID WKCertificateInfoGetTypeID()
34
{
35
    return toRef(WebCertificateInfo::APIType);
36
}
- WebKit2/UIProcess/API/C/WKCertificateInfo.h +41 lines
Line 0 WebKit2/UIProcess/API/C/WKCertificateInfo.h_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef WKCertificateInfo_h
27
#define WKCertificateInfo_h
28
29
#include <WebKit2/WKBase.h>
30
31
#ifdef __cplusplus
32
extern "C" {
33
#endif
34
35
WK_EXPORT WKTypeID WKCertificateInfoGetTypeID();
36
37
#ifdef __cplusplus
38
}
39
#endif
40
41
#endif /* WKCertificateInfo_h */
- WebKit2/UIProcess/API/C/WKFrame.cpp +5 lines
Lines 70-72 WKPageRef WKFrameGetPage(WKFrameRef fram WebKit2/UIProcess/API/C/WKFrame.cpp_sec1
70
{
70
{
71
    return toRef(toWK(frameRef)->page());
71
    return toRef(toWK(frameRef)->page());
72
}
72
}
73
74
WKCertificateInfoRef WKFrameGetCertificateInfo(WKFrameRef frameRef)
75
{
76
    return toRef(toWK(frameRef)->certificateInfo());
77
}
- WebKit2/UIProcess/API/C/WKFrame.h +2 lines
Lines 52-57 WK_EXPORT WKURLRef WKFrameCopyURL(WKFram WebKit2/UIProcess/API/C/WKFrame.h_sec1
52
52
53
WK_EXPORT WKPageRef WKFrameGetPage(WKFrameRef frame);
53
WK_EXPORT WKPageRef WKFrameGetPage(WKFrameRef frame);
54
54
55
WK_EXPORT WKCertificateInfoRef WKFrameGetCertificateInfo(WKFrameRef frame);
56
55
#ifdef __cplusplus
57
#ifdef __cplusplus
56
}
58
}
57
#endif
59
#endif
- WebKit2/UIProcess/API/C/mac/WKCertificateInfoMac.h +42 lines
Line 0 WebKit2/UIProcess/API/C/mac/WKCertificateInfoMac.h_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#ifndef WKCertificateInfoMac_h
27
#define WKCertificateInfoMac_h
28
29
#include <Foundation/Foundation.h>
30
#include <WebKit2/WKBase.h>
31
32
#ifdef __cplusplus
33
extern "C" {
34
#endif
35
36
WK_EXPORT CFArrayRef WKCertificateInfoGetPeerCertificates(WKCertificateInfoRef certificateInfo);
37
38
#ifdef __cplusplus
39
}
40
#endif
41
42
#endif /* WKCertificateInfoMac_h */
- WebKit2/UIProcess/API/C/mac/WKCertificateInfoMac.mm +36 lines
Line 0 WebKit2/UIProcess/API/C/mac/WKCertificateInfoMac.mm_sec1
1
/*
2
 * Copyright (C) 2010 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1. Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 * 2. Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23
 * THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#include "WKCertificateInfoMac.h"
27
28
#include "WKAPICast.h"
29
#include "WebCertificateInfo.h"
30
31
using namespace WebKit;
32
33
CFArrayRef WKCertificateInfoGetPeerCertificates(WKCertificateInfoRef certificateInfoRef)
34
{
35
    return toWK(certificateInfoRef)->platformCertificateInfo().peerCertificates();
36
}
- WebKit2/WebKit2.xcodeproj/project.pbxproj -1 / +33 lines
Lines 336-341 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec1
336
		BCF50121123ED3B3005955AE /* ThreadLauncher.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF5011F123ED3B3005955AE /* ThreadLauncher.h */; };
336
		BCF50121123ED3B3005955AE /* ThreadLauncher.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF5011F123ED3B3005955AE /* ThreadLauncher.h */; };
337
		BCF50122123ED3B3005955AE /* ThreadLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF50120123ED3B3005955AE /* ThreadLauncher.cpp */; };
337
		BCF50122123ED3B3005955AE /* ThreadLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF50120123ED3B3005955AE /* ThreadLauncher.cpp */; };
338
		BCF501B4123EF602005955AE /* ThreadLauncherMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF501B3123EF602005955AE /* ThreadLauncherMac.mm */; };
338
		BCF501B4123EF602005955AE /* ThreadLauncherMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF501B3123EF602005955AE /* ThreadLauncherMac.mm */; };
339
		BCF505E71243047B005955AE /* PlatformCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF505E51243047B005955AE /* PlatformCertificateInfo.h */; };
340
		BCF505E81243047B005955AE /* PlatformCertificateInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */; };
341
		BCF5068512431861005955AE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
342
		BCF50724124328A9005955AE /* WKCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50722124328A9005955AE /* WKCertificateInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
343
		BCF50725124328A9005955AE /* WKCertificateInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF50723124328A9005955AE /* WKCertificateInfo.cpp */; };
344
		BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; };
345
		BCF5072E12432A97005955AE /* WKCertificateInfoMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF5072C12432A97005955AE /* WKCertificateInfoMac.h */; settings = {ATTRIBUTES = (Public, ); }; };
346
		BCF5072F12432A97005955AE /* WKCertificateInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF5072D12432A97005955AE /* WKCertificateInfoMac.mm */; };
339
		BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */; };
347
		BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */; };
340
		BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F851176CD6F00471A52 /* WebHistoryClient.h */; };
348
		BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F851176CD6F00471A52 /* WebHistoryClient.h */; };
341
		BCF69F9A1176CED600471A52 /* WebNavigationDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F981176CED600471A52 /* WebNavigationDataStore.h */; };
349
		BCF69F9A1176CED600471A52 /* WebNavigationDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F981176CED600471A52 /* WebNavigationDataStore.h */; };
Lines 720-725 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec2
720
		BCF5011F123ED3B3005955AE /* ThreadLauncher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLauncher.h; sourceTree = "<group>"; };
728
		BCF5011F123ED3B3005955AE /* ThreadLauncher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLauncher.h; sourceTree = "<group>"; };
721
		BCF50120123ED3B3005955AE /* ThreadLauncher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadLauncher.cpp; sourceTree = "<group>"; };
729
		BCF50120123ED3B3005955AE /* ThreadLauncher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadLauncher.cpp; sourceTree = "<group>"; };
722
		BCF501B3123EF602005955AE /* ThreadLauncherMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ThreadLauncherMac.mm; sourceTree = "<group>"; };
730
		BCF501B3123EF602005955AE /* ThreadLauncherMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ThreadLauncherMac.mm; sourceTree = "<group>"; };
731
		BCF505E51243047B005955AE /* PlatformCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCertificateInfo.h; sourceTree = "<group>"; };
732
		BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCertificateInfo.mm; sourceTree = "<group>"; };
733
		BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
734
		BCF50722124328A9005955AE /* WKCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKCertificateInfo.h; sourceTree = "<group>"; };
735
		BCF50723124328A9005955AE /* WKCertificateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKCertificateInfo.cpp; sourceTree = "<group>"; };
736
		BCF50726124329AA005955AE /* WebCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCertificateInfo.h; sourceTree = "<group>"; };
737
		BCF5072C12432A97005955AE /* WKCertificateInfoMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKCertificateInfoMac.h; sourceTree = "<group>"; };
738
		BCF5072D12432A97005955AE /* WKCertificateInfoMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKCertificateInfoMac.mm; sourceTree = "<group>"; };
723
		BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHistoryClient.cpp; sourceTree = "<group>"; };
739
		BCF69F841176CD6F00471A52 /* WebHistoryClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHistoryClient.cpp; sourceTree = "<group>"; };
724
		BCF69F851176CD6F00471A52 /* WebHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryClient.h; sourceTree = "<group>"; };
740
		BCF69F851176CD6F00471A52 /* WebHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryClient.h; sourceTree = "<group>"; };
725
		BCF69F981176CED600471A52 /* WebNavigationDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNavigationDataStore.h; sourceTree = "<group>"; };
741
		BCF69F981176CED600471A52 /* WebNavigationDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNavigationDataStore.h; sourceTree = "<group>"; };
Lines 763-768 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec3
763
				BC87DFAA1018101400564216 /* libicucore.dylib in Frameworks */,
779
				BC87DFAA1018101400564216 /* libicucore.dylib in Frameworks */,
764
				1AA1CC5D100FA1A10078DEBC /* QuartzCore.framework in Frameworks */,
780
				1AA1CC5D100FA1A10078DEBC /* QuartzCore.framework in Frameworks */,
765
				1A1C4EC810D06099005E67E7 /* WebCore.framework in Frameworks */,
781
				1A1C4EC810D06099005E67E7 /* WebCore.framework in Frameworks */,
782
				BCF5068512431861005955AE /* Security.framework in Frameworks */,
766
			);
783
			);
767
			runOnlyForDeploymentPostprocessing = 0;
784
			runOnlyForDeploymentPostprocessing = 0;
768
		};
785
		};
Lines 826-831 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec4
826
				BC87DFA91018101400564216 /* libicucore.dylib */,
843
				BC87DFA91018101400564216 /* libicucore.dylib */,
827
				1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */,
844
				1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */,
828
				1AA1C79A100E7FC50078DEBC /* WebCore.framework */,
845
				1AA1C79A100E7FC50078DEBC /* WebCore.framework */,
846
				BCF5068412431861005955AE /* Security.framework */,
829
			);
847
			);
830
			name = "Linked Frameworks";
848
			name = "Linked Frameworks";
831
			sourceTree = "<group>";
849
			sourceTree = "<group>";
Lines 942-947 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec5
942
				1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
960
				1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
943
				1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */,
961
				1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */,
944
				BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
962
				BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
963
				BCF50726124329AA005955AE /* WebCertificateInfo.h */,
945
				51578B821209ECEF00A37C4A /* WebData.h */,
964
				51578B821209ECEF00A37C4A /* WebData.h */,
946
				516A4A5B120A2CCD00C05B7F /* WebError.h */,
965
				516A4A5B120A2CCD00C05B7F /* WebError.h */,
947
				BC032DAF10F4380F0058C15A /* WebEvent.h */,
966
				BC032DAF10F4380F0058C15A /* WebEvent.h */,
Lines 951-963 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec6
951
				BC33DD671238464600360F3F /* WebNumber.h */,
970
				BC33DD671238464600360F3F /* WebNumber.h */,
952
				BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
971
				BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
953
				BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
972
				BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
973
				A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
954
				BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
974
				BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
955
				BCDB86C01200FB97007254BE /* WebURL.h */,
975
				BCDB86C01200FB97007254BE /* WebURL.h */,
956
				BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */,
976
				BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */,
957
				BCE2315B122C30CA00D5C35A /* WebURLRequest.h */,
977
				BCE2315B122C30CA00D5C35A /* WebURLRequest.h */,
958
				BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
978
				BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
959
				BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
979
				BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
960
				A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
961
			);
980
			);
962
			path = Shared;
981
			path = Shared;
963
			sourceTree = "<group>";
982
			sourceTree = "<group>";
Lines 1166-1171 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec7
1166
				BC646C1811DD399F006455B0 /* WKBackForwardListItem.cpp */,
1185
				BC646C1811DD399F006455B0 /* WKBackForwardListItem.cpp */,
1167
				BC646C1911DD399F006455B0 /* WKBackForwardListItem.h */,
1186
				BC646C1911DD399F006455B0 /* WKBackForwardListItem.h */,
1168
				BC0C376710F807B20076D7CB /* WKBase.h */,
1187
				BC0C376710F807B20076D7CB /* WKBase.h */,
1188
				BCF50723124328A9005955AE /* WKCertificateInfo.cpp */,
1189
				BCF50722124328A9005955AE /* WKCertificateInfo.h */,
1169
				BCB9E24A1120E15C00A137E0 /* WKContext.cpp */,
1190
				BCB9E24A1120E15C00A137E0 /* WKContext.cpp */,
1170
				BCB9E2491120E15C00A137E0 /* WKContext.h */,
1191
				BCB9E2491120E15C00A137E0 /* WKContext.h */,
1171
				BCC938E01180DE440085E5FE /* WKContextPrivate.h */,
1192
				BCC938E01180DE440085E5FE /* WKContextPrivate.h */,
Lines 1263-1268 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec8
1263
			isa = PBXGroup;
1284
			isa = PBXGroup;
1264
			children = (
1285
			children = (
1265
				1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */,
1286
				1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */,
1287
				BCF505E61243047B005955AE /* PlatformCertificateInfo.mm */,
1288
				BCF505E51243047B005955AE /* PlatformCertificateInfo.h */,
1266
				BC9E95D211449B0300870E71 /* UpdateChunk.cpp */,
1289
				BC9E95D211449B0300870E71 /* UpdateChunk.cpp */,
1267
				BC9E95D111449B0300870E71 /* UpdateChunk.h */,
1290
				BC9E95D111449B0300870E71 /* UpdateChunk.h */,
1268
				BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */,
1291
				BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */,
Lines 1448-1453 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec9
1448
		BCE23276122C718F00D5C35A /* mac */ = {
1471
		BCE23276122C718F00D5C35A /* mac */ = {
1449
			isa = PBXGroup;
1472
			isa = PBXGroup;
1450
			children = (
1473
			children = (
1474
				BCF5072C12432A97005955AE /* WKCertificateInfoMac.h */,
1475
				BCF5072D12432A97005955AE /* WKCertificateInfoMac.mm */,
1451
				BCE23277122C71AC00D5C35A /* WKURLRequestNS.h */,
1476
				BCE23277122C71AC00D5C35A /* WKURLRequestNS.h */,
1452
				BCE23278122C71AC00D5C35A /* WKURLRequestNS.mm */,
1477
				BCE23278122C71AC00D5C35A /* WKURLRequestNS.mm */,
1453
				BC90A1DE122DD8EE00CC8C50 /* WKURLResponseNS.h */,
1478
				BC90A1DE122DD8EE00CC8C50 /* WKURLResponseNS.h */,
Lines 1633-1638 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec10
1633
				BC33DE8E12385C3300360F3F /* WKNumber.h in Headers */,
1658
				BC33DE8E12385C3300360F3F /* WKNumber.h in Headers */,
1634
				BC33DF061238677F00360F3F /* WKSerializedScriptValue.h in Headers */,
1659
				BC33DF061238677F00360F3F /* WKSerializedScriptValue.h in Headers */,
1635
				BCF50121123ED3B3005955AE /* ThreadLauncher.h in Headers */,
1660
				BCF50121123ED3B3005955AE /* ThreadLauncher.h in Headers */,
1661
				BCF505E71243047B005955AE /* PlatformCertificateInfo.h in Headers */,
1662
				BCF50724124328A9005955AE /* WKCertificateInfo.h in Headers */,
1663
				BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */,
1664
				BCF5072E12432A97005955AE /* WKCertificateInfoMac.h in Headers */,
1636
			);
1665
			);
1637
			runOnlyForDeploymentPostprocessing = 0;
1666
			runOnlyForDeploymentPostprocessing = 0;
1638
		};
1667
		};
Lines 1880-1885 WebKit2/WebKit2.xcodeproj/project.pbxproj_sec11
1880
				BC33DE8F12385C3300360F3F /* WKNumber.cpp in Sources */,
1909
				BC33DE8F12385C3300360F3F /* WKNumber.cpp in Sources */,
1881
				BCF50122123ED3B3005955AE /* ThreadLauncher.cpp in Sources */,
1910
				BCF50122123ED3B3005955AE /* ThreadLauncher.cpp in Sources */,
1882
				BCF501B4123EF602005955AE /* ThreadLauncherMac.mm in Sources */,
1911
				BCF501B4123EF602005955AE /* ThreadLauncherMac.mm in Sources */,
1912
				BCF505E81243047B005955AE /* PlatformCertificateInfo.mm in Sources */,
1913
				BCF50725124328A9005955AE /* WKCertificateInfo.cpp in Sources */,
1914
				BCF5072F12432A97005955AE /* WKCertificateInfoMac.mm in Sources */,
1883
			);
1915
			);
1884
			runOnlyForDeploymentPostprocessing = 0;
1916
			runOnlyForDeploymentPostprocessing = 0;
1885
		};
1917
		};
- WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -1 / +4 lines
Lines 30-35 WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp_sec1
30
30
31
#include "InjectedBundleUserMessageCoders.h"
31
#include "InjectedBundleUserMessageCoders.h"
32
#include "NetscapePlugin.h"
32
#include "NetscapePlugin.h"
33
#include "PlatformCertificateInfo.h"
33
#include "PluginView.h"
34
#include "PluginView.h"
34
#include "WebCoreArgumentCoders.h"
35
#include "WebCoreArgumentCoders.h"
35
#include "WebErrors.h"
36
#include "WebErrors.h"
Lines 309-319 void WebFrameLoaderClient::dispatchDidCo WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp_sec2
309
    if (!webPage)
310
    if (!webPage)
310
        return;
311
        return;
311
312
313
    const ResourceResponse& response = m_frame->coreFrame()->loader()->documentLoader()->response();
314
312
    // Notify the bundle client.
315
    // Notify the bundle client.
313
    webPage->injectedBundleLoaderClient().didCommitLoadForFrame(webPage, m_frame);
316
    webPage->injectedBundleLoaderClient().didCommitLoadForFrame(webPage, m_frame);
314
317
315
    // Notify the UIProcess.
318
    // Notify the UIProcess.
316
    WebProcess::shared().connection()->send(WebPageProxyMessage::DidCommitLoadForFrame, webPage->pageID(), CoreIPC::In(m_frame->frameID()));
319
    WebProcess::shared().connection()->send(WebPageProxyMessage::DidCommitLoadForFrame, webPage->pageID(), CoreIPC::In(m_frame->frameID(), PlatformCertificateInfo(response)));
317
}
320
}
318
321
319
void WebFrameLoaderClient::dispatchDidFailProvisionalLoad(const ResourceError& error)
322
void WebFrameLoaderClient::dispatchDidFailProvisionalLoad(const ResourceError& error)
- WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h -2 / +1 lines
Lines 205-213 private: WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h_sec1
205
    virtual bool shouldUsePluginDocument(const WTF::String& /*mimeType*/) const;
205
    virtual bool shouldUsePluginDocument(const WTF::String& /*mimeType*/) const;
206
    
206
    
207
    virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext();
207
    virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext();
208
    
208
209
    WebFrame* m_frame;
209
    WebFrame* m_frame;
210
    
211
    RefPtr<PluginView> m_pluginView;
210
    RefPtr<PluginView> m_pluginView;
212
    bool m_hasSentResponseToPluginView;
211
    bool m_hasSentResponseToPluginView;
213
};
212
};
- WebKit2/win/WebKit2.vcproj +16 lines
Lines 461-466 WebKit2/win/WebKit2.vcproj_sec1
461
				>
461
				>
462
			</File>
462
			</File>
463
			<File
463
			<File
464
				RelativePath="..\Shared\WebCertificateInfo.h"
465
				>
466
			</File>
467
			<File
464
				RelativePath="..\Shared\WebEvent.h"
468
				RelativePath="..\Shared\WebEvent.h"
465
				>
469
				>
466
			</File>
470
			</File>
Lines 576-581 WebKit2/win/WebKit2.vcproj_sec2
576
					>
580
					>
577
				</File>
581
				</File>
578
				<File
582
				<File
583
					RelativePath="..\Shared\win\PlatformCertificateInfo.h"
584
					>
585
				</File>
586
				<File
579
					RelativePath="..\Shared\win\WebURLRequestWin.cpp"
587
					RelativePath="..\Shared\win\WebURLRequestWin.cpp"
580
					>
588
					>
581
					<FileConfiguration
589
					<FileConfiguration
Lines 1331-1336 WebKit2/win/WebKit2.vcproj_sec3
1331
						>
1339
						>
1332
					</File>
1340
					</File>
1333
					<File
1341
					<File
1342
						RelativePath="..\UIProcess\API\C\WKCertificateInfo.cpp"
1343
						>
1344
					</File>
1345
					<File
1346
						RelativePath="..\UIProcess\API\C\WKCertificateInfo.h"
1347
						>
1348
					</File>
1349
					<File
1334
						RelativePath="..\UIProcess\API\C\WKContext.cpp"
1350
						RelativePath="..\UIProcess\API\C\WKContext.cpp"
1335
						>
1351
						>
1336
					</File>
1352
					</File>
- WebKit2/win/WebKit2Generated.make +1 lines
Lines 6-11 all: WebKit2/win/WebKit2Generated.make_sec1
6
    xcopy /y /d "..\UIProcess\API\C\WKBackForwardList.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
6
    xcopy /y /d "..\UIProcess\API\C\WKBackForwardList.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
7
    xcopy /y /d "..\UIProcess\API\C\WKBackForwardListItem.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
7
    xcopy /y /d "..\UIProcess\API\C\WKBackForwardListItem.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
8
    xcopy /y /d "..\UIProcess\API\C\WKBase.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
8
    xcopy /y /d "..\UIProcess\API\C\WKBase.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
9
    xcopy /y /d "..\UIProcess\API\C\WKCertificateInfo.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
9
    xcopy /y /d "..\UIProcess\API\C\WKContext.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
10
    xcopy /y /d "..\UIProcess\API\C\WKContext.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
10
    xcopy /y /d "..\UIProcess\API\C\WKContextPrivate.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
11
    xcopy /y /d "..\UIProcess\API\C\WKContextPrivate.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
11
    xcopy /y /d "..\UIProcess\API\C\WKData.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
12
    xcopy /y /d "..\UIProcess\API\C\WKData.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"

Return to Bug 45998