Changeset 166576 in webkit

Timestamp:

Apr 1, 2014 4:38:37 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Fix and update the existing test case for ewk_database_manager_origins_async_get API
​https://bugs.webkit.org/show_bug.cgi?id=131017

Patch by Joonghun Park <​jh718.park@samsung.com> on 2014-04-01
Reviewed by Gyuyoung Kim.

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

Fix memory leaks and errors caused by duplication of Ecore_Timer deletion
as well as update a naming style of local variable.
(EWK2DatabaseManagerTest::databaseOriginsCallback):
(TEST_F):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/tests/test_ewk2_database_manager.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-01  Joonghun Park  <jh718.park@samsung.com>
+
+        [EFL][WK2] Fix and update the existing test case for ewk_database_manager_origins_async_get API
+        https://bugs.webkit.org/show_bug.cgi?id=131017
+
+        Reviewed by Gyuyoung Kim.
+
+        * UIProcess/API/efl/tests/test_ewk2_database_manager.cpp:
+        Fix memory leaks and errors caused by duplication of Ecore_Timer deletion
+        as well as update a naming style of local variable.
+        (EWK2DatabaseManagerTest::databaseOriginsCallback):
+        (TEST_F):
+
 2014-04-01  Zan Dobersek  <zdobersek@igalia.com>
 

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

@@ -56 +56 @@
         void* data;
         EINA_LIST_FOREACH(origins, l, data) {
-            originData->originList = eina_list_append(originData->originList, data);
             Ewk_Security_Origin* origin = static_cast<Ewk_Security_Origin*>(data);
             if (!strcmp(ewk_security_origin_protocol_get(origin), "http")
                 && !strcmp(ewk_security_origin_host_get(origin), "www.databasetest.com")
                 && !ewk_security_origin_port_get(origin)) {
+                    originData->originList = origins;
                     originData->isSynchronized = true;
-                    ecore_main_loop_quit();
+                    return;
             }
         }
+        void* originItem;
+        EINA_LIST_FREE(origins, originItem)
+            ewk_object_unref(static_cast<Ewk_Object*>(originItem));
     }
 
@@ -102 +105 @@
     originData.manager = ewk_context_database_manager_get(ewk_view_context_get(view));
     ASSERT_TRUE(ewk_database_manager_origins_async_get(originData.manager, databaseOriginsCallback, &originData));
-    Ecore_Timer* database_timer = ecore_timer_add(1, timerCallback, &originData);
+    Ecore_Timer* databaseTimer = ecore_timer_add(1, timerCallback, &originData);
 
     ecore_main_loop_begin();
-    if (database_timer)
-        ecore_timer_del(database_timer);
+    databaseTimer = nullptr;
 
     ASSERT_TRUE(originData.isSynchronized);
     ASSERT_LE(1, eina_list_count(originData.originList));
+
+    void* originItem;
+    EINA_LIST_FREE(originData.originList, originItem)
+        ewk_object_unref(static_cast<Ewk_Object*>(originItem));
 }