From 8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 3 Mar 2009 19:30:52 -0800 Subject: auto import from //depot/cupcake/@135843 --- WebCore/platform/cf/FileSystemCF.cpp | 57 ++++++++++++++++++++ WebCore/platform/cf/KURLCFNet.cpp | 95 ++++++++++++++++++++++++++++++++++ WebCore/platform/cf/SchedulePair.cpp | 52 +++++++++++++++++++ WebCore/platform/cf/SchedulePair.h | 88 +++++++++++++++++++++++++++++++ WebCore/platform/cf/SharedBufferCF.cpp | 84 ++++++++++++++++++++++++++++++ 5 files changed, 376 insertions(+) create mode 100644 WebCore/platform/cf/FileSystemCF.cpp create mode 100644 WebCore/platform/cf/KURLCFNet.cpp create mode 100644 WebCore/platform/cf/SchedulePair.cpp create mode 100644 WebCore/platform/cf/SchedulePair.h create mode 100644 WebCore/platform/cf/SharedBufferCF.cpp (limited to 'WebCore/platform/cf') diff --git a/WebCore/platform/cf/FileSystemCF.cpp b/WebCore/platform/cf/FileSystemCF.cpp new file mode 100644 index 0000000..b6cc645 --- /dev/null +++ b/WebCore/platform/cf/FileSystemCF.cpp @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2007 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. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE 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 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. + */ +#import "config.h" +#import "FileSystem.h" + +#import "CString.h" +#import "PlatformString.h" +#import + +namespace WebCore { + +CString fileSystemRepresentation(const String& path) +{ + RetainPtr cfString(AdoptCF, path.createCFString()); + + if (!cfString) + return CString(); + + CFIndex size = CFStringGetMaximumSizeOfFileSystemRepresentation(cfString.get()); + + char* buffer; + CString string = CString::newUninitialized(size, buffer); + + if (!CFStringGetFileSystemRepresentation(cfString.get(), buffer, size)) { + LOG_ERROR("Failed to get filesystem representation to create CString from cfString"); + return CString(); + } + + return string; +} + +} // namespace WebCore diff --git a/WebCore/platform/cf/KURLCFNet.cpp b/WebCore/platform/cf/KURLCFNet.cpp new file mode 100644 index 0000000..f060b28 --- /dev/null +++ b/WebCore/platform/cf/KURLCFNet.cpp @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2004, 2008 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 COMPUTER, INC. ``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 COMPUTER, INC. OR + * 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 "KURL.h" + +#include +#include + +using namespace std; + +namespace WebCore { + +KURL::KURL(CFURLRef url) +{ + if (!url) { + parse(0, 0); + return; + } + + CFIndex bytesLength = CFURLGetBytes(url, 0, 0); + Vector buffer(bytesLength + 6); // 5 for "file:", 1 for null character to end C string + char* bytes = &buffer[5]; + CFURLGetBytes(url, reinterpret_cast(bytes), bytesLength); + bytes[bytesLength] = '\0'; + if (bytes[0] != '/') { + parse(bytes, 0); + return; + } + + buffer[0] = 'f'; + buffer[1] = 'i'; + buffer[2] = 'l'; + buffer[3] = 'e'; + buffer[4] = ':'; + + parse(buffer.data(), 0); +} + +CFURLRef KURL::createCFURL() const +{ + // FIXME: What should this return for invalid URLs? + // Currently it throws away the high bytes of the characters in the string in that case, + // which is clearly wrong. + + Vector buffer; + copyToBuffer(buffer); + + // NOTE: We use UTF-8 here since this encoding is used when computing strings when returning URL components + // (e.g calls to NSURL -path). However, this function is not tolerant of illegal UTF-8 sequences, which + // could either be a malformed string or bytes in a different encoding, like Shift-JIS, so we fall back + // onto using ISO Latin-1 in those cases. + CFURLRef result = CFURLCreateAbsoluteURLWithBytes(0, reinterpret_cast(buffer.data()), buffer.size(), kCFStringEncodingUTF8, 0, true); + if (!result) + result = CFURLCreateAbsoluteURLWithBytes(0, reinterpret_cast(buffer.data()), buffer.size(), kCFStringEncodingISOLatin1, 0, true); + return result; +} + +String KURL::fileSystemPath() const +{ + RetainPtr cfURL(AdoptCF, createCFURL()); + if (!cfURL) + return String(); + +#if PLATFORM(WIN) + CFURLPathStyle pathStyle = kCFURLWindowsPathStyle; +#else + CFURLPathStyle pathStyle = kCFURLPOSIXPathStyle; +#endif + return RetainPtr(AdoptCF, CFURLCopyFileSystemPath(cfURL.get(), pathStyle)).get(); +} + +} diff --git a/WebCore/platform/cf/SchedulePair.cpp b/WebCore/platform/cf/SchedulePair.cpp new file mode 100644 index 0000000..ee5ae95 --- /dev/null +++ b/WebCore/platform/cf/SchedulePair.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2008 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. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "SchedulePair.h" + +namespace WebCore { + +SchedulePair::SchedulePair(CFRunLoopRef runLoop, CFStringRef mode) + : m_runLoop(runLoop) +{ + if (mode) + m_mode.adoptCF(CFStringCreateCopy(0, mode)); +} + +bool SchedulePair::operator==(const SchedulePair& other) const +{ + if (runLoop() != other.runLoop()) + return false; + CFStringRef thisMode = mode(); + CFStringRef otherMode = other.mode(); + if (!thisMode || !otherMode) + return thisMode == otherMode; + return CFEqual(thisMode, otherMode); +} + +} // namespace diff --git a/WebCore/platform/cf/SchedulePair.h b/WebCore/platform/cf/SchedulePair.h new file mode 100644 index 0000000..ed58406 --- /dev/null +++ b/WebCore/platform/cf/SchedulePair.h @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2008 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. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 SchedulePair_h +#define SchedulePair_h + +#include "PlatformString.h" +#include +#include + +#if PLATFORM(MAC) +#ifdef __OBJC__ +@class NSRunLoop; +#else +class NSRunLoop; +#endif +#endif + +namespace WebCore { + +class SchedulePair : public RefCounted { +public: + static PassRefPtr create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); } + +#if PLATFORM(MAC) + static PassRefPtr create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); } + NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); } +#endif + + CFRunLoopRef runLoop() const { return m_runLoop.get(); } + CFStringRef mode() const { return m_mode.get(); } + + bool operator==(const SchedulePair& other) const; + +private: + SchedulePair(CFRunLoopRef, CFStringRef); + +#if PLATFORM(MAC) + SchedulePair(NSRunLoop*, CFStringRef); + RetainPtr m_nsRunLoop; +#endif + + RetainPtr m_runLoop; + RetainPtr m_mode; +}; + +struct SchedulePairHash { + static unsigned hash(const RefPtr& pair) + { + uintptr_t hashCodes[2] = { reinterpret_cast(pair->runLoop()), pair->mode() ? CFHash(pair->mode()) : 0 }; + return StringImpl::computeHash(reinterpret_cast(hashCodes), sizeof(hashCodes) / sizeof(UChar)); + } + + static bool equal(const RefPtr& a, const RefPtr& b) { return a == b; } + + static const bool safeToCompareToEmptyOrDeleted = true; +}; + +typedef HashSet, SchedulePairHash> SchedulePairHashSet; + +} // namespace WebCore + +#endif diff --git a/WebCore/platform/cf/SharedBufferCF.cpp b/WebCore/platform/cf/SharedBufferCF.cpp new file mode 100644 index 0000000..c0e471a --- /dev/null +++ b/WebCore/platform/cf/SharedBufferCF.cpp @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2008 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. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "SharedBuffer.h" + +namespace WebCore { + +SharedBuffer::SharedBuffer(CFDataRef cfData) + : m_cfData(cfData) +{ +} + +// Mac is a CF platform but has an even more efficient version of this method, +// so only use this version for non-Mac +#if !PLATFORM(MAC) +CFDataRef SharedBuffer::createCFData() +{ + if (m_cfData) { + CFRetain(m_cfData.get()); + return m_cfData.get(); + } + + return CFDataCreate(0, reinterpret_cast(m_buffer.data()), m_buffer.size()); +} +#endif + +bool SharedBuffer::hasPlatformData() const +{ + return m_cfData; +} + +const char* SharedBuffer::platformData() const +{ + return (const char*)CFDataGetBytePtr(m_cfData.get()); +} + +unsigned SharedBuffer::platformDataSize() const +{ + return CFDataGetLength(m_cfData.get()); +} + +void SharedBuffer::maybeTransferPlatformData() +{ + if (!m_cfData) + return; + + ASSERT(m_buffer.size() == 0); + + m_buffer.append((const char*)CFDataGetBytePtr(m_cfData.get()), CFDataGetLength(m_cfData.get())); + + m_cfData = 0; +} + +void SharedBuffer::clearPlatformData() +{ + m_cfData = 0; +} + +} -- cgit v1.1