diff options
Diffstat (limited to 'Source/WebCore/platform/cf')
-rw-r--r-- | Source/WebCore/platform/cf/BinaryPropertyList.cpp | 2 | ||||
-rw-r--r-- | Source/WebCore/platform/cf/SchedulePair.h | 2 | ||||
-rw-r--r-- | Source/WebCore/platform/cf/SharedBufferCF.cpp | 26 | ||||
-rw-r--r-- | Source/WebCore/platform/cf/win/CertificateCFWin.cpp | 52 | ||||
-rw-r--r-- | Source/WebCore/platform/cf/win/CertificateCFWin.h | 38 |
5 files changed, 118 insertions, 2 deletions
diff --git a/Source/WebCore/platform/cf/BinaryPropertyList.cpp b/Source/WebCore/platform/cf/BinaryPropertyList.cpp index 41769e8..65be70a 100644 --- a/Source/WebCore/platform/cf/BinaryPropertyList.cpp +++ b/Source/WebCore/platform/cf/BinaryPropertyList.cpp @@ -92,7 +92,7 @@ struct IntegerArrayHash { unsigned IntegerArrayHash::hash(const IntegerArray& array) { - return WTF::StringHasher::createBlobHash(array.integers(), array.size()); + return StringHasher::hashMemory(array.integers(), array.size() * sizeof(int)); } bool IntegerArrayHash::equal(const IntegerArray& a, const IntegerArray& b) diff --git a/Source/WebCore/platform/cf/SchedulePair.h b/Source/WebCore/platform/cf/SchedulePair.h index 8361856..cb34d7d 100644 --- a/Source/WebCore/platform/cf/SchedulePair.h +++ b/Source/WebCore/platform/cf/SchedulePair.h @@ -73,7 +73,7 @@ struct SchedulePairHash { static unsigned hash(const RefPtr<SchedulePair>& pair) { uintptr_t hashCodes[2] = { reinterpret_cast<uintptr_t>(pair->runLoop()), pair->mode() ? CFHash(pair->mode()) : 0 }; - return WTF::StringHasher::createBlobHash<sizeof(hashCodes)>(hashCodes); + return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes); } static bool equal(const RefPtr<SchedulePair>& a, const RefPtr<SchedulePair>& b) { return a == b; } diff --git a/Source/WebCore/platform/cf/SharedBufferCF.cpp b/Source/WebCore/platform/cf/SharedBufferCF.cpp index 18a65c2..319f484 100644 --- a/Source/WebCore/platform/cf/SharedBufferCF.cpp +++ b/Source/WebCore/platform/cf/SharedBufferCF.cpp @@ -91,4 +91,30 @@ void SharedBuffer::clearPlatformData() m_cfData = 0; } +#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK) +void SharedBuffer::append(CFDataRef data) +{ + ASSERT(data); + m_dataArray.append(data); + m_size += CFDataGetLength(data); +} + +void SharedBuffer::copyDataArrayAndClear(char *destination, unsigned bytesToCopy) const +{ + if (m_dataArray.isEmpty()) + return; + + CFIndex bytesLeft = bytesToCopy; + Vector<RetainPtr<CFDataRef> >::const_iterator end = m_dataArray.end(); + for (Vector<RetainPtr<CFDataRef> >::const_iterator it = m_dataArray.begin(); it != end; ++it) { + CFIndex dataLen = CFDataGetLength(it->get()); + ASSERT(bytesLeft >= dataLen); + memcpy(destination, CFDataGetBytePtr(it->get()), dataLen); + destination += dataLen; + bytesLeft -= dataLen; + } + m_dataArray.clear(); +} +#endif + } diff --git a/Source/WebCore/platform/cf/win/CertificateCFWin.cpp b/Source/WebCore/platform/cf/win/CertificateCFWin.cpp new file mode 100644 index 0000000..88ea933 --- /dev/null +++ b/Source/WebCore/platform/cf/win/CertificateCFWin.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2011 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "CertificateCFWin.h" + +namespace WebCore { + +static void deallocCertContext(void* ptr, void* info) +{ + if (ptr) + CertFreeCertificateContext(static_cast<PCCERT_CONTEXT>(ptr)); +} + +static CFAllocatorRef createCertContextDeallocator() +{ + CFAllocatorContext allocContext = { + 0, 0, 0, 0, 0, 0, 0, deallocCertContext, 0 + }; + return CFAllocatorCreate(kCFAllocatorDefault, &allocContext); +} + +RetainPtr<CFDataRef> copyCertificateToData(PCCERT_CONTEXT certificate) +{ + static CFAllocatorRef certDealloc = createCertContextDeallocator(); + PCCERT_CONTEXT certificateCopy = CertDuplicateCertificateContext(certificate); + return RetainPtr<CFDataRef>(AdoptCF, CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(certificateCopy), sizeof(*certificateCopy), certDealloc)); +} + +} // namespace WebCore diff --git a/Source/WebCore/platform/cf/win/CertificateCFWin.h b/Source/WebCore/platform/cf/win/CertificateCFWin.h new file mode 100644 index 0000000..b3ada0d --- /dev/null +++ b/Source/WebCore/platform/cf/win/CertificateCFWin.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2011 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef CertificateCFWin_h +#define CertificateCFWin_h + +#include <windows.h> +#include <wtf/RetainPtr.h> + +namespace WebCore { + +RetainPtr<CFDataRef> copyCertificateToData(PCCERT_CONTEXT); + +} // namespace WebCore + +#endif // CertificateCFWin_h |