Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (177150 => 177151)
--- 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)
@@ -2485,10 +2485,8 @@
storage/StorageEvent.cpp
storage/StorageEventDispatcher.cpp
storage/StorageMap.cpp
- storage/StorageNamespace.cpp
storage/StorageNamespaceImpl.cpp
storage/StorageNamespaceProvider.cpp
- storage/StorageStrategy.cpp
storage/StorageSyncManager.cpp
storage/StorageThread.cpp
storage/StorageTracker.cpp
Modified: trunk/Source/WebCore/ChangeLog (177150 => 177151)
--- 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)
@@ -1,3 +1,35 @@
+2014-12-10 Anders Carlsson <[email protected]>
+
+ 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.
+
2014-12-11 Carlos Garcia Campos <[email protected]>
[GTK] Move click counter logic back to WebKitWebViewBase
Modified: trunk/Source/WebCore/WebCore.exp.in (177150 => 177151)
--- 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)
@@ -652,9 +652,6 @@
__ZN7WebCore15SQLiteStatementD1Ev
__ZN7WebCore15ScrollAlignment17alignCenterAlwaysE
__ZN7WebCore15ScrollAlignment19alignToEdgeIfNeededE
-__ZN7WebCore15StorageStrategy21localStorageNamespaceEPNS_9PageGroupE
-__ZN7WebCore15StorageStrategy23sessionStorageNamespaceEPNS_4PageE
-__ZN7WebCore15StorageStrategy30transientLocalStorageNamespaceEPNS_9PageGroupEPNS_14SecurityOriginE
__ZN7WebCore15StringTruncator13rightTruncateERKN3WTF6StringEfRKNS_4FontENS0_24EnableRoundingHacksOrNotE
__ZN7WebCore15StringTruncator14centerTruncateERKN3WTF6StringEfRKNS_4FontENS0_24EnableRoundingHacksOrNotE
__ZN7WebCore15StringTruncator5widthERKN3WTF6StringERKNS_4FontENS0_24EnableRoundingHacksOrNotE
@@ -2116,7 +2113,6 @@
__ZTVN7WebCore14LoaderStrategyE
__ZTVN7WebCore14StaticNodeListE
__ZTVN7WebCore15PlatformCALayerE
-__ZTVN7WebCore15StorageStrategyE
__ZTVN7WebCore16BlobRegistryImplE
__ZTVN7WebCore16DatabaseStrategyE
__ZTVN7WebCore16IconDatabaseBaseE
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (177150 => 177151)
--- 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)
@@ -7982,7 +7982,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\storage\StorageStrategy.cpp" />
<ClCompile Include="..\svg\graphics\SVGImageForContainer.cpp" />
<ClCompile Include="..\WebCorePrefix.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -19562,8 +19561,6 @@
<ClInclude Include="..\rendering\HitTestLocation.h" />
<ClInclude Include="..\rendering\RenderLayerMaskImageInfo.h" />
<ClInclude Include="..\rendering\style\StyleCachedImageSet.h" />
- <ClInclude Include="..\storage\StorageStrategy.h" />
- <ClInclude Include="..\svg\graphics\SVGImageForContainer.h" />
<ClInclude Include="..\WebCorePrefix.h" />
<ClInclude Include="..\platform\win\WebCoreTextRenderer.h" />
<ClInclude Include="..\platform\win\WindowMessageBroadcaster.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (177150 => 177151)
--- 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)
@@ -5098,9 +5098,6 @@
<ClCompile Include="..\html\track\TextTrackCueGeneric.cpp">
<Filter>html\track</Filter>
</ClCompile>
- <ClCompile Include="..\storage\StorageStrategy.cpp">
- <Filter>storage</Filter>
- </ClCompile>
<ClCompile Include="..\html\track\WebVTTElement.cpp">
<Filter>html\track</Filter>
</ClCompile>
@@ -13052,9 +13049,6 @@
<ClInclude Include="..\html\track\TextTrackCueGeneric.h">
<Filter>html\track</Filter>
</ClInclude>
- <ClInclude Include="..\storage\StorageStrategy.h">
- <Filter>storage</Filter>
- </ClInclude>
<ClInclude Include="..\html\track\WebVTTElement.h">
<Filter>html\track</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (177150 => 177151)
--- 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)
@@ -806,8 +806,6 @@
1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAADDE114DC8C8F00AF64B3 /* ScrollingTreeNode.cpp */; };
1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 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, ); }; };
1AB33DA512551E320024457A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB33DA412551E320024457A /* IOKit.framework */; };
1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */; };
1AB5EBD2194A50F30059AC70 /* HTTPHeaderNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC900C21943C0A0008625B5 /* HTTPHeaderNames.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5544,7 +5542,6 @@
C4CD629B18383766007EBAF1 /* FrameSnapshotting.h in Headers */ = {isa = PBXBuildFile; fileRef = C4CD629918383766007EBAF1 /* FrameSnapshotting.h */; settings = {ATTRIBUTES = (Private, ); }; };
C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50B561412119D23008B46E0 /* GroupSettings.cpp */; };
C50B561712119D23008B46E0 /* GroupSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C50B561512119D23008B46E0 /* GroupSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
- C50D0E820FF4272900AC2644 /* StorageNamespace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */; };
C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = C50D0E810FF4272900AC2644 /* StorageNamespace.h */; settings = {ATTRIBUTES = (Private, ); }; };
C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */; };
C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */; };
@@ -7814,8 +7811,6 @@
1AAADDA214DB409F00AF64B3 /* ScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTree.h; sourceTree = "<group>"; };
1AAADDE114DC8C8F00AF64B3 /* ScrollingTreeNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeNode.cpp; sourceTree = "<group>"; };
1AAADDE214DC8C8F00AF64B3 /* ScrollingTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeNode.h; sourceTree = "<group>"; };
- 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>"; };
1AB33DA412551E320024457A /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShapeValue.cpp; path = style/ShapeValue.cpp; sourceTree = "<group>"; };
1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XPathEvaluator.cpp; sourceTree = "<group>"; };
@@ -13013,7 +13008,6 @@
C4CD629918383766007EBAF1 /* FrameSnapshotting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameSnapshotting.h; sourceTree = "<group>"; };
C50B561412119D23008B46E0 /* GroupSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GroupSettings.cpp; sourceTree = "<group>"; };
C50B561512119D23008B46E0 /* GroupSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupSettings.h; sourceTree = "<group>"; };
- C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespace.cpp; sourceTree = "<group>"; };
C50D0E810FF4272900AC2644 /* StorageNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespace.h; sourceTree = "<group>"; };
C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageSyncManager.h; sourceTree = "<group>"; };
C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageSyncManager.cpp; sourceTree = "<group>"; };
@@ -15150,14 +15144,11 @@
C5EBDD81105EDDEC0056816F /* StorageEventDispatcher.h */,
51E0BB370DA5ACB600A9E417 /* StorageMap.cpp */,
51E0BB360DA5ACB600A9E417 /* StorageMap.h */,
- C50D0E800FF4272900AC2644 /* StorageNamespace.cpp */,
C50D0E810FF4272900AC2644 /* StorageNamespace.h */,
C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */,
C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */,
1A3763691A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp */,
1A37636A1A2E68BB009A7EE2 /* StorageNamespaceProvider.h */,
- 1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */,
- 1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */,
C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */,
C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */,
511F23150DC160DA004F0032 /* StorageThread.cpp */,
@@ -26204,7 +26195,6 @@
51E0BB380DA5ACB600A9E417 /* StorageMap.h in Headers */,
C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */,
C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */,
- 1AB09DB516AF5F6C008538E7 /* StorageStrategy.h in Headers */,
C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */,
511F231A0DC160DA004F0032 /* StorageThread.h in Headers */,
3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */,
@@ -29620,9 +29610,7 @@
51E0BABC0DA5547100A9E417 /* StorageEvent.cpp in Sources */,
C5E9B67710697E1300C7BB1A /* StorageEventDispatcher.cpp in Sources */,
51E0BB390DA5ACB600A9E417 /* StorageMap.cpp in Sources */,
- C50D0E820FF4272900AC2644 /* StorageNamespace.cpp in Sources */,
C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */,
- 1AB09DB416AF5F6C008538E7 /* StorageStrategy.cpp in Sources */,
C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */,
511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */,
3AB02D2B12D4F91600FBB694 /* StorageTracker.cpp in Sources */,
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (177150 => 177151)
--- 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)
@@ -857,19 +857,12 @@
return nullptr;
RefPtr<StorageArea> storageArea;
- 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());
- }
+ if (document->securityOrigin()->canAccessLocalStorage(document->topOrigin()))
+ storageArea = page->storageNamespaceProvider().localStorageNamespace().storageArea(document->securityOrigin());
+ else
+ storageArea = page->storageNamespaceProvider().transientLocalStorageNamespace(*document->topOrigin()).storageArea(document->securityOrigin());
+
if (!storageArea->canAccessStorage(m_frame)) {
ec = SECURITY_ERR;
return nullptr;
Modified: trunk/Source/WebCore/page/Page.cpp (177150 => 177151)
--- 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)
@@ -203,7 +203,7 @@
#endif
, m_lastSpatialNavigationCandidatesCount(0) // NOTE: Only called from Internals for Spatial Navigation testing.
, m_framesHandlingBeforeUnloadEvent(0)
- , m_storageNamespaceProvider(WTF::move(pageConfiguration.storageNamespaceProvider))
+ , m_storageNamespaceProvider(*WTF::move(pageConfiguration.storageNamespaceProvider))
, m_userContentController(WTF::move(pageConfiguration.userContentController))
, m_visitedLinkStore(*WTF::move(pageConfiguration.visitedLinkStore))
, m_sessionID(SessionID::defaultSessionID())
@@ -214,8 +214,8 @@
setTimerThrottlingEnabled(m_viewState & ViewState::IsVisuallyIdle);
- if (m_storageNamespaceProvider)
- m_storageNamespaceProvider->addPage(*this);
+ m_storageNamespaceProvider->addPage(*this);
+
if (m_userContentController)
m_userContentController->addPage(*this);
@@ -271,8 +271,8 @@
pageCounter.decrement();
#endif
- if (m_storageNamespaceProvider)
- m_storageNamespaceProvider->removePage(*this);
+ m_storageNamespaceProvider->removePage(*this);
+
if (m_userContentController)
m_userContentController->removePage(*this);
m_visitedLinkStore->removePage(*this);
@@ -1090,12 +1090,8 @@
StorageNamespace* Page::sessionStorage(bool optionalCreate)
{
- if (!m_sessionStorage && optionalCreate) {
- if (m_storageNamespaceProvider)
- m_sessionStorage = m_storageNamespaceProvider->createSessionStorageNamespace(*this, m_settings->sessionStorageQuota());
- else
- m_sessionStorage = StorageNamespace::sessionStorageNamespace(this);
- }
+ if (!m_sessionStorage && optionalCreate)
+ m_sessionStorage = m_storageNamespaceProvider->createSessionStorageNamespace(*this, m_settings->sessionStorageQuota());
return m_sessionStorage.get();
}
@@ -1651,9 +1647,7 @@
void Page::setStorageNamespaceProvider(PassRef<StorageNamespaceProvider> storageNamespaceProvider)
{
- if (m_storageNamespaceProvider)
- m_storageNamespaceProvider->removePage(*this);
-
+ m_storageNamespaceProvider->removePage(*this);
m_storageNamespaceProvider = WTF::move(storageNamespaceProvider);
m_storageNamespaceProvider->addPage(*this);
Modified: trunk/Source/WebCore/page/Page.h (177150 => 177151)
--- 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)
@@ -402,7 +402,7 @@
void setLastSpatialNavigationCandidateCount(unsigned count) { m_lastSpatialNavigationCandidatesCount = count; }
unsigned lastSpatialNavigationCandidateCount() const { return m_lastSpatialNavigationCandidatesCount; }
- StorageNamespaceProvider* storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
+ StorageNamespaceProvider& storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
void setStorageNamespaceProvider(PassRef<StorageNamespaceProvider>);
UserContentController* userContentController() { return m_userContentController.get(); }
@@ -573,7 +573,7 @@
unsigned m_lastSpatialNavigationCandidatesCount;
unsigned m_framesHandlingBeforeUnloadEvent;
- RefPtr<StorageNamespaceProvider> m_storageNamespaceProvider;
+ Ref<StorageNamespaceProvider> m_storageNamespaceProvider;
RefPtr<UserContentController> m_userContentController;
Ref<VisitedLinkStore> m_visitedLinkStore;
Modified: trunk/Source/WebCore/page/PageGroup.cpp (177150 => 177151)
--- 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)
@@ -166,20 +166,12 @@
StorageNamespace* PageGroup::localStorage()
{
- if (!m_localStorage)
- m_localStorage = StorageNamespace::localStorageNamespace(this);
-
return m_localStorage.get();
}
-StorageNamespace* PageGroup::transientLocalStorage(SecurityOrigin* topOrigin)
+StorageNamespace* PageGroup::transientLocalStorage(SecurityOrigin*)
{
- auto result = m_transientLocalStorageMap.add(topOrigin, nullptr);
-
- if (result.isNewEntry)
- result.iterator->value = StorageNamespace::transientLocalStorageNamespace(this, topOrigin);
-
- return result.iterator->value.get();
+ return nullptr;
}
#if ENABLE(VIDEO_TRACK)
Modified: trunk/Source/WebCore/platform/PlatformStrategies.h (177150 => 177151)
--- 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)
@@ -34,7 +34,6 @@
class PasteboardStrategy;
class PluginStrategy;
class SharedWorkerStrategy;
-class StorageStrategy;
class PlatformStrategies {
public:
@@ -80,13 +79,6 @@
return m_sharedWorkerStrategy;
}
- StorageStrategy* storageStrategy()
- {
- if (!m_storageStrategy)
- m_storageStrategy = createStorageStrategy();
- return m_storageStrategy;
- }
-
protected:
PlatformStrategies()
: m_cookiesStrategy(nullptr)
@@ -95,7 +87,6 @@
, m_pasteboardStrategy(nullptr)
, m_pluginStrategy(nullptr)
, m_sharedWorkerStrategy(nullptr)
- , m_storageStrategy(nullptr)
{
}
@@ -110,7 +101,6 @@
virtual PasteboardStrategy* createPasteboardStrategy() = 0;
virtual PluginStrategy* createPluginStrategy() = 0;
virtual SharedWorkerStrategy* createSharedWorkerStrategy() = 0;
- virtual StorageStrategy* createStorageStrategy() = 0;
CookiesStrategy* m_cookiesStrategy;
DatabaseStrategy* m_databaseStrategy;
@@ -118,7 +108,6 @@
PasteboardStrategy* m_pasteboardStrategy;
PluginStrategy* m_pluginStrategy;
SharedWorkerStrategy* m_sharedWorkerStrategy;
- StorageStrategy* m_storageStrategy;
};
PlatformStrategies* platformStrategies();
Deleted: trunk/Source/WebCore/storage/StorageNamespace.cpp (177150 => 177151)
--- 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)
@@ -1,49 +0,0 @@
-/*
- * 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
Modified: trunk/Source/WebCore/storage/StorageNamespace.h (177150 => 177151)
--- 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)
@@ -39,10 +39,6 @@
class StorageNamespace : public RefCounted<StorageNamespace> {
public:
- static PassRefPtr<StorageNamespace> localStorageNamespace(PageGroup*);
- static PassRefPtr<StorageNamespace> transientLocalStorageNamespace(PageGroup*, SecurityOrigin*);
- static PassRefPtr<StorageNamespace> sessionStorageNamespace(Page*);
-
virtual ~StorageNamespace() { }
virtual PassRefPtr<StorageArea> storageArea(PassRefPtr<SecurityOrigin>) = 0;
virtual PassRefPtr<StorageNamespace> copy(Page* newPage) = 0;
Deleted: trunk/Source/WebCore/storage/StorageStrategy.cpp (177150 => 177151)
--- 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)
@@ -1,48 +0,0 @@
-/*
- * 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
Deleted: trunk/Source/WebCore/storage/StorageStrategy.h (177150 => 177151)
--- 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)
@@ -1,52 +0,0 @@
-/*
- * 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
Modified: trunk/Source/WebKit/mac/ChangeLog (177150 => 177151)
--- 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)
@@ -1,3 +1,14 @@
+2014-12-10 Anders Carlsson <[email protected]>
+
+ 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.
+
2014-12-10 Timothy Horton <[email protected]>
Copy and paste action menu items don't work on the Mozilla Midas demo in WebKit1
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (177150 => 177151)
--- 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)
@@ -33,12 +33,11 @@
#include <WebCore/PlatformStrategies.h>
#include <WebCore/PluginStrategy.h>
#include <WebCore/SharedWorkerStrategy.h>
-#include <WebCore/StorageStrategy.h>
struct PasteboardImage;
struct PasteboardWebContent;
-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 {
+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
public:
static void initializeIfNecessary();
@@ -52,7 +51,6 @@
virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
virtual WebCore::PluginStrategy* createPluginStrategy() override;
virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy() override;
- virtual WebCore::StorageStrategy* createStorageStrategy() override;
// WebCore::CookiesStrategy
virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (177150 => 177151)
--- 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)
@@ -85,11 +85,6 @@
return this;
}
-StorageStrategy* WebPlatformStrategies::createStorageStrategy()
-{
- return this;
-}
-
String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
{
return WebCore::cookiesForDOM(session, firstParty, url);
Modified: trunk/Source/WebKit/win/ChangeLog (177150 => 177151)
--- 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)
@@ -1,3 +1,14 @@
+2014-12-10 Anders Carlsson <[email protected]>
+
+ 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:
+
2014-12-08 Anders Carlsson <[email protected]>
Use the new storage namespace provider in WebKit1
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp (177150 => 177151)
--- 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)
@@ -77,11 +77,6 @@
return this;
}
-StorageStrategy* WebPlatformStrategies::createStorageStrategy()
-{
- return this;
-}
-
String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
{
return WebCore::cookiesForDOM(session, firstParty, url);
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h (177150 => 177151)
--- 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)
@@ -32,9 +32,8 @@
#include <WebCore/PlatformStrategies.h>
#include <WebCore/PluginStrategy.h>
#include <WebCore/SharedWorkerStrategy.h>
-#include <WebCore/StorageStrategy.h>
-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy, private WebCore::StorageStrategy {
+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
public:
static void initialize();
@@ -48,7 +47,6 @@
virtual WebCore::PasteboardStrategy* createPasteboardStrategy();
virtual WebCore::PluginStrategy* createPluginStrategy();
virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy();
- virtual WebCore::StorageStrategy* createStorageStrategy();
// WebCore::CookiesStrategy
virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&);
Modified: trunk/Source/WebKit2/ChangeLog (177150 => 177151)
--- 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)
@@ -1,3 +1,17 @@
+2014-12-10 Anders Carlsson <[email protected]>
+
+ 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:
+
2014-12-11 Carlos Garcia Campos <[email protected]>
[GTK] WebKitNotification is defined twice
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp (177150 => 177151)
--- 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)
@@ -69,11 +69,6 @@
return 0;
}
-StorageStrategy* NetworkProcessPlatformStrategies::createStorageStrategy()
-{
- return 0;
-}
-
ResourceLoadScheduler* NetworkProcessPlatformStrategies::resourceLoadScheduler()
{
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h (177150 => 177151)
--- 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)
@@ -43,7 +43,6 @@
virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
virtual WebCore::PluginStrategy* createPluginStrategy() override;
virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy() override;
- virtual WebCore::StorageStrategy* createStorageStrategy() override;
// WebCore::LoaderStrategy
virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (177150 => 177151)
--- 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)
@@ -115,12 +115,6 @@
return this;
}
-StorageStrategy* WebPlatformStrategies::createStorageStrategy()
-{
- ASSERT_NOT_REACHED();
- return nullptr;
-}
-
// CookiesStrategy
String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (177150 => 177151)
--- 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)
@@ -33,7 +33,6 @@
#include <WebCore/PlatformStrategies.h>
#include <WebCore/PluginStrategy.h>
#include <WebCore/SharedWorkerStrategy.h>
-#include <WebCore/StorageStrategy.h>
#include <wtf/NeverDestroyed.h>
namespace WebKit {
@@ -53,7 +52,6 @@
virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
virtual WebCore::PluginStrategy* createPluginStrategy() override;
virtual WebCore::SharedWorkerStrategy* createSharedWorkerStrategy() override;
- virtual WebCore::StorageStrategy* createStorageStrategy() override;
// WebCore::CookiesStrategy
virtual String cookiesForDOM(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&) override;
