<!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>[199849] trunk/Source/WebCore</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/199849">199849</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-04-21 17:18:48 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of ApplicationCacheStorage::singleton
https://bugs.webkit.org/show_bug.cgi?id=156882
Reviewed by Tim Horton.
* loader/appcache/ApplicationCacheStorage.cpp:
(WebCore::ApplicationCacheStorage::setCacheDirectory): Deleted.
(WebCore::ApplicationCacheStorage::singleton): Deleted.
* loader/appcache/ApplicationCacheStorage.h:
* page/Page.cpp:
(WebCore::Page::Page):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStorageh">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199848 => 199849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-22 00:09:36 UTC (rev 199848)
+++ trunk/Source/WebCore/ChangeLog 2016-04-22 00:18:48 UTC (rev 199849)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-21 Anders Carlsson <andersca@apple.com>
+
+ Get rid of ApplicationCacheStorage::singleton
+ https://bugs.webkit.org/show_bug.cgi?id=156882
+
+ Reviewed by Tim Horton.
+
+ * loader/appcache/ApplicationCacheStorage.cpp:
+ (WebCore::ApplicationCacheStorage::setCacheDirectory): Deleted.
+ (WebCore::ApplicationCacheStorage::singleton): Deleted.
+ * loader/appcache/ApplicationCacheStorage.h:
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+
</ins><span class="cx"> 2016-04-21 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: accumulation == TransformState::FlattenTransform in WebCore::GraphicsLayerCA::computeVisibleAndCoverageRect
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (199848 => 199849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2016-04-22 00:09:36 UTC (rev 199848)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2016-04-22 00:18:48 UTC (rev 199849)
</span><span class="lines">@@ -364,14 +364,6 @@
</span><span class="cx"> m_cacheHostSet.remove(urlHostHash(group->manifestURL()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheStorage::setCacheDirectory(const String& cacheDirectory)
-{
- ASSERT(m_cacheDirectory.isNull());
- ASSERT(!cacheDirectory.isNull());
-
- m_cacheDirectory = cacheDirectory;
-}
-
</del><span class="cx"> const String& ApplicationCacheStorage::cacheDirectory() const
</span><span class="cx"> {
</span><span class="cx"> return m_cacheDirectory;
</span><span class="lines">@@ -1589,10 +1581,4 @@
</span><span class="cx"> return adoptRef(*new ApplicationCacheStorage(cacheDirectory, flatFileSubdirectoryName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ApplicationCacheStorage& ApplicationCacheStorage::singleton()
-{
- static ApplicationCacheStorage& storage = create(String(), "ApplicationCache").leakRef();
- return storage;
</del><span class="cx"> }
</span><del>-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h (199848 => 199849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2016-04-22 00:09:36 UTC (rev 199848)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2016-04-22 00:18:48 UTC (rev 199849)
</span><span class="lines">@@ -52,12 +52,8 @@
</span><span class="cx"> DiskOrOperationFailure
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // FIXME: Migrate off of this singleton and towards a world where each page has a storage.
- WEBCORE_EXPORT static ApplicationCacheStorage& singleton();
-
</del><span class="cx"> WEBCORE_EXPORT static Ref<ApplicationCacheStorage> create(const String& cacheDirectory, const String& flatFileSubdirectoryName);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setCacheDirectory(const String&);
</del><span class="cx"> const String& cacheDirectory() const;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setMaximumSize(int64_t size);
</span><span class="lines">@@ -142,9 +138,9 @@
</span><span class="cx"> void checkForDeletedResources();
</span><span class="cx"> long long flatFileAreaSize();
</span><span class="cx">
</span><del>- String m_cacheDirectory;
- String m_cacheFile;
</del><ins>+ const String m_cacheDirectory;
</ins><span class="cx"> const String m_flatFileSubdirectoryName;
</span><ins>+ String m_cacheFile;
</ins><span class="cx">
</span><span class="cx"> int64_t m_maximumSize;
</span><span class="cx"> bool m_isMaximumSizeReached;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (199848 => 199849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-04-22 00:09:36 UTC (rev 199848)
+++ trunk/Source/WebCore/page/Page.cpp 2016-04-22 00:18:48 UTC (rev 199849)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_lastSpatialNavigationCandidatesCount(0) // NOTE: Only called from Internals for Spatial Navigation testing.
</span><span class="cx"> , m_forbidPromptsDepth(0)
</span><del>- , m_applicationCacheStorage(pageConfiguration.applicationCacheStorage ? *WTFMove(pageConfiguration.applicationCacheStorage) : ApplicationCacheStorage::singleton())
</del><ins>+ , m_applicationCacheStorage(*WTFMove(pageConfiguration.applicationCacheStorage))
</ins><span class="cx"> , m_databaseProvider(*WTFMove(pageConfiguration.databaseProvider))
</span><span class="cx"> , m_storageNamespaceProvider(*WTFMove(pageConfiguration.storageNamespaceProvider))
</span><span class="cx"> , m_userContentProvider(*WTFMove(pageConfiguration.userContentProvider))
</span></span></pre>
</div>
</div>
</body>
</html>