<!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>[199836] trunk/Source/WebKit/win</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/199836">199836</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-04-21 14:16:54 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using ApplicationCacheStorage::singleton() on Windows
https://bugs.webkit.org/show_bug.cgi?id=156861
Reviewed by Darin Adler.
* WebApplicationCache.cpp:
(applicationCachePath):
(WebApplicationCache::storage):
* WebApplicationCache.h:
* WebCache.cpp:
(WebCache::empty):
* WebView.cpp:
(WebView::initWithFrame):
(WebKitSetApplicationCachePathIfNecessary): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebApplicationCachecpp">trunk/Source/WebKit/win/WebApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebApplicationCacheh">trunk/Source/WebKit/win/WebApplicationCache.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCachecpp">trunk/Source/WebKit/win/WebCache.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (199835 => 199836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-04-21 21:08:20 UTC (rev 199835)
+++ trunk/Source/WebKit/win/ChangeLog 2016-04-21 21:16:54 UTC (rev 199836)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-21 Anders Carlsson <andersca@apple.com>
+
+ Stop using ApplicationCacheStorage::singleton() on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=156861
+
+ Reviewed by Darin Adler.
+
+ * WebApplicationCache.cpp:
+ (applicationCachePath):
+ (WebApplicationCache::storage):
+ * WebApplicationCache.h:
+ * WebCache.cpp:
+ (WebCache::empty):
+ * WebView.cpp:
+ (WebView::initWithFrame):
+ (WebKitSetApplicationCachePathIfNecessary): Deleted.
+
</ins><span class="cx"> 2016-04-15 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Make dynamically-added favicons (via link rel="icon") obey Content-Security-Policy
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebApplicationCache.cpp (199835 => 199836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebApplicationCache.cpp 2016-04-21 21:08:20 UTC (rev 199835)
+++ trunk/Source/WebKit/win/WebApplicationCache.cpp 2016-04-21 21:16:54 UTC (rev 199836)
</span><span class="lines">@@ -58,9 +58,24 @@
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String applicationCachePath()
+{
+ String path = localUserSpecificStorageDirectory();
+
+#if USE(CF)
+ autocacheDirectoryPreference = adoptCF(CFPreferencesCopyAppValue(WebKitLocalCacheDefaultsKey, kCFPreferencesCurrentApplication));
+ if (cacheDirectoryPreference && CFStringGetTypeID() == CFGetTypeID(cacheDirectoryPreference.get()))
+ path = static_cast<CFStringRef>(cacheDirectoryPreference.get());
+#endif
+
+ return path;
+}
+
</ins><span class="cx"> WebCore::ApplicationCacheStorage& WebApplicationCache::storage()
</span><span class="cx"> {
</span><del>- return WebCore::ApplicationCacheStorage::singleton();
</del><ins>+ static ApplicationCacheStorage& storage = ApplicationCacheStorage::create(applicationCachePath(), "ApplicationCache").leakRef();
+
+ return storage;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // IUnknown -------------------------------------------------------------------
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebApplicationCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebApplicationCache.h (199835 => 199836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebApplicationCache.h 2016-04-21 21:08:20 UTC (rev 199835)
+++ trunk/Source/WebKit/win/WebApplicationCache.h 2016-04-21 21:16:54 UTC (rev 199836)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static WebApplicationCache* createInstance();
</span><span class="cx">
</span><del>- WebCore::ApplicationCacheStorage& storage();
</del><ins>+ static WebCore::ApplicationCacheStorage& storage();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> WebApplicationCache();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCache.cpp (199835 => 199836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCache.cpp 2016-04-21 21:08:20 UTC (rev 199835)
+++ trunk/Source/WebKit/win/WebCache.cpp 2016-04-21 21:16:54 UTC (rev 199836)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebCache.h"
</span><span class="cx">
</span><span class="cx"> #include "CFDictionaryPropertyBag.h"
</span><ins>+#include "WebApplicationCache.h"
</ins><span class="cx"> #include <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #include <WebCore/BString.h>
</span><span class="cx"> #include <WebCore/MemoryCache.h>
</span><span class="lines">@@ -214,7 +215,7 @@
</span><span class="cx"> memoryCache.setDisabled(false);
</span><span class="cx">
</span><span class="cx"> // Empty the application cache.
</span><del>- WebCore::ApplicationCacheStorage::singleton().empty();
</del><ins>+ WebApplicationCache::storage().empty();
</ins><span class="cx">
</span><span class="cx"> // Empty the Cross-Origin Preflight cache
</span><span class="cx"> WebCore::CrossOriginPreflightResultCache::singleton().empty();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (199835 => 199836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2016-04-21 21:08:20 UTC (rev 199835)
+++ trunk/Source/WebKit/win/WebView.cpp 2016-04-21 21:16:54 UTC (rev 199836)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "SoftLinking.h"
</span><span class="cx"> #include "SubframeLoader.h"
</span><span class="cx"> #include "TextIterator.h"
</span><ins>+#include "WebApplicationCache.h"
</ins><span class="cx"> #include "WebBackForwardList.h"
</span><span class="cx"> #include "WebChromeClient.h"
</span><span class="cx"> #include "WebContextMenuClient.h"
</span><span class="lines">@@ -2828,26 +2829,6 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void WebKitSetApplicationCachePathIfNecessary()
-{
- static bool initialized = false;
- if (initialized)
- return;
-
- String path = localUserSpecificStorageDirectory();
-
-#if USE(CF)
- RetainPtr<CFPropertyListRef> cacheDirectoryPreference = adoptCF(CFPreferencesCopyAppValue(WebKitLocalCacheDefaultsKey, kCFPreferencesCurrentApplication));
- if (cacheDirectoryPreference && (CFStringGetTypeID() == CFGetTypeID(cacheDirectoryPreference.get())))
- path = static_cast<CFStringRef>(cacheDirectoryPreference.get());
-#endif
-
- if (!path.isNull())
- ApplicationCacheStorage::singleton().setCacheDirectory(path);
-
- initialized = true;
-}
-
</del><span class="cx"> bool WebView::shouldInitializeTrackPointHack()
</span><span class="cx"> {
</span><span class="cx"> static bool shouldCreateScrollbars;
</span><span class="lines">@@ -2916,7 +2897,6 @@
</span><span class="cx"> WebPlatformStrategies::initialize();
</span><span class="cx">
</span><span class="cx"> WebKitInitializeWebDatabasesIfNecessary();
</span><del>- WebKitSetApplicationCachePathIfNecessary();
</del><span class="cx">
</span><span class="cx"> MemoryPressureHandler::singleton().install();
</span><span class="cx">
</span><span class="lines">@@ -2936,6 +2916,7 @@
</span><span class="cx"> configuration.dragClient = new WebDragClient(this);
</span><span class="cx"> configuration.inspectorClient = m_inspectorClient;
</span><span class="cx"> configuration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><ins>+ configuration.applicationCacheStorage = &WebApplicationCache::storage();
</ins><span class="cx"> configuration.databaseProvider = &WebDatabaseProvider::singleton();
</span><span class="cx"> configuration.storageNamespaceProvider = &m_webViewGroup->storageNamespaceProvider();
</span><span class="cx"> configuration.progressTrackerClient = static_cast<WebFrameLoaderClient*>(configuration.loaderClientForMainFrame);
</span></span></pre>
</div>
</div>
</body>
</html>