<!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>[166565] 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/166565">166565</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-31 23:01:28 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2]Implement ewk APIs of web local storage which have deletion functions of the local storage entries
https://bugs.webkit.org/show_bug.cgi?id=130577
Patch by Joonghun Park <jh718.park@samsung.com> on 2014-03-31
Reviewed by Gyuyoung Kim.
* UIProcess/API/efl/ewk_storage_manager.cpp:
(ewk_storage_manager_entries_clear):
(ewk_storage_manager_entries_for_origin_del):
* UIProcess/API/efl/ewk_storage_manager.h:
* UIProcess/API/efl/ewk_storage_manager_private.h:
(EwkStorageManager::wkStorageManager):
* UIProcess/API/efl/tests/test_ewk2_storage_manager.cpp:
adding and updating API unittest and fixing memory leak of the existing test case
(EWK2StorageManagerTest::getStorageOriginsCallback):
(EWK2StorageManagerTest::checkOrigin):
(EWK2StorageManagerTest::getOrigin):
(TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_storage_managercpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_storage_managerh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_storage_manager_privateh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_storage_managercpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_storage_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 (166564 => 166565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-01 05:44:38 UTC (rev 166564)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-01 06:01:28 UTC (rev 166565)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-31 Joonghun Park <jh718.park@samsung.com>
+
+ [EFL][WK2]Implement ewk APIs of web local storage which have deletion functions of the local storage entries
+ https://bugs.webkit.org/show_bug.cgi?id=130577
+
+ Reviewed by Gyuyoung Kim.
+
+ * UIProcess/API/efl/ewk_storage_manager.cpp:
+ (ewk_storage_manager_entries_clear):
+ (ewk_storage_manager_entries_for_origin_del):
+ * UIProcess/API/efl/ewk_storage_manager.h:
+ * UIProcess/API/efl/ewk_storage_manager_private.h:
+ (EwkStorageManager::wkStorageManager):
+ * UIProcess/API/efl/tests/test_ewk2_storage_manager.cpp:
+ adding and updating API unittest and fixing memory leak of the existing test case
+ (EWK2StorageManagerTest::getStorageOriginsCallback):
+ (EWK2StorageManagerTest::checkOrigin):
+ (EWK2StorageManagerTest::getOrigin):
+ (TEST_F):
+
</ins><span class="cx"> 2014-03-31 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename policy enums to match the delegate methods
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_storage_managercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp (166564 => 166565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp 2014-04-01 05:44:38 UTC (rev 166564)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp 2014-04-01 06:01:28 UTC (rev 166565)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKArray.h"
</span><ins>+#include "WKSecurityOrigin.h"
+#include "WKString.h"
</ins><span class="cx"> #include "ewk_security_origin_private.h"
</span><span class="cx"> #include "ewk_storage_manager_private.h"
</span><span class="cx">
</span><span class="lines">@@ -94,3 +96,22 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+
+Eina_Bool ewk_storage_manager_entries_clear(Ewk_Storage_Manager* ewkStorageManager)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ewkStorageManager, false);
+
+ WKKeyValueStorageManagerDeleteAllEntries(ewkStorageManager->wkStorageManager().get());
+
+ return true;
+}
+
+Eina_Bool ewk_storage_manager_entries_for_origin_del(Ewk_Storage_Manager* ewkStorageManager, Ewk_Security_Origin* origin)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ewkStorageManager, false);
+ EWK_OBJ_GET_IMPL_OR_RETURN(EwkSecurityOrigin, origin, impl, false);
+
+ WKKeyValueStorageManagerDeleteEntriesForOrigin(ewkStorageManager->wkStorageManager().get(), impl->wkSecurityOrigin());
+
+ return true;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_storage_managerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.h (166564 => 166565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.h 2014-04-01 05:44:38 UTC (rev 166564)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.h 2014-04-01 06:01:28 UTC (rev 166565)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #ifndef ewk_storage_manager_h
</span><span class="cx"> #define ewk_storage_manager_h
</span><span class="cx">
</span><ins>+#include "ewk_security_origin.h"
</ins><span class="cx"> #include <Eina.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="lines">@@ -80,6 +81,25 @@
</span><span class="cx"> */
</span><span class="cx"> EAPI Eina_Bool ewk_storage_manager_origins_async_get(const Ewk_Storage_Manager *manager, Ewk_Storage_Origins_Async_Get_Cb callback, void *user_data);
</span><span class="cx">
</span><ins>+/**
+ * Deletes all local storage.
+ *
+ * @param manager Ewk_Storage_Manager object
+ *
+ * @return @c EINA_TRUE on success, @c EINA_FALSE on failure
+ */
+EAPI Eina_Bool ewk_storage_manager_entries_clear(Ewk_Storage_Manager *manager);
+
+/**
+ * Deletes local storage for the specified origin.
+ *
+ * @param manager Ewk_Storage_Manager object
+ * @param origin security origin
+ *
+ * @return @c EINA_TRUE on success, @c EINA_FALSE on failure
+ */
+EAPI Eina_Bool ewk_storage_manager_entries_for_origin_del(Ewk_Storage_Manager *manager, Ewk_Security_Origin *origin);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_storage_manager_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h (166564 => 166565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h 2014-04-01 05:44:38 UTC (rev 166564)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h 2014-04-01 06:01:28 UTC (rev 166565)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">
</span><span class="cx"> Eina_List* createOriginList(WKArrayRef wkList) const;
</span><span class="cx"> void getStorageOrigins(void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback) const;
</span><ins>+ WKRetainPtr<WKKeyValueStorageManagerRef> wkStorageManager() { return m_storageManager; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WKRetainPtr<WKKeyValueStorageManagerRef> m_storageManager;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_storage_managercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_storage_manager.cpp (166564 => 166565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_storage_manager.cpp 2014-04-01 05:44:38 UTC (rev 166564)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_storage_manager.cpp 2014-04-01 06:01:28 UTC (rev 166565)
</span><span class="lines">@@ -29,6 +29,14 @@
</span><span class="cx">
</span><span class="cx"> using namespace EWK2UnitTest;
</span><span class="cx">
</span><ins>+static const char storageHTML[] =
+ "<html><head><title>original title</title></head>"
+ "<body>"
+ "<script type='text/javascript'>"
+ " localStorage.setItem('item', 'storage');"
+ "</script>"
+ "</body></html>";
+
</ins><span class="cx"> class EWK2StorageManagerTest : public EWK2UnitTestBase {
</span><span class="cx"> public:
</span><span class="cx"> struct OriginData {
</span><span class="lines">@@ -55,15 +63,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.storagetest.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 bool timerCallback(void* userData)
</span><span class="lines">@@ -84,50 +95,106 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- bool checkOrigin(Eina_List* origins, Ewk_Security_Origin** origin)
</del><ins>+ bool checkOrigin(Eina_List* origins, Ewk_Security_Origin** origin, const char* protocol, const char* host, uint32_t port)
</ins><span class="cx"> {
</span><span class="cx"> Eina_List* l;
</span><span class="cx"> void* data;
</span><span class="cx"> EINA_LIST_FOREACH(origins, l, data) {
</span><span class="cx"> *origin = static_cast<Ewk_Security_Origin*>(data);
</span><del>- if (!strcmp(ewk_security_origin_protocol_get(*origin), "http")
- && !strcmp(ewk_security_origin_host_get(*origin), "www.storagetest.com")
</del><ins>+ if (!strcmp(ewk_security_origin_protocol_get(*origin), protocol)
+ && !strcmp(ewk_security_origin_host_get(*origin), host)
</ins><span class="cx"> && !ewk_security_origin_port_get(*origin))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+ Ewk_Security_Origin* getOrigin(Eina_List* origins, Ewk_Security_Origin** origin, const char* protocol, const char* host, uint32_t port)
+ {
+ Eina_List* l;
+ void* data;
+ EINA_LIST_FOREACH(origins, l, data) {
+ *origin = static_cast<Ewk_Security_Origin*>(data);
+ if (!strcmp(ewk_security_origin_protocol_get(*origin), protocol)
+ && !strcmp(ewk_security_origin_host_get(*origin), host)
+ && !ewk_security_origin_port_get(*origin)) {
+ return *origin;
+ }
+ }
+
+ return nullptr;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> TEST_F(EWK2StorageManagerTest, ewk_storage_manager_origins_async_get)
</span><span class="cx"> {
</span><span class="cx"> Evas_Object* view = webView();
</span><del>- const char* storageHTML =
- "<html><head><title>original title</title></head>"
- "<body>"
- "<script type='text/javascript'>"
- " localStorage.setItem('item', 'storage');"
- "</script>"
- "</body></html>";
</del><span class="cx">
</span><ins>+ OriginData originData;
+ originData.manager = ewk_context_storage_manager_get(ewk_view_context_get(view));
+ ewk_storage_manager_entries_clear(originData.manager);
+
</ins><span class="cx"> ewk_view_html_string_load(view, storageHTML, "http://www.storagetest.com", 0);
</span><ins>+ ASSERT_TRUE(waitUntilLoadFinished());
</ins><span class="cx">
</span><ins>+ ASSERT_TRUE(ewk_storage_manager_origins_async_get(originData.manager, getStorageOriginsCallback, &originData));
+ Ecore_Timer* storageTimer = ecore_timer_add(1, reinterpret_cast<Ecore_Task_Cb>(timerCallback), &originData);
+
+ ecore_main_loop_begin();
+ storageTimer = nullptr;
+
+ ASSERT_TRUE(originData.isSynchronized);
+ ASSERT_EQ(1, eina_list_count(originData.originList));
+
+ void* originItem;
+ EINA_LIST_FREE(originData.originList, originItem)
+ ewk_object_unref(static_cast<Ewk_Object*>(originItem));
+}
+
+TEST_F(EWK2StorageManagerTest, ewk_storage_manager_entries_for_origin_delete)
+{
+ Evas_Object* view = webView();
+
</ins><span class="cx"> OriginData originData;
</span><span class="cx"> originData.manager = ewk_context_storage_manager_get(ewk_view_context_get(view));
</span><ins>+ ewk_storage_manager_entries_clear(originData.manager);
+
+ ewk_view_html_string_load(view, storageHTML, "http://www.storagetest1.com", 0);
+ ASSERT_TRUE(waitUntilLoadFinished());
+ ewk_view_html_string_load(view, storageHTML, "http://www.storagetest2.com", 0);
+ ASSERT_TRUE(waitUntilLoadFinished());
+ ewk_view_html_string_load(view, storageHTML, "http://www.storagetest.com", 0);
+ ASSERT_TRUE(waitUntilLoadFinished());
+
</ins><span class="cx"> ASSERT_TRUE(ewk_storage_manager_origins_async_get(originData.manager, getStorageOriginsCallback, &originData));
</span><del>- Ecore_Timer* storage_timer = ecore_timer_add(1, reinterpret_cast<Ecore_Task_Cb>(timerCallback), &originData);
</del><ins>+ Ecore_Timer* storageTimer = ecore_timer_add(1, reinterpret_cast<Ecore_Task_Cb>(timerCallback), &originData);
</ins><span class="cx">
</span><span class="cx"> ecore_main_loop_begin();
</span><del>- if (storage_timer)
- ecore_timer_del(storage_timer);
</del><ins>+ storageTimer = nullptr;
</ins><span class="cx">
</span><span class="cx"> ASSERT_TRUE(originData.isSynchronized);
</span><del>- ASSERT_LE(1, eina_list_count(originData.originList));
-
</del><span class="cx"> Ewk_Security_Origin* origin = 0;
</span><del>- EXPECT_TRUE(checkOrigin(originData.originList, &origin));
</del><ins>+ ASSERT_TRUE(checkOrigin(originData.originList, &origin, "http", "www.storagetest1.com", 0));
+ ASSERT_EQ(3, eina_list_count(originData.originList));
</ins><span class="cx">
</span><del>- EXPECT_EQ(origin, ewk_object_ref(origin));
- ewk_object_unref(origin);
</del><ins>+ ewk_storage_manager_entries_for_origin_del(originData.manager, getOrigin(originData.originList, &origin, "http", "www.storagetest1.com", 0));
+
+ void* originItem;
+ EINA_LIST_FREE(originData.originList, originItem)
+ ewk_object_unref(static_cast<Ewk_Object*>(originItem));
+
+ ASSERT_TRUE(ewk_storage_manager_origins_async_get(originData.manager, getStorageOriginsCallback, &originData));
+
+ storageTimer = ecore_timer_add(1, reinterpret_cast<Ecore_Task_Cb>(timerCallback), &originData);
+
+ ecore_main_loop_begin();
+ storageTimer = nullptr;
+
+ ASSERT_TRUE(originData.isSynchronized);
+ ASSERT_EQ(2, eina_list_count(originData.originList));
+ ASSERT_FALSE(checkOrigin(originData.originList, &origin, "http", "www.storagetest1.com", 0));
+
+ 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>