<!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>[186153] 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/186153">186153</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-30 17:46:55 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Implement ewk_favicon_database_clear() API.
https://bugs.webkit.org/show_bug.cgi?id=146337
Patch by Hyungwook Lee <hyungwook.lee@navercorp.com> on 2015-06-30
Reviewed by Gyuyoung Kim.
We need to provide way to clear favicon data.
* UIProcess/API/efl/ewk_favicon_database.cpp:
(EwkFaviconDatabase::getIconSurfaceSynchronously):
(EwkFaviconDatabase::clearFaviconDatabase):
(EwkFaviconDatabase::iconDataReadyForPageURL):
(ewk_favicon_database_icon_change_callback_del):
(ewk_favicon_database_clear):
* UIProcess/API/efl/ewk_favicon_database.h:
* UIProcess/API/efl/ewk_favicon_database_private.h:
* UIProcess/API/efl/tests/test_ewk2_favicon_database.cpp:
(TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_favicon_databasecpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_favicon_databaseh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_favicon_database_privateh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database_private.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_favicon_databasecpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_favicon_database.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186152 => 186153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-01 00:39:22 UTC (rev 186152)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-01 00:46:55 UTC (rev 186153)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-30 Hyungwook Lee <hyungwook.lee@navercorp.com>
+
+ [EFL] Implement ewk_favicon_database_clear() API.
+ https://bugs.webkit.org/show_bug.cgi?id=146337
+
+ Reviewed by Gyuyoung Kim.
+
+ We need to provide way to clear favicon data.
+
+ * UIProcess/API/efl/ewk_favicon_database.cpp:
+ (EwkFaviconDatabase::getIconSurfaceSynchronously):
+ (EwkFaviconDatabase::clearFaviconDatabase):
+ (EwkFaviconDatabase::iconDataReadyForPageURL):
+ (ewk_favicon_database_icon_change_callback_del):
+ (ewk_favicon_database_clear):
+ * UIProcess/API/efl/ewk_favicon_database.h:
+ * UIProcess/API/efl/ewk_favicon_database_private.h:
+ * UIProcess/API/efl/tests/test_ewk2_favicon_database.cpp:
+ (TEST_F):
+
</ins><span class="cx"> 2015-06-30 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Ignore viewport rect changes during zoom bouncing.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_favicon_databasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp (186152 => 186153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2015-07-01 00:39:22 UTC (rev 186152)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2015-07-01 00:46:55 UTC (rev 186153)
</span><span class="lines">@@ -82,6 +82,11 @@
</span><span class="cx"> return surface.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void EwkFaviconDatabase::clearFaviconDatabase()
+{
+ WKIconDatabaseRemoveAllIcons(m_iconDatabase.get());
+}
+
</ins><span class="cx"> void EwkFaviconDatabase::iconDataReadyForPageURL(WKIconDatabaseRef, WKURLRef pageURL, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> EwkFaviconDatabase* ewkIconDatabase = const_cast<EwkFaviconDatabase*>(static_cast<const EwkFaviconDatabase*>(clientInfo));
</span><span class="lines">@@ -121,3 +126,10 @@
</span><span class="cx">
</span><span class="cx"> ewkIconDatabase->unwatchChanges(callback);
</span><span class="cx"> }
</span><ins>+
+void ewk_favicon_database_clear(Ewk_Favicon_Database* ewkIconDatabase)
+{
+ EINA_SAFETY_ON_NULL_RETURN(ewkIconDatabase);
+
+ ewkIconDatabase->clearFaviconDatabase();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_favicon_databaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.h (186152 => 186153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.h 2015-07-01 00:39:22 UTC (rev 186152)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.h 2015-07-01 00:46:55 UTC (rev 186153)
</span><span class="lines">@@ -94,6 +94,13 @@
</span><span class="cx"> */
</span><span class="cx"> EAPI void ewk_favicon_database_icon_change_callback_del(Ewk_Favicon_Database *database, Ewk_Favicon_Database_Icon_Change_Cb callback);
</span><span class="cx">
</span><ins>+/**
+ * Deletes all favicon data.
+ *
+ * @param database database object to clear all favicon data
+ */
+EAPI void ewk_favicon_database_clear(Ewk_Favicon_Database *database);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_favicon_database_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database_private.h (186152 => 186153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database_private.h 2015-07-01 00:39:22 UTC (rev 186152)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database_private.h 2015-07-01 00:46:55 UTC (rev 186153)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> PassRefPtr<cairo_surface_t> getIconSurfaceSynchronously(const char* pageURL) const;
</span><span class="cx"> void watchChanges(const IconChangeCallbackData& callbackData);
</span><span class="cx"> void unwatchChanges(Ewk_Favicon_Database_Icon_Change_Cb callback);
</span><ins>+ void clearFaviconDatabase();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void iconDataReadyForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL, const void* clientInfo);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_favicon_databasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_favicon_database.cpp (186152 => 186153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_favicon_database.cpp 2015-07-01 00:39:22 UTC (rev 186152)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_favicon_database.cpp 2015-07-01 00:46:55 UTC (rev 186153)
</span><span class="lines">@@ -120,3 +120,53 @@
</span><span class="cx">
</span><span class="cx"> ewk_favicon_database_icon_change_callback_del(database, requestFaviconData);
</span><span class="cx"> }
</span><ins>+
+TEST_F(EWK2FaviconDatabaseTest, ewk_favicon_database_clear)
+{
+ std::unique_ptr<EWK2UnitTestServer> httpServer1 = std::make_unique<EWK2UnitTestServer>();
+ httpServer1->run(serverCallback);
+
+ // Set favicon database path and enable functionality.
+ Ewk_Context* context = ewk_view_context_get(webView());
+ ewk_context_favicon_database_directory_set(context, 0);
+ Ewk_Favicon_Database* database = ewk_context_favicon_database_get(context);
+
+ IconRequestData data1 = { webView(), 0 };
+ ewk_favicon_database_icon_change_callback_add(database, requestFaviconData, &data1);
+
+ ASSERT_TRUE(loadUrlSync(httpServer1->getURLForPath("/").data()));
+
+ while (!data1.icon)
+ ecore_main_loop_iterate();
+
+ ASSERT_TRUE(data1.icon);
+ evas_object_unref(data1.icon);
+
+ ewk_favicon_database_icon_change_callback_del(database, requestFaviconData);
+
+ // Runs another httpServer for loading another favicon.
+ // EWK2UnitTestServer runs on random port that automatically makes different url of the favicon.
+ std::unique_ptr<EWK2UnitTestServer> httpServer2 = std::make_unique<EWK2UnitTestServer>();
+ httpServer2->run(serverCallback);
+
+ IconRequestData data2 = { webView(), 0 };
+ ewk_favicon_database_icon_change_callback_add(database, requestFaviconData, &data2);
+
+ ASSERT_TRUE(loadUrlSync(httpServer2->getURLForPath("/").data()));
+
+ while (!data2.icon)
+ ecore_main_loop_iterate();
+
+ ASSERT_TRUE(data2.icon);
+ evas_object_unref(data2.icon);
+
+ ewk_favicon_database_icon_change_callback_del(database, requestFaviconData);
+
+ ewk_favicon_database_clear(database);
+
+ data1.icon = ewk_favicon_database_icon_get(database, httpServer1->getURLForPath("/").data(), evas_object_evas_get(webView()));
+ ASSERT_FALSE(data1.icon);
+
+ data2.icon = ewk_favicon_database_icon_get(database, httpServer2->getURLForPath("/").data(), evas_object_evas_get(webView()));
+ ASSERT_FALSE(data2.icon);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>