Diff
Modified: trunk/Source/WebKit2/ChangeLog (125034 => 125035)
--- trunk/Source/WebKit2/ChangeLog 2012-08-08 14:09:29 UTC (rev 125034)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-08 14:40:54 UTC (rev 125035)
@@ -1,3 +1,21 @@
+2012-08-08 Mikhail Pozdnyakov <[email protected]>
+
+ [EFL] EFL Webkit needs a class wrapping eina stringshare
+ https://bugs.webkit.org/show_bug.cgi?id=93229
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Added a new auxiliary class wrapping Eina Stringshare and providing
+ more convenient C++ interface for using it.
+
+ * PlatformEfl.cmake:
+ * UIProcess/API/cpp/efl/WKEinaSharedString.cpp: Added.
+ (:m_string):
+ (WKEinaSharedString::~WKEinaSharedString):
+ (WKEinaSharedString::operator=):
+ * UIProcess/API/cpp/efl/WKEinaSharedString.h: Added.
+ (WebKit):
+
2012-08-08 Balazs Kelemen <[email protected]>
[Qt] Snowshoe desktop crashes when opening a new tab
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (125034 => 125035)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-08-08 14:09:29 UTC (rev 125034)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-08-08 14:40:54 UTC (rev 125035)
@@ -33,6 +33,8 @@
Shared/soup/WebCoreArgumentCodersSoup.cpp
UIProcess/API/C/efl/WKView.cpp
+
+ UIProcess/API/cpp/efl/WKEinaSharedString.cpp
UIProcess/API/C/soup/WKContextSoup.cpp
UIProcess/API/C/soup/WKSoupRequestManager.cpp
@@ -124,6 +126,7 @@
"${WEBKIT2_DIR}/Shared/soup"
"${WEBKIT2_DIR}/UIProcess/API/C/efl"
"${WEBKIT2_DIR}/UIProcess/API/C/soup"
+ "${WEBKIT2_DIR}/UIProcess/API/cpp/efl"
"${WEBKIT2_DIR}/UIProcess/API/efl"
"${WEBKIT2_DIR}/UIProcess/soup"
"${WEBKIT2_DIR}/WebProcess/Downloads/soup"
Added: trunk/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp (0 => 125035)
--- trunk/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp 2012-08-08 14:40:54 UTC (rev 125035)
@@ -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 <WebKit2/WKAPICast.h>
+#include <WebKit2/WKString.h>
+#include <WebKit2/WKURL.h>
+#include <wtf/text/CString.h>
+
+using namespace WebKit;
+
+template <typename WKRefType>
+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;
+}
Added: trunk/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h (0 => 125035)
--- trunk/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h 2012-08-08 14:40:54 UTC (rev 125035)
@@ -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 <Eina.h>
+#include <WebKit2/WKBase.h>
+#include <WebKit2/WKRetainPtr.h>
+
+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<size_t>(eina_stringshare_strlen(m_string)) : 0; }
+
+private:
+ const char* m_string;
+};
+
+} // namespace WebKit
+
+using WebKit::WKEinaSharedString;
+
+#endif // WKEinaSharedString_h
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp (125034 => 125035)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp 2012-08-08 14:09:29 UTC (rev 125034)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp 2012-08-08 14:40:54 UTC (rev 125035)
@@ -28,43 +28,10 @@
#include "WKAPICast.h"
#include "WKBackForwardListItem.h"
-#include "WKRetainPtr.h"
-#include "WKString.h"
-#include "WKURL.h"
-#include <wtf/text/CString.h>
+#include "WKEinaSharedString.h"
using namespace WebKit;
-class WKEinaSharedString {
-public:
- template <typename WKRefType>
- WKEinaSharedString(WKAdoptTag, WKRefType strRef)
- : m_string(0)
- {
- if (strRef) {
- m_string = eina_stringshare_add(toImpl(strRef)->string().utf8().data());
- ASSERT(m_string);
- WKRelease(strRef); // Have stored a copy into eina_stringshare, do not need adopted strRef.
- }
- }
-
- template <typename WKRefType>
- WKEinaSharedString(WKRefType strRef)
- : m_string(0)
- {
- if (strRef) {
- m_string = eina_stringshare_add(toImpl(strRef)->string().utf8().data());
- ASSERT(m_string);
- }
- }
-
- ~WKEinaSharedString() { eina_stringshare_del(m_string); }
- inline operator const char* () const { return m_string; }
-
-private:
- const char* m_string;
-};
-
/**
* \struct _Ewk_Back_Forward_List
* @brief Contains the Back Forward List data.
