Changeset 142794 in webkit

Timestamp:

Feb 13, 2013 1:56:00 PM (11 years ago)

Author:

Christophe Dumez

Message:

[EFL][WK2] Stop using WebString in ewk_cookie_manager, ewk_form_submission_request and ewk_text_checker
​https://bugs.webkit.org/show_bug.cgi?id=108794

Reviewed by Alexey Proskuryakov.

Stop using WebString in ewk_cookie_manager, ewk_form_submission_request
and ewk_text_checker as it is internal C++ API. WKString and
WKEinaSharedString are used instead.

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

(WKEinaSharedString::leakString): Add leakString() method to
WKEinaSharedString so that we can conveniently convert a WKString to a
Eina shared string and take ownership of it.

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

(getHostnamesWithCookiesCallback):

• UIProcess/API/efl/ewk_form_submission_request.cpp:

(EwkFormSubmissionRequest::copyFieldValue):
(ewk_form_submission_request_field_names_get):
(ewk_form_submission_request_field_value_get):

• UIProcess/API/efl/ewk_form_submission_request_private.h:

(EwkFormSubmissionRequest):

• UIProcess/API/efl/ewk_text_checker.cpp:

(checkSpellingOfString):
(guessesForWord):
(learnWord):
(ignoreWord):

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

(TEST_F): Add API test for new WKEinaSharedString::leakString() method.

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/ewk_cookie_manager.cpp (modified) (2 diffs)
• UIProcess/API/efl/ewk_form_submission_request.cpp (modified) (4 diffs)
• UIProcess/API/efl/ewk_form_submission_request_private.h (modified) (2 diffs)
• UIProcess/API/efl/ewk_text_checker.cpp (modified) (7 diffs)
• UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-13  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        [EFL][WK2] Stop using WebString in ewk_cookie_manager, ewk_form_submission_request and ewk_text_checker
+        https://bugs.webkit.org/show_bug.cgi?id=108794
+
+        Reviewed by Alexey Proskuryakov.
+
+        Stop using WebString in ewk_cookie_manager, ewk_form_submission_request
+        and ewk_text_checker as it is internal C++ API. WKString and
+        WKEinaSharedString are used instead.
+
+        * UIProcess/API/cpp/efl/WKEinaSharedString.cpp:
+        (WKEinaSharedString::leakString): Add leakString() method to
+        WKEinaSharedString so that we can conveniently convert a WKString to a
+        Eina shared string and take ownership of it.
+        * UIProcess/API/cpp/efl/WKEinaSharedString.h:
+        * UIProcess/API/efl/ewk_cookie_manager.cpp:
+        (getHostnamesWithCookiesCallback):
+        * UIProcess/API/efl/ewk_form_submission_request.cpp:
+        (EwkFormSubmissionRequest::copyFieldValue):
+        (ewk_form_submission_request_field_names_get):
+        (ewk_form_submission_request_field_value_get):
+        * UIProcess/API/efl/ewk_form_submission_request_private.h:
+        (EwkFormSubmissionRequest):
+        * UIProcess/API/efl/ewk_text_checker.cpp:
+        (checkSpellingOfString):
+        (guessesForWord):
+        (learnWord):
+        (ignoreWord):
+        * UIProcess/API/efl/tests/test_ewk2_eina_shared_string.cpp:
+        (TEST_F): Add API test for new WKEinaSharedString::leakString() method.
+
 2013-02-13  Anders Carlsson  <andersca@apple.com>
 

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

@@ -113 +113 @@
     return sharedString;
 }
+
+Eina_Stringshare* WKEinaSharedString::leakString()
+{
+    Eina_Stringshare* sharedString = m_string;
+    m_string = 0;
+
+    return sharedString;
+}

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

@@ -47 +47 @@
     ~WKEinaSharedString();
 
+    Eina_Stringshare* leakString();
+
     WKEinaSharedString& operator=(const WKEinaSharedString& other);
     WKEinaSharedString& operator=(const char* str);

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

@@ -35 +35 @@
 #include "ewk_private.h"
 #include <wtf/OwnPtr.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
 
 using namespace WebKit;
@@ -195 +193 @@
     for (size_t i = 0; i < hostnameCount; ++i) {
         WKStringRef wkHostname = static_cast<WKStringRef>(WKArrayGetItemAtIndex(wkHostnames, i));
-        String hostname = toImpl(wkHostname)->string();
-        if (hostname.isEmpty())
+        if (WKStringIsEmpty(wkHostname))
             continue;
-        hostnames = eina_list_append(hostnames, eina_stringshare_add(hostname.utf8().data()));
+        hostnames = eina_list_append(hostnames, WKEinaSharedString(wkHostname).leakString());
     }
 

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

@@ -32 +32 @@
 #include "WKString.h"
 #include "ewk_form_submission_request_private.h"
-#include <wtf/text/CString.h>
 
 using namespace WebKit;
@@ -49 +48 @@
 }
 
-String EwkFormSubmissionRequest::fieldValue(const String& fieldName) const
+Eina_Stringshare* EwkFormSubmissionRequest::copyFieldValue(const char* fieldName) const
 {
     ASSERT(fieldName);
-    WKRetainPtr<WKStringRef> wkFieldName = adoptWK(toCopiedAPI(fieldName));
+    WKRetainPtr<WKStringRef> wkFieldName = adoptWK(WKStringCreateWithUTF8CString(fieldName));
     WKStringRef wkValue = static_cast<WKStringRef>(WKDictionaryGetItemForKey(m_wkValues.get(), wkFieldName.get()));
 
-    return wkValue ? toImpl(wkValue)->string() : String();
+    return WKEinaSharedString(wkValue).leakString();
 }
 
@@ -73 +72 @@
     EWK_OBJ_GET_IMPL_OR_RETURN(EwkFormSubmissionRequest, request, impl, 0);
 
-    Eina_List* names = 0;
+    Eina_List* fieldNames = 0;
 
-    WKRetainPtr<WKArrayRef> wkKeys = impl->fieldNames();
-    const size_t numKeys = WKArrayGetSize(wkKeys.get());
+    WKRetainPtr<WKArrayRef> wkFieldNames = impl->fieldNames();
+    const size_t numKeys = WKArrayGetSize(wkFieldNames.get());
     for (size_t i = 0; i < numKeys; ++i) {
-        WKStringRef wkKey = static_cast<WKStringRef>(WKArrayGetItemAtIndex(wkKeys.get(), i));
-        names = eina_list_append(names, eina_stringshare_add(toImpl(wkKey)->string().utf8().data()));
+        WKStringRef wkFieldName = static_cast<WKStringRef>(WKArrayGetItemAtIndex(wkFieldNames.get(), i));
+        fieldNames = eina_list_append(fieldNames, WKEinaSharedString(wkFieldName).leakString());
     }
 
-    return names;
+    return fieldNames;
 }
 
@@ -90 +89 @@
     EINA_SAFETY_ON_NULL_RETURN_VAL(name, 0);
 
-    String value = impl->fieldValue(String::fromUTF8(name));
-
-    return value.isNull() ?  0 : eina_stringshare_add(value.utf8().data());
+    return impl->copyFieldValue(name);
 }
 

trunk/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request_private.h

@@ -28 +28 @@
 
 #include "WKDictionary.h"
+#include "WKEinaSharedString.h"
 #include "WKFormSubmissionListener.h"
 #include "WKRetainPtr.h"
 #include "ewk_object_private.h"
 #include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
 
 class EwkFormSubmissionRequest : public EwkObject {
@@ -46 +46 @@
 
     WKRetainPtr<WKArrayRef> fieldNames() const;
-    String fieldValue(const String& fieldName) const;
+    Eina_Stringshare* copyFieldValue(const char* fieldName) const;
 
     void submit();

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

@@ -32 +32 @@
 #include "TextCheckerEnchant.h"
 #include "WKAPICast.h"
+#include "WKEinaSharedString.h"
 #include "WKMutableArray.h"
 #include "WKRetainPtr.h"
@@ -37 +38 @@
 #include "WKTextChecker.h"
 #include "WebPageProxy.h"
-#include "WebString.h"
 #include "ewk_settings.h"
 #include "ewk_text_checker_private.h"
 #include <Eina.h>
 #include <wtf/OwnPtr.h>
-#include <wtf/text/CString.h>
 
 using namespace WebCore;
@@ -100 +99 @@
 {
     if (clientCallbacks().string_spelling_check)
-        clientCallbacks().string_spelling_check(tag, toImpl(text)->string().utf8().data(), misspellingLocation, misspellingLength);
+        clientCallbacks().string_spelling_check(tag, WKEinaSharedString(text), misspellingLocation, misspellingLength);
     else
-        textCheckerEnchant()->checkSpellingOfString(toImpl(text)->string(), *misspellingLocation, *misspellingLength);
+        textCheckerEnchant()->checkSpellingOfString(toWTFString(text), *misspellingLocation, *misspellingLength);
 }
 
@@ -110 +109 @@
 
     if (clientCallbacks().word_guesses_get) {
-        Eina_List* list = clientCallbacks().word_guesses_get(tag, toImpl(word)->string().utf8().data());
+        Eina_List* list = clientCallbacks().word_guesses_get(tag, WKEinaSharedString(word));
         void* item;
 
@@ -119 +118 @@
         }
     } else {
-        const Vector<String>& guesses = textCheckerEnchant()->getGuessesForWord(toImpl(word)->string());
+        const Vector<String>& guesses = textCheckerEnchant()->getGuessesForWord(toWTFString(word));
         size_t numberOfGuesses = guesses.size();
         for (size_t i = 0; i < numberOfGuesses; ++i) {
@@ -133 +132 @@
 {
     if (clientCallbacks().word_learn)
-        clientCallbacks().word_learn(tag, toImpl(word)->string().utf8().data());
+        clientCallbacks().word_learn(tag, WKEinaSharedString(word));
     else
-        textCheckerEnchant()->learnWord(toImpl(word)->string());
+        textCheckerEnchant()->learnWord(toWTFString(word));
 }
 
@@ -141 +140 @@
 {
     if (clientCallbacks().word_ignore)
-        clientCallbacks().word_ignore(tag, toImpl(word)->string().utf8().data());
+        clientCallbacks().word_ignore(tag, WKEinaSharedString(word));
     else
-        textCheckerEnchant()->ignoreWord(toImpl(word)->string());
+        textCheckerEnchant()->ignoreWord(toWTFString(word));
 }
 

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

@@ -125 +125 @@
     checkString(string, anotherTestString);
 }
+
+TEST_F(EWK2UnitTestBase, leakString)
+{
+    WKEinaSharedString string;
+
+    string = testString;
+    checkString(string, testString);
+
+    Eina_Stringshare* leakedString = string.leakString();
+    checkString(string, 0);
+    ASSERT_STREQ(leakedString, testString);
+
+    eina_stringshare_del(leakedString);
+}