Changeset 128160 in webkit

Timestamp:

Sep 11, 2012 2:36:36 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] WKEinaSharedString needs a function to adopt eina stringshare.
​https://bugs.webkit.org/show_bug.cgi?id=96201

Patch by Byungwoo Lee <​bw80.lee@samsung.com> on 2012-09-11
Reviewed by Kenneth Rohde Christiansen.

WKEinaSharedString needs a to adopt eina stringshare directly.

With this adopt function, an instance that is directly created with
eina_stringshare_add() can be easily handled by WKEinaSharedString
without calling eina_stringshare_del() for preventing memory leak.

• UIProcess/API/cpp/efl/WKEinaSharedString.cpp:

(WKEinaSharedString::adopt):

• UIProcess/API/cpp/efl/WKEinaSharedString.h:
• UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp:

(TEST_F):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/cpp/efl/WKEinaSharedString.cpp (modified) (1 diff)
• UIProcess/API/cpp/efl/WKEinaSharedString.h (modified) (1 diff)
• UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-11  Byungwoo Lee  <bw80.lee@samsung.com>
+
+        [EFL][WK2] WKEinaSharedString needs a function to adopt eina stringshare.
+        https://bugs.webkit.org/show_bug.cgi?id=96201
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WKEinaSharedString needs a to adopt eina stringshare directly.
+
+        With this adopt function, an instance that is directly created with
+        eina_stringshare_add() can be easily handled by WKEinaSharedString
+        without calling eina_stringshare_del() for preventing memory leak.
+
+        * UIProcess/API/cpp/efl/WKEinaSharedString.cpp:
+        (WKEinaSharedString::adopt):
+        * UIProcess/API/cpp/efl/WKEinaSharedString.h:
+        * UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp:
+        (TEST_F):
+
 2012-09-11  Andras Becsi  <andras.becsi@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.cpp

@@ -106 +106 @@
     return (!str || !m_string) ? (str == m_string) : !strcmp(m_string, str);
 }
+
+WKEinaSharedString WKEinaSharedString::adopt(Eina_Stringshare* string)
+{
+    WKEinaSharedString sharedString;
+    sharedString.m_string = static_cast<const char*>(string);
+    return sharedString;
+}

trunk/Source/WebKit2/UIProcess/API/cpp/efl/WKEinaSharedString.h

@@ -62 +62 @@
     ALWAYS_INLINE size_t length() const { return m_string ? static_cast<size_t>(eina_stringshare_strlen(m_string)) : 0; }
 
+    static WKEinaSharedString adopt(Eina_Stringshare*);
+
 private:
     const char* m_string;

trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp

@@ -76 +76 @@
 }
 
+TEST_F(EWK2UnitTestBase, constructFromEinaStringShare)
+{
+    WKEinaSharedString string(WKEinaSharedString::adopt(eina_stringshare_add(testString)));
+    checkString(string, testString);
+
+    string = WKEinaSharedString::adopt(eina_stringshare_add(anotherTestString));
+    checkString(string, anotherTestString);
+
+    string = string;
+    checkString(string, anotherTestString);
+}
+
 TEST_F(EWK2UnitTestBase, costructCopy)
 {