diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit/win/WebError.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit/win/WebError.cpp')
| -rw-r--r-- | Source/WebKit/win/WebError.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebKit/win/WebError.cpp b/Source/WebKit/win/WebError.cpp index c9f1dff..16006ff 100644 --- a/Source/WebKit/win/WebError.cpp +++ b/Source/WebKit/win/WebError.cpp @@ -28,9 +28,7 @@ #include "WebError.h" #include "WebKit.h" -#pragma warning(push, 0) #include <WebCore/BString.h> -#pragma warning(pop) #if USE(CFNETWORK) #include <WebKitSystemInterface/WebKitSystemInterface.h> @@ -227,7 +225,7 @@ HRESULT STDMETHODCALLTYPE WebError::sslPeerCertificate( if (!m_cfErrorUserInfoDict) return E_FAIL; - void* data = wkGetSSLPeerCertificateData(m_cfErrorUserInfoDict.get()); + void* data = wkGetSSLPeerCertificateDataBytePtr(m_cfErrorUserInfoDict.get()); if (!data) return E_FAIL; *result = (OLE_HANDLE)(ULONG64)data; |