From 3749d61e1f7a59f5ec5067e560af1eb610c82015 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 12 Aug 2012 09:27:39 +0200 Subject: Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365) New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream --- .../UIProcess/API/cpp/efl/WKEinaSharedString.cpp | 102 +++++++++++++++++++++ .../UIProcess/API/cpp/efl/WKEinaSharedString.h | 69 ++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp create mode 100644 Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h (limited to 'Source/WebKit2/UIProcess/API/cpp') diff --git a/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp new file mode 100644 index 000000000..d2681203c --- /dev/null +++ b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2012 Intel Corporation. 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 "WKEinaSharedString.h" + +#include +#include +#include +#include + +using namespace WebKit; + +template +ALWAYS_INLINE const char* fromRefType(WKRefType strRef, bool adopt = false) +{ + const char* res = 0; + if (strRef) { + res = eina_stringshare_add(toImpl(strRef)->string().utf8().data()); + ASSERT(res); + if (adopt) + WKRelease(strRef); + } + + return res; +} + +WKEinaSharedString::WKEinaSharedString(const WKEinaSharedString& other) + : m_string(eina_stringshare_ref(other.m_string)) +{ +} + +WKEinaSharedString::WKEinaSharedString(const char* str) + : m_string(eina_stringshare_add(str)) +{ +} + +WKEinaSharedString::WKEinaSharedString(WKAdoptTag adoptTag, WKStringRef stringRef) + : m_string(fromRefType(stringRef, /*adopt*/ true)) +{ + ASSERT(adoptTag == AdoptWK); // Guard for future enum changes. +} + +WKEinaSharedString::WKEinaSharedString(WKStringRef stringRef) + : m_string(fromRefType(stringRef)) +{ +} + +WKEinaSharedString::WKEinaSharedString(WKAdoptTag adoptTag, WKURLRef urlRef) + : m_string(fromRefType(urlRef, /*adopt*/ true)) +{ + ASSERT(adoptTag == AdoptWK); // Guard for future enum changes. +} + +WKEinaSharedString::WKEinaSharedString(WKURLRef urlRef) + : m_string(fromRefType(urlRef)) +{ +} + +WKEinaSharedString::~WKEinaSharedString() +{ + if (m_string) + eina_stringshare_del(m_string); +} + +WKEinaSharedString& WKEinaSharedString::operator=(const WKEinaSharedString& other) +{ + if (this != &other) { + if (m_string) + eina_stringshare_del(m_string); + m_string = eina_stringshare_ref(other.m_string); + } + return *this; +} + +WKEinaSharedString& WKEinaSharedString::operator=(const char* str) +{ + eina_stringshare_replace(&m_string, str); + return *this; +} diff --git a/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h new file mode 100644 index 000000000..83f661418 --- /dev/null +++ b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2012 Intel Corporation. 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 WKEinaSharedString_h +#define WKEinaSharedString_h + +#include +#include +#include + +namespace WebKit { + +class WK_EXPORT WKEinaSharedString { +public: + ALWAYS_INLINE WKEinaSharedString() : m_string(0) { } + WKEinaSharedString(const WKEinaSharedString& other); + WKEinaSharedString(const char* str); + + WKEinaSharedString(WKAdoptTag, WKStringRef); + WKEinaSharedString(WKStringRef); + + WKEinaSharedString(WKAdoptTag, WKURLRef); + WKEinaSharedString(WKURLRef); + + ~WKEinaSharedString(); + + WKEinaSharedString& operator=(const WKEinaSharedString& other); + WKEinaSharedString& operator=(const char* str); + + ALWAYS_INLINE bool operator==(const WKEinaSharedString& other) const { return this->m_string == other.m_string; } + ALWAYS_INLINE bool operator!=(const WKEinaSharedString& other) const { return !(*this == other); } + + ALWAYS_INLINE operator const char* () const { return m_string; } + + ALWAYS_INLINE bool isNull() const { return !m_string; } + + ALWAYS_INLINE size_t length() const { return m_string ? static_cast(eina_stringshare_strlen(m_string)) : 0; } + +private: + const char* m_string; +}; + +} // namespace WebKit + +using WebKit::WKEinaSharedString; + +#endif // WKEinaSharedString_h -- cgit v1.2.1