Title: [166576] trunk/Source/WebKit2
- Revision
- 166576
- Author
- commit-qu...@webkit.org
- Date
- 2014-04-01 04:38:37 -0700 (Tue, 01 Apr 2014)
Log 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.p...@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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166575 => 166576)
--- trunk/Source/WebKit2/ChangeLog 2014-04-01 09:11:14 UTC (rev 166575)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-01 11:38:37 UTC (rev 166576)
@@ -1,3 +1,16 @@
+2014-04-01 Joonghun Park <jh718.p...@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 <zdober...@igalia.com>
Don't copy the children map in webkitWebViewBaseContainerForall
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_database_manager.cpp (166575 => 166576)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_database_manager.cpp 2014-04-01 09:11:14 UTC (rev 166575)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_database_manager.cpp 2014-04-01 11:38:37 UTC (rev 166576)
@@ -55,15 +55,18 @@
Eina_List* l;
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));
}
static Eina_Bool timerCallback(void* userData)
@@ -101,12 +104,15 @@
OriginData originData;
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));
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
