<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166576] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166576">166576</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-01 04:38:37 -0700 (Tue, 01 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_database_managercpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_database_manager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166575 => 166576)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-04-01 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Don't copy the children map in webkitWebViewBaseContainerForall
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_database_managercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_database_manager.cpp (166575 => 166576)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -55,15 +55,18 @@
</span><span class="cx"> Eina_List* l;
</span><span class="cx"> void* data;
</span><span class="cx"> EINA_LIST_FOREACH(origins, l, data) {
</span><del>- originData->originList = eina_list_append(originData->originList, data);
</del><span class="cx"> Ewk_Security_Origin* origin = static_cast<Ewk_Security_Origin*>(data);
</span><span class="cx"> if (!strcmp(ewk_security_origin_protocol_get(origin), "http")
</span><span class="cx"> && !strcmp(ewk_security_origin_host_get(origin), "www.databasetest.com")
</span><span class="cx"> && !ewk_security_origin_port_get(origin)) {
</span><ins>+ originData->originList = origins;
</ins><span class="cx"> originData->isSynchronized = true;
</span><del>- ecore_main_loop_quit();
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ void* originItem;
+ EINA_LIST_FREE(origins, originItem)
+ ewk_object_unref(static_cast<Ewk_Object*>(originItem));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool timerCallback(void* userData)
</span><span class="lines">@@ -101,12 +104,15 @@
</span><span class="cx"> OriginData originData;
</span><span class="cx"> originData.manager = ewk_context_database_manager_get(ewk_view_context_get(view));
</span><span class="cx"> ASSERT_TRUE(ewk_database_manager_origins_async_get(originData.manager, databaseOriginsCallback, &originData));
</span><del>- Ecore_Timer* database_timer = ecore_timer_add(1, timerCallback, &originData);
</del><ins>+ Ecore_Timer* databaseTimer = ecore_timer_add(1, timerCallback, &originData);
</ins><span class="cx">
</span><span class="cx"> ecore_main_loop_begin();
</span><del>- if (database_timer)
- ecore_timer_del(database_timer);
</del><ins>+ databaseTimer = nullptr;
</ins><span class="cx">
</span><span class="cx"> ASSERT_TRUE(originData.isSynchronized);
</span><span class="cx"> ASSERT_LE(1, eina_list_count(originData.originList));
</span><ins>+
+ void* originItem;
+ EINA_LIST_FREE(originData.originList, originItem)
+ ewk_object_unref(static_cast<Ewk_Object*>(originItem));
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>