From 88a04ac016f57c2d78e714682445dff2e7db4ade Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 11 Sep 2012 19:54:20 +0200 Subject: Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206) This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection and allow for further simplifications in the future --- Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp | 7 +++++++ Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h | 2 ++ 2 files changed, 9 insertions(+) (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 index ea43df167..d31bfd40e 100644 --- a/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp +++ b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp @@ -105,3 +105,10 @@ bool WKEinaSharedString::operator==(const char* str) const { return (!str || !m_string) ? (str == m_string) : !strcmp(m_string, str); } + +WKEinaSharedString WKEinaSharedString::adopt(Eina_Stringshare* string) +{ + WKEinaSharedString sharedString; + sharedString.m_string = static_cast(string); + return sharedString; +} diff --git a/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h index 68d76f4ea..52cfffa0e 100644 --- a/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h +++ b/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h @@ -61,6 +61,8 @@ public: ALWAYS_INLINE size_t length() const { return m_string ? static_cast(eina_stringshare_strlen(m_string)) : 0; } + static WKEinaSharedString adopt(Eina_Stringshare*); + private: const char* m_string; }; -- cgit v1.2.1