<!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>[177151] trunk/Source</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/177151">177151</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 09:12:54 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the storage strategy
https://bugs.webkit.org/show_bug.cgi?id=139519
Reviewed by Antti Koivisto.
Source/WebCore:
* CMakeLists.txt:
* WebCore.exp.in:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::localStorage):
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::~Page):
(WebCore::Page::sessionStorage):
(WebCore::Page::setStorageNamespaceProvider):
* page/Page.h:
(WebCore::Page::storageNamespaceProvider):
* page/PageGroup.cpp:
(WebCore::PageGroup::localStorage):
(WebCore::PageGroup::transientLocalStorage):
* platform/PlatformStrategies.h:
(WebCore::PlatformStrategies::PlatformStrategies):
(WebCore::PlatformStrategies::storageStrategy): Deleted.
* storage/StorageNamespace.cpp: Removed.
* storage/StorageNamespace.h:
* storage/StorageStrategy.cpp: Removed.
* storage/StorageStrategy.h: Removed.
Source/WebKit/mac:
* WebCoreSupport/WebPlatformStrategies.h:
* WebCoreSupport/WebPlatformStrategies.mm:
(WebPlatformStrategies::createStorageStrategy): Deleted.
Source/WebKit/win:
* WebCoreSupport/WebPlatformStrategies.cpp:
(WebPlatformStrategies::createStorageStrategy): Deleted.
* WebCoreSupport/WebPlatformStrategies.h:
Source/WebKit2:
* NetworkProcess/NetworkProcessPlatformStrategies.cpp:
(WebKit::NetworkProcessPlatformStrategies::createStorageStrategy): Deleted.
* NetworkProcess/NetworkProcessPlatformStrategies.h:
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::createStorageStrategy): Deleted.
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformStrategiesh">trunk/Source/WebCore/platform/PlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageNamespaceh">trunk/Source/WebCore/storage/StorageNamespace.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessPlatformStrategiescpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessPlatformStrategiesh">trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorestorageStorageNamespacecpp">trunk/Source/WebCore/storage/StorageNamespace.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageStrategycpp">trunk/Source/WebCore/storage/StorageStrategy.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageStrategyh">trunk/Source/WebCore/storage/StorageStrategy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -2485,10 +2485,8 @@
</span><span class="cx"> storage/StorageEvent.cpp
</span><span class="cx"> storage/StorageEventDispatcher.cpp
</span><span class="cx"> storage/StorageMap.cpp
</span><del>- storage/StorageNamespace.cpp
</del><span class="cx"> storage/StorageNamespaceImpl.cpp
</span><span class="cx"> storage/StorageNamespaceProvider.cpp
</span><del>- storage/StorageStrategy.cpp
</del><span class="cx"> storage/StorageSyncManager.cpp
</span><span class="cx"> storage/StorageThread.cpp
</span><span class="cx"> storage/StorageTracker.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/ChangeLog 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-12-10 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the storage strategy
+ https://bugs.webkit.org/show_bug.cgi?id=139519
+
+ Reviewed by Antti Koivisto.
+
+ * CMakeLists.txt:
+ * WebCore.exp.in:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::localStorage):
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::~Page):
+ (WebCore::Page::sessionStorage):
+ (WebCore::Page::setStorageNamespaceProvider):
+ * page/Page.h:
+ (WebCore::Page::storageNamespaceProvider):
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::localStorage):
+ (WebCore::PageGroup::transientLocalStorage):
+ * platform/PlatformStrategies.h:
+ (WebCore::PlatformStrategies::PlatformStrategies):
+ (WebCore::PlatformStrategies::storageStrategy): Deleted.
+ * storage/StorageNamespace.cpp: Removed.
+ * storage/StorageNamespace.h:
+ * storage/StorageStrategy.cpp: Removed.
+ * storage/StorageStrategy.h: Removed.
+
</ins><span class="cx"> 2014-12-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Move click counter logic back to WebKitWebViewBase
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -652,9 +652,6 @@
</span><span class="cx"> __ZN7WebCore15SQLiteStatementD1Ev
</span><span class="cx"> __ZN7WebCore15ScrollAlignment17alignCenterAlwaysE
</span><span class="cx"> __ZN7WebCore15ScrollAlignment19alignToEdgeIfNeededE
</span><del>-__ZN7WebCore15StorageStrategy21localStorageNamespaceEPNS_9PageGroupE
-__ZN7WebCore15StorageStrategy23sessionStorageNamespaceEPNS_4PageE
-__ZN7WebCore15StorageStrategy30transientLocalStorageNamespaceEPNS_9PageGroupEPNS_14SecurityOriginE
</del><span class="cx"> __ZN7WebCore15StringTruncator13rightTruncateERKN3WTF6StringEfRKNS_4FontENS0_24EnableRoundingHacksOrNotE
</span><span class="cx"> __ZN7WebCore15StringTruncator14centerTruncateERKN3WTF6StringEfRKNS_4FontENS0_24EnableRoundingHacksOrNotE
</span><span class="cx"> __ZN7WebCore15StringTruncator5widthERKN3WTF6StringERKNS_4FontENS0_24EnableRoundingHacksOrNotE
</span><span class="lines">@@ -2116,7 +2113,6 @@
</span><span class="cx"> __ZTVN7WebCore14LoaderStrategyE
</span><span class="cx"> __ZTVN7WebCore14StaticNodeListE
</span><span class="cx"> __ZTVN7WebCore15PlatformCALayerE
</span><del>-__ZTVN7WebCore15StorageStrategyE
</del><span class="cx"> __ZTVN7WebCore16BlobRegistryImplE
</span><span class="cx"> __ZTVN7WebCore16DatabaseStrategyE
</span><span class="cx"> __ZTVN7WebCore16IconDatabaseBaseE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -7982,7 +7982,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\storage\StorageStrategy.cpp" />
</del><span class="cx"> <ClCompile Include="..\svg\graphics\SVGImageForContainer.cpp" />
</span><span class="cx"> <ClCompile Include="..\WebCorePrefix.cpp">
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
</span><span class="lines">@@ -19562,8 +19561,6 @@
</span><span class="cx"> <ClInclude Include="..\rendering\HitTestLocation.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\RenderLayerMaskImageInfo.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\style\StyleCachedImageSet.h" />
</span><del>- <ClInclude Include="..\storage\StorageStrategy.h" />
- <ClInclude Include="..\svg\graphics\SVGImageForContainer.h" />
</del><span class="cx"> <ClInclude Include="..\WebCorePrefix.h" />
</span><span class="cx"> <ClInclude Include="..\platform\win\WebCoreTextRenderer.h" />
</span><span class="cx"> <ClInclude Include="..\platform\win\WindowMessageBroadcaster.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -5098,9 +5098,6 @@
</span><span class="cx"> <ClCompile Include="..\html\track\TextTrackCueGeneric.cpp">
</span><span class="cx"> <Filter>html\track</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\storage\StorageStrategy.cpp">
- <Filter>storage</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\html\track\WebVTTElement.cpp">
</span><span class="cx"> <Filter>html\track</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -13052,9 +13049,6 @@
</span><span class="cx"> <ClInclude Include="..\html\track\TextTrackCueGeneric.h">
</span><span class="cx"> <Filter>html\track</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\storage\StorageStrategy.h">
- <Filter>storage</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\html\track\WebVTTElement.h">
</span><span class="cx"> <Filter>html\track</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -806,8 +806,6 @@
</span><span class="cx"> 1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDE114DC8C8F00AF64B3 /* ScrollingTreeNode.cpp */; };
</span><span class="cx"> 1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 1AB09DB416AF5F6C008538E7 /* StorageStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */; };
- 1AB09DB516AF5F6C008538E7 /* StorageStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 1AB33DA512551E320024457A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB33DA412551E320024457A /* IOKit.framework */; };
</span><span class="cx"> 1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */; };
</span><span class="cx"> 1AB5EBD2194A50F30059AC70 /* HTTPHeaderNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC900C21943C0A0008625B5 /* HTTPHeaderNames.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -5544,7 +5542,6 @@
</span><span class="cx"> C4CD629B18383766007EBAF1 /* FrameSnapshotting.h in Headers */ = {isa = PBXBuildFile; fileRef = C4CD629918383766007EBAF1 /* FrameSnapshotting.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50B561412119D23008B46E0 /* GroupSettings.cpp */; };
</span><span class="cx"> C50B561712119D23008B46E0 /* GroupSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C50B561512119D23008B46E0 /* GroupSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- C50D0E820FF4272900AC2644 /* StorageNamespace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */; };
</del><span class="cx"> C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = C50D0E810FF4272900AC2644 /* StorageNamespace.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */; };
</span><span class="cx"> C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */; };
</span><span class="lines">@@ -7814,8 +7811,6 @@
</span><span class="cx"> 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTree.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AAADDE114DC8C8F00AF64B3 /* ScrollingTreeNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeNode.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeNode.h; sourceTree = "<group>"; };
</span><del>- 1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageStrategy.cpp; sourceTree = "<group>"; };
- 1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageStrategy.h; sourceTree = "<group>"; };
</del><span class="cx"> 1AB33DA412551E320024457A /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShapeValue.cpp; path = style/ShapeValue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XPathEvaluator.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -13013,7 +13008,6 @@
</span><span class="cx"> C4CD629918383766007EBAF1 /* FrameSnapshotting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameSnapshotting.h; sourceTree = "<group>"; };
</span><span class="cx"> C50B561412119D23008B46E0 /* GroupSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GroupSettings.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C50B561512119D23008B46E0 /* GroupSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupSettings.h; sourceTree = "<group>"; };
</span><del>- C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespace.cpp; sourceTree = "<group>"; };
</del><span class="cx"> C50D0E810FF4272900AC2644 /* StorageNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespace.h; sourceTree = "<group>"; };
</span><span class="cx"> C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageSyncManager.h; sourceTree = "<group>"; };
</span><span class="cx"> C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageSyncManager.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -15150,14 +15144,11 @@
</span><span class="cx"> C5EBDD81105EDDEC0056816F /* StorageEventDispatcher.h */,
</span><span class="cx"> 51E0BB370DA5ACB600A9E417 /* StorageMap.cpp */,
</span><span class="cx"> 51E0BB360DA5ACB600A9E417 /* StorageMap.h */,
</span><del>- C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */,
</del><span class="cx"> C50D0E810FF4272900AC2644 /* StorageNamespace.h */,
</span><span class="cx"> C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */,
</span><span class="cx"> C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */,
</span><span class="cx"> 1A3763691A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp */,
</span><span class="cx"> 1A37636A1A2E68BB009A7EE2 /* StorageNamespaceProvider.h */,
</span><del>- 1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */,
- 1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */,
</del><span class="cx"> C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */,
</span><span class="cx"> C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */,
</span><span class="cx"> 511F23150DC160DA004F0032 /* StorageThread.cpp */,
</span><span class="lines">@@ -26204,7 +26195,6 @@
</span><span class="cx"> 51E0BB380DA5ACB600A9E417 /* StorageMap.h in Headers */,
</span><span class="cx"> C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */,
</span><span class="cx"> C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */,
</span><del>- 1AB09DB516AF5F6C008538E7 /* StorageStrategy.h in Headers */,
</del><span class="cx"> C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */,
</span><span class="cx"> 511F231A0DC160DA004F0032 /* StorageThread.h in Headers */,
</span><span class="cx"> 3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */,
</span><span class="lines">@@ -29620,9 +29610,7 @@
</span><span class="cx"> 51E0BABC0DA5547100A9E417 /* StorageEvent.cpp in Sources */,
</span><span class="cx"> C5E9B67710697E1300C7BB1A /* StorageEventDispatcher.cpp in Sources */,
</span><span class="cx"> 51E0BB390DA5ACB600A9E417 /* StorageMap.cpp in Sources */,
</span><del>- C50D0E820FF4272900AC2644 /* StorageNamespace.cpp in Sources */,
</del><span class="cx"> C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */,
</span><del>- 1AB09DB416AF5F6C008538E7 /* StorageStrategy.cpp in Sources */,
</del><span class="cx"> C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */,
</span><span class="cx"> 511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */,
</span><span class="cx"> 3AB02D2B12D4F91600FBB694 /* StorageTracker.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -857,19 +857,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<StorageArea> storageArea;
</span><del>- if (auto* storageNamespaceProvider = page->storageNamespaceProvider()) {
- if (document->securityOrigin()->canAccessLocalStorage(document->topOrigin()))
- storageArea = storageNamespaceProvider->localStorageNamespace().storageArea(document->securityOrigin());
- else
- storageArea = storageNamespaceProvider->transientLocalStorageNamespace(*document->topOrigin()).storageArea(document->securityOrigin());
- } else {
- // FIXME: Remove this once everyone has transitioned away from using the page group local storage.
- if (!document->securityOrigin()->canAccessLocalStorage(document->topOrigin()))
- storageArea = page->group().transientLocalStorage(document->topOrigin())->storageArea(document->securityOrigin());
- else
- storageArea = page->group().localStorage()->storageArea(document->securityOrigin());
- }
</del><span class="cx">
</span><ins>+ if (document->securityOrigin()->canAccessLocalStorage(document->topOrigin()))
+ storageArea = page->storageNamespaceProvider().localStorageNamespace().storageArea(document->securityOrigin());
+ else
+ storageArea = page->storageNamespaceProvider().transientLocalStorageNamespace(*document->topOrigin()).storageArea(document->securityOrigin());
+
</ins><span class="cx"> if (!storageArea->canAccessStorage(m_frame)) {
</span><span class="cx"> ec = SECURITY_ERR;
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/page/Page.cpp 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -203,7 +203,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_framesHandlingBeforeUnloadEvent(0)
</span><del>- , m_storageNamespaceProvider(WTF::move(pageConfiguration.storageNamespaceProvider))
</del><ins>+ , m_storageNamespaceProvider(*WTF::move(pageConfiguration.storageNamespaceProvider))
</ins><span class="cx"> , m_userContentController(WTF::move(pageConfiguration.userContentController))
</span><span class="cx"> , m_visitedLinkStore(*WTF::move(pageConfiguration.visitedLinkStore))
</span><span class="cx"> , m_sessionID(SessionID::defaultSessionID())
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx">
</span><span class="cx"> setTimerThrottlingEnabled(m_viewState & ViewState::IsVisuallyIdle);
</span><span class="cx">
</span><del>- if (m_storageNamespaceProvider)
- m_storageNamespaceProvider->addPage(*this);
</del><ins>+ m_storageNamespaceProvider->addPage(*this);
+
</ins><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_userContentController->addPage(*this);
</span><span class="cx">
</span><span class="lines">@@ -271,8 +271,8 @@
</span><span class="cx"> pageCounter.decrement();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_storageNamespaceProvider)
- m_storageNamespaceProvider->removePage(*this);
</del><ins>+ m_storageNamespaceProvider->removePage(*this);
+
</ins><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_userContentController->removePage(*this);
</span><span class="cx"> m_visitedLinkStore->removePage(*this);
</span><span class="lines">@@ -1090,12 +1090,8 @@
</span><span class="cx">
</span><span class="cx"> StorageNamespace* Page::sessionStorage(bool optionalCreate)
</span><span class="cx"> {
</span><del>- if (!m_sessionStorage && optionalCreate) {
- if (m_storageNamespaceProvider)
- m_sessionStorage = m_storageNamespaceProvider->createSessionStorageNamespace(*this, m_settings->sessionStorageQuota());
- else
- m_sessionStorage = StorageNamespace::sessionStorageNamespace(this);
- }
</del><ins>+ if (!m_sessionStorage && optionalCreate)
+ m_sessionStorage = m_storageNamespaceProvider->createSessionStorageNamespace(*this, m_settings->sessionStorageQuota());
</ins><span class="cx">
</span><span class="cx"> return m_sessionStorage.get();
</span><span class="cx"> }
</span><span class="lines">@@ -1651,9 +1647,7 @@
</span><span class="cx">
</span><span class="cx"> void Page::setStorageNamespaceProvider(PassRef<StorageNamespaceProvider> storageNamespaceProvider)
</span><span class="cx"> {
</span><del>- if (m_storageNamespaceProvider)
- m_storageNamespaceProvider->removePage(*this);
-
</del><ins>+ m_storageNamespaceProvider->removePage(*this);
</ins><span class="cx"> m_storageNamespaceProvider = WTF::move(storageNamespaceProvider);
</span><span class="cx"> m_storageNamespaceProvider->addPage(*this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/page/Page.h 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> void setLastSpatialNavigationCandidateCount(unsigned count) { m_lastSpatialNavigationCandidatesCount = count; }
</span><span class="cx"> unsigned lastSpatialNavigationCandidateCount() const { return m_lastSpatialNavigationCandidatesCount; }
</span><span class="cx">
</span><del>- StorageNamespaceProvider* storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
</del><ins>+ StorageNamespaceProvider& storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
</ins><span class="cx"> void setStorageNamespaceProvider(PassRef<StorageNamespaceProvider>);
</span><span class="cx">
</span><span class="cx"> UserContentController* userContentController() { return m_userContentController.get(); }
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> unsigned m_lastSpatialNavigationCandidatesCount;
</span><span class="cx"> unsigned m_framesHandlingBeforeUnloadEvent;
</span><span class="cx">
</span><del>- RefPtr<StorageNamespaceProvider> m_storageNamespaceProvider;
</del><ins>+ Ref<StorageNamespaceProvider> m_storageNamespaceProvider;
</ins><span class="cx"> RefPtr<UserContentController> m_userContentController;
</span><span class="cx"> Ref<VisitedLinkStore> m_visitedLinkStore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -166,20 +166,12 @@
</span><span class="cx">
</span><span class="cx"> StorageNamespace* PageGroup::localStorage()
</span><span class="cx"> {
</span><del>- if (!m_localStorage)
- m_localStorage = StorageNamespace::localStorageNamespace(this);
-
</del><span class="cx"> return m_localStorage.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StorageNamespace* PageGroup::transientLocalStorage(SecurityOrigin* topOrigin)
</del><ins>+StorageNamespace* PageGroup::transientLocalStorage(SecurityOrigin*)
</ins><span class="cx"> {
</span><del>- auto result = m_transientLocalStorageMap.add(topOrigin, nullptr);
-
- if (result.isNewEntry)
- result.iterator->value = StorageNamespace::transientLocalStorageNamespace(this, topOrigin);
-
- return result.iterator->value.get();
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformStrategies.h (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformStrategies.h 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/platform/PlatformStrategies.h 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> class PasteboardStrategy;
</span><span class="cx"> class PluginStrategy;
</span><span class="cx"> class SharedWorkerStrategy;
</span><del>-class StorageStrategy;
</del><span class="cx">
</span><span class="cx"> class PlatformStrategies {
</span><span class="cx"> public:
</span><span class="lines">@@ -80,13 +79,6 @@
</span><span class="cx"> return m_sharedWorkerStrategy;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- StorageStrategy* storageStrategy()
- {
- if (!m_storageStrategy)
- m_storageStrategy = createStorageStrategy();
- return m_storageStrategy;
- }
-
</del><span class="cx"> protected:
</span><span class="cx"> PlatformStrategies()
</span><span class="cx"> : m_cookiesStrategy(nullptr)
</span><span class="lines">@@ -95,7 +87,6 @@
</span><span class="cx"> , m_pasteboardStrategy(nullptr)
</span><span class="cx"> , m_pluginStrategy(nullptr)
</span><span class="cx"> , m_sharedWorkerStrategy(nullptr)
</span><del>- , m_storageStrategy(nullptr)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,7 +101,6 @@
</span><span class="cx"> virtual PasteboardStrategy* createPasteboardStrategy() = 0;
</span><span class="cx"> virtual PluginStrategy* createPluginStrategy() = 0;
</span><span class="cx"> virtual SharedWorkerStrategy* createSharedWorkerStrategy() = 0;
</span><del>- virtual StorageStrategy* createStorageStrategy() = 0;
</del><span class="cx">
</span><span class="cx"> CookiesStrategy* m_cookiesStrategy;
</span><span class="cx"> DatabaseStrategy* m_databaseStrategy;
</span><span class="lines">@@ -118,7 +108,6 @@
</span><span class="cx"> PasteboardStrategy* m_pasteboardStrategy;
</span><span class="cx"> PluginStrategy* m_pluginStrategy;
</span><span class="cx"> SharedWorkerStrategy* m_sharedWorkerStrategy;
</span><del>- StorageStrategy* m_storageStrategy;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> PlatformStrategies* platformStrategies();
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespacecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/storage/StorageNamespace.cpp (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespace.cpp 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/storage/StorageNamespace.cpp 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "StorageNamespace.h"
-
-#include "PlatformStrategies.h"
-#include "StorageStrategy.h"
-
-namespace WebCore {
-
-PassRefPtr<StorageNamespace> StorageNamespace::localStorageNamespace(PageGroup* pageGroup)
-{
- return platformStrategies()->storageStrategy()->localStorageNamespace(pageGroup);
-}
-
-PassRefPtr<StorageNamespace> StorageNamespace::transientLocalStorageNamespace(PageGroup* pageGroup, SecurityOrigin* securityOrigin)
-{
- return platformStrategies()->storageStrategy()->transientLocalStorageNamespace(pageGroup, securityOrigin);
-}
-
-PassRefPtr<StorageNamespace> StorageNamespace::sessionStorageNamespace(Page* page)
-{
- return platformStrategies()->storageStrategy()->sessionStorageNamespace(page);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespace.h (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespace.h 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/storage/StorageNamespace.h 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -39,10 +39,6 @@
</span><span class="cx">
</span><span class="cx"> class StorageNamespace : public RefCounted<StorageNamespace> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<StorageNamespace> localStorageNamespace(PageGroup*);
- static PassRefPtr<StorageNamespace> transientLocalStorageNamespace(PageGroup*, SecurityOrigin*);
- static PassRefPtr<StorageNamespace> sessionStorageNamespace(Page*);
-
</del><span class="cx"> virtual ~StorageNamespace() { }
</span><span class="cx"> virtual PassRefPtr<StorageArea> storageArea(PassRefPtr<SecurityOrigin>) = 0;
</span><span class="cx"> virtual PassRefPtr<StorageNamespace> copy(Page* newPage) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageStrategycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/storage/StorageStrategy.cpp (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageStrategy.cpp 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/storage/StorageStrategy.cpp 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "StorageStrategy.h"
-
-#include "StorageNamespaceImpl.h"
-
-namespace WebCore {
-
-PassRefPtr<StorageNamespace> StorageStrategy::localStorageNamespace(PageGroup* pageGroup)
-{
- return StorageNamespaceImpl::localStorageNamespace(pageGroup);
-}
-
-PassRefPtr<StorageNamespace> StorageStrategy::sessionStorageNamespace(Page* page)
-{
- return StorageNamespaceImpl::sessionStorageNamespace(page);
-}
-
-PassRefPtr<StorageNamespace> StorageStrategy::transientLocalStorageNamespace(PageGroup* pageGroup, SecurityOrigin* securityOrigin)
-{
- return StorageNamespaceImpl::transientLocalStorageNamespace(pageGroup, securityOrigin);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorestorageStorageStrategyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/storage/StorageStrategy.h (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageStrategy.h 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebCore/storage/StorageStrategy.h 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef StorageStrategy_h
-#define StorageStrategy_h
-
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-class Page;
-class PageGroup;
-class SecurityOrigin;
-class StorageNamespace;
-
-class StorageStrategy {
-public:
- WEBCORE_EXPORT virtual PassRefPtr<StorageNamespace> localStorageNamespace(PageGroup*);
- WEBCORE_EXPORT virtual PassRefPtr<StorageNamespace> transientLocalStorageNamespace(PageGroup*, SecurityOrigin*);
- WEBCORE_EXPORT virtual PassRefPtr<StorageNamespace> sessionStorageNamespace(Page*);
-
-protected:
- virtual ~StorageStrategy()
- {
- }
-};
-
-} // namespace WebCore
-
-#endif // StorageStrategy_h
</del></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-10 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the storage strategy
+ https://bugs.webkit.org/show_bug.cgi?id=139519
+
+ Reviewed by Antti Koivisto.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::createStorageStrategy): Deleted.
+
</ins><span class="cx"> 2014-12-10 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Copy and paste action menu items don't work on the Mozilla Midas demo in WebKit1
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -33,12 +33,11 @@
</span><span class="cx"> #include <WebCore/PlatformStrategies.h>
</span><span class="cx"> #include <WebCore/PluginStrategy.h>
</span><span class="cx"> #include <WebCore/SharedWorkerStrategy.h>
</span><del>-#include <WebCore/StorageStrategy.h>
</del><span class="cx">
</span><span class="cx"> struct PasteboardImage;
</span><span class="cx"> struct PasteboardWebContent;
</span><span class="cx">
</span><del>-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy, private WebCore::StorageStrategy {
</del><ins>+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
</ins><span class="cx"> public:
</span><span class="cx"> static void initializeIfNecessary();
</span><span class="cx">
</span><span class="lines">@@ -52,7 +51,6 @@
</span><span class="cx"> virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
</span><span class="cx"> virtual WebCore::PluginStrategy* createPluginStrategy() override;
</span><span class="cx"> virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy() override;
</span><del>- virtual WebCore::StorageStrategy* createStorageStrategy() override;
</del><span class="cx">
</span><span class="cx"> // WebCore::CookiesStrategy
</span><span class="cx"> virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -85,11 +85,6 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StorageStrategy* WebPlatformStrategies::createStorageStrategy()
-{
- return this;
-}
-
</del><span class="cx"> String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span><span class="cx"> {
</span><span class="cx"> return WebCore::cookiesForDOM(session, firstParty, url);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit/win/ChangeLog 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-10 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the storage strategy
+ https://bugs.webkit.org/show_bug.cgi?id=139519
+
+ Reviewed by Antti Koivisto.
+
+ * WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebPlatformStrategies::createStorageStrategy): Deleted.
+ * WebCoreSupport/WebPlatformStrategies.h:
+
</ins><span class="cx"> 2014-12-08 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use the new storage namespace provider in WebKit1
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -77,11 +77,6 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StorageStrategy* WebPlatformStrategies::createStorageStrategy()
-{
- return this;
-}
-
</del><span class="cx"> String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span><span class="cx"> {
</span><span class="cx"> return WebCore::cookiesForDOM(session, firstParty, url);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -32,9 +32,8 @@
</span><span class="cx"> #include <WebCore/PlatformStrategies.h>
</span><span class="cx"> #include <WebCore/PluginStrategy.h>
</span><span class="cx"> #include <WebCore/SharedWorkerStrategy.h>
</span><del>-#include <WebCore/StorageStrategy.h>
</del><span class="cx">
</span><del>-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy, private WebCore::StorageStrategy {
</del><ins>+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
</ins><span class="cx"> public:
</span><span class="cx"> static void initialize();
</span><span class="cx">
</span><span class="lines">@@ -48,7 +47,6 @@
</span><span class="cx"> virtual WebCore::PasteboardStrategy* createPasteboardStrategy();
</span><span class="cx"> virtual WebCore::PluginStrategy* createPluginStrategy();
</span><span class="cx"> virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy();
</span><del>- virtual WebCore::StorageStrategy* createStorageStrategy();
</del><span class="cx">
</span><span class="cx"> // WebCore::CookiesStrategy
</span><span class="cx"> virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-12-10 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the storage strategy
+ https://bugs.webkit.org/show_bug.cgi?id=139519
+
+ Reviewed by Antti Koivisto.
+
+ * NetworkProcess/NetworkProcessPlatformStrategies.cpp:
+ (WebKit::NetworkProcessPlatformStrategies::createStorageStrategy): Deleted.
+ * NetworkProcess/NetworkProcessPlatformStrategies.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::createStorageStrategy): Deleted.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
</ins><span class="cx"> 2014-12-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] WebKitNotification is defined twice
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -69,11 +69,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StorageStrategy* NetworkProcessPlatformStrategies::createStorageStrategy()
-{
- return 0;
-}
-
</del><span class="cx"> ResourceLoadScheduler* NetworkProcessPlatformStrategies::resourceLoadScheduler()
</span><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
</span><span class="cx"> virtual WebCore::PluginStrategy* createPluginStrategy() override;
</span><span class="cx"> virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy() override;
</span><del>- virtual WebCore::StorageStrategy* createStorageStrategy() override;
</del><span class="cx">
</span><span class="cx"> // WebCore::LoaderStrategy
</span><span class="cx"> virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -115,12 +115,6 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StorageStrategy* WebPlatformStrategies::createStorageStrategy()
-{
- ASSERT_NOT_REACHED();
- return nullptr;
-}
-
</del><span class="cx"> // CookiesStrategy
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (177150 => 177151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2014-12-11 17:09:24 UTC (rev 177150)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2014-12-11 17:12:54 UTC (rev 177151)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include <WebCore/PlatformStrategies.h>
</span><span class="cx"> #include <WebCore/PluginStrategy.h>
</span><span class="cx"> #include <WebCore/SharedWorkerStrategy.h>
</span><del>-#include <WebCore/StorageStrategy.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -53,7 +52,6 @@
</span><span class="cx"> virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
</span><span class="cx"> virtual WebCore::PluginStrategy* createPluginStrategy() override;
</span><span class="cx"> virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy() override;
</span><del>- virtual WebCore::StorageStrategy* createStorageStrategy() override;
</del><span class="cx">
</span><span class="cx"> // WebCore::CookiesStrategy
</span><span class="cx"> virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
</span></span></pre>
</div>
</div>
</body>
</html>