<!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>[162714] trunk</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/162714">162714</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-24 12:06:19 -0800 (Fri, 24 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Put cache files in XDG_CACHE_HOME
https://bugs.webkit.org/show_bug.cgi?id=123458
Patch by Enrique Ocaña González <eocanha@igalia.com> on 2014-01-24
Reviewed by Martin Robinson.
Source/WebKit/gtk:
* webkit/webkitglobals.cpp:
(webkitInit):
* webkit/webkiticondatabase.cpp:
Source/WebKit2:
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::platformDefaultIconDatabasePath):
Tools:
* GtkLauncher/main.c:
(createBrowser):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitglobalscpp">trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkiticondatabasecpp">trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsGtkLaunchermainc">trunk/Tools/GtkLauncher/main.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (162713 => 162714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-24 20:03:34 UTC (rev 162713)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-24 20:06:19 UTC (rev 162714)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-24 Enrique Ocaña González <eocanha@igalia.com>
+
+ [GTK] Put cache files in XDG_CACHE_HOME
+ https://bugs.webkit.org/show_bug.cgi?id=123458
+
+ Reviewed by Martin Robinson.
+
+ * webkit/webkitglobals.cpp:
+ (webkitInit):
+ * webkit/webkiticondatabase.cpp:
+
</ins><span class="cx"> 2014-01-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove recompileAllJSFunctions timer in ScriptDebugServer
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitglobalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp (162713 => 162714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp 2014-01-24 20:03:34 UTC (rev 162713)
+++ trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp 2014-01-24 20:06:19 UTC (rev 162714)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx">
</span><span class="cx"> PageGroup::setShouldTrackVisitedLinks(true);
</span><span class="cx">
</span><del>- GUniquePtr<gchar> iconDatabasePath(g_build_filename(g_get_user_data_dir(), "webkit", "icondatabase", NULL));
</del><ins>+ GUniquePtr<gchar> iconDatabasePath(g_build_filename(g_get_user_cache_dir(), "webkit", "icondatabase", NULL));
</ins><span class="cx"> webkit_icon_database_set_path(webkit_get_icon_database(), iconDatabasePath.get());
</span><span class="cx">
</span><span class="cx"> WebCore::ResourceHandle::setIgnoreSSLErrors(true);
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkiticondatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp (162713 => 162714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp 2014-01-24 20:03:34 UTC (rev 162713)
+++ trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp 2014-01-24 20:06:19 UTC (rev 162714)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> * the same icon database.
</span><span class="cx"> *
</span><span class="cx"> * The icon database is enabled by default and stored in
</span><del>- * ~/.local/share/webkit/icondatabase, depending on XDG_DATA_HOME.
</del><ins>+ * ~/.cache/webkit/icondatabase, depending on XDG_CACHE_HOME.
</ins><span class="cx"> *
</span><span class="cx"> * WebKit will automatically look for available icons in link elements
</span><span class="cx"> * on opened pages as well as an existing favicon.ico and load the
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162713 => 162714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-24 20:03:34 UTC (rev 162713)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-24 20:06:19 UTC (rev 162714)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-24 Enrique Ocaña González <eocanha@igalia.com>
+
+ [GTK] Put cache files in XDG_CACHE_HOME
+ https://bugs.webkit.org/show_bug.cgi?id=123458
+
+ Reviewed by Martin Robinson.
+
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformDefaultIconDatabasePath):
+
</ins><span class="cx"> 2014-01-24 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2 View Gestures (Swipe): Add a simple cache of view snapshots
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (162713 => 162714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-01-24 20:03:34 UTC (rev 162713)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-01-24 20:06:19 UTC (rev 162714)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultIconDatabasePath() const
</span><span class="cx"> {
</span><del>- GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "icondatabase", nullptr));
</del><ins>+ GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "icondatabase", nullptr));
</ins><span class="cx"> return WebCore::filenameToString(databaseDirectory.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162713 => 162714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-24 20:03:34 UTC (rev 162713)
+++ trunk/Tools/ChangeLog 2014-01-24 20:06:19 UTC (rev 162714)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-24 Enrique Ocaña González <eocanha@igalia.com>
+
+ [GTK] Put cache files in XDG_CACHE_HOME
+ https://bugs.webkit.org/show_bug.cgi?id=123458
+
+ Reviewed by Martin Robinson.
+
+ * GtkLauncher/main.c:
+ (createBrowser):
+
</ins><span class="cx"> 2014-01-23 Max Vujovic <mvujovic@adobe.com>
</span><span class="cx">
</span><span class="cx"> Remove CSS Custom Filters code and tests
</span></span></pre></div>
<a id="trunkToolsGtkLaunchermainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/GtkLauncher/main.c (162713 => 162714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/GtkLauncher/main.c 2014-01-24 20:03:34 UTC (rev 162713)
+++ trunk/Tools/GtkLauncher/main.c 2014-01-24 20:06:19 UTC (rev 162714)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">
</span><span class="cx"> gtk_container_add(GTK_CONTAINER(scrolledWindow), GTK_WIDGET(webView));
</span><span class="cx">
</span><del>- iconDatabasePath = g_build_filename(g_get_user_data_dir(), "webkit", "icondatabase", NULL);
</del><ins>+ iconDatabasePath = g_build_filename(g_get_user_cache_dir(), "GtkLauncher", "icondatabase", NULL);
</ins><span class="cx"> webkit_favicon_database_set_path(webkit_get_favicon_database(), iconDatabasePath);
</span><span class="cx"> g_free(iconDatabasePath);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>