Changeset 176696 in webkit

Timestamp:

Dec 2, 2014, 4:30:17 PM (12 years ago)

Author:

andersca@apple.com

Message:

Begin stubbing out a StorageNamespaceProvider class
​https://bugs.webkit.org/show_bug.cgi?id=139203

Reviewed by Tim Horton.

• CMakeLists.txt:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:

Add new files.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::localStorage):
If the page has a storage namespace provider, get the local storage from it.

• page/Page.cpp:

(WebCore::Page::Page):
Move the storage namespace provider from the configuration.

(WebCore::Page::setStorageNamespaceProvider):
Add a setter. This will be used by setGroupName.

• page/Page.h:

(WebCore::Page::storageNamespaceProvider):
Add a getter.

• page/PageConfiguration.cpp:
• page/PageConfiguration.h:

Add a storage namespace provider member.

• storage/StorageNamespaceProvider.cpp:

(WebCore::StorageNamespaceProvider::StorageNamespaceProvider):
(WebCore::StorageNamespaceProvider::~StorageNamespaceProvider):
(WebCore::StorageNamespaceProvider::addPage):
(WebCore::StorageNamespaceProvider::removePage):
(WebCore::StorageNamespaceProvider::localStorageNamespace):
(WebCore::StorageNamespaceProvider::transientLocalStorageNamespace):

• storage/StorageNamespaceProvider.h:

Stub out a storage namespace provider class.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCore.vcxproj/WebCore.vcxproj (modified) (2 diffs)
• WebCore.vcxproj/WebCore.vcxproj.filters (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• page/DOMWindow.cpp (modified) (2 diffs)
• page/Page.cpp (modified) (4 diffs)
• page/Page.h (modified) (3 diffs)
• page/PageConfiguration.cpp (modified) (1 diff)
• page/PageConfiguration.h (modified) (2 diffs)
• storage/StorageNamespaceProvider.cpp (added)
• storage/StorageNamespaceProvider.h (added)

trunk/Source/WebCore/CMakeLists.txt

@@ -2483 +2483 @@
     storage/StorageNamespace.cpp
     storage/StorageNamespaceImpl.cpp
+    storage/StorageNamespaceProvider.cpp
     storage/StorageStrategy.cpp
     storage/StorageSyncManager.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-02  Anders Carlsson  <andersca@apple.com>
+
+        Begin stubbing out a StorageNamespaceProvider class
+        https://bugs.webkit.org/show_bug.cgi?id=139203
+
+        Reviewed by Tim Horton.
+
+        * CMakeLists.txt:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        Add new files.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::localStorage):
+        If the page has a storage namespace provider, get the local storage from it.
+
+        * page/Page.cpp:
+        (WebCore::Page::Page):
+        Move the storage namespace provider from the configuration.
+
+        (WebCore::Page::setStorageNamespaceProvider):
+        Add a setter. This will be used by setGroupName.
+
+        * page/Page.h:
+        (WebCore::Page::storageNamespaceProvider):
+        Add a getter.
+
+        * page/PageConfiguration.cpp:
+        * page/PageConfiguration.h:
+        Add a storage namespace provider member.
+
+        * storage/StorageNamespaceProvider.cpp:
+        (WebCore::StorageNamespaceProvider::StorageNamespaceProvider):
+        (WebCore::StorageNamespaceProvider::~StorageNamespaceProvider):
+        (WebCore::StorageNamespaceProvider::addPage):
+        (WebCore::StorageNamespaceProvider::removePage):
+        (WebCore::StorageNamespaceProvider::localStorageNamespace):
+        (WebCore::StorageNamespaceProvider::transientLocalStorageNamespace):
+        * storage/StorageNamespaceProvider.h:
+        Stub out a storage namespace provider class.
+
 2014-12-02  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -17859 +17859 @@
     <ClCompile Include="..\storage\StorageNamespace.cpp" />
     <ClCompile Include="..\storage\StorageNamespaceImpl.cpp" />
+    <ClCompile Include="..\storage\StorageNamespaceProvider.cpp" />
     <ClCompile Include="..\storage\StorageSyncManager.cpp" />
     <ClCompile Include="..\storage\StorageThread.cpp" />
@@ -21260 +21261 @@
     <ClInclude Include="..\storage\StorageNamespace.h" />
     <ClInclude Include="..\storage\StorageNamespaceImpl.h" />
+    <ClInclude Include="..\storage\StorageNamespaceProvider.h" />
     <ClInclude Include="..\storage\StorageSyncManager.h" />
     <ClInclude Include="..\storage\StorageThread.h" />

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

@@ -4705 +4705 @@
       <Filter>storage</Filter>
     </ClCompile>
+    <ClCompile Include="..\storage\StorageNamespaceProvider.cpp">
+      <Filter>storage</Filter>
+    </ClCompile>
     <ClCompile Include="..\storage\StorageSyncManager.cpp">
       <Filter>storage</Filter>

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -700 +700 @@
                 1A3586E015264C450022A659 /* RenderMultiColumnFlowThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3586DE15264C450022A659 /* RenderMultiColumnFlowThread.h */; };
                 1A3586E115264F950022A659 /* SVGAnimatedIntegerOptionalInteger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71E623CE151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.cpp */; };
+                1A37636B1A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3763691A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp */; };
+                1A37636C1A2E68BB009A7EE2 /* StorageNamespaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A37636A1A2E68BB009A7EE2 /* StorageNamespaceProvider.h */; };
                 1A3FF9C315265359002288A1 /* RenderNamedFlowThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC85F23E1519187300BC17BE /* RenderNamedFlowThread.cpp */; };
                 1A494BFA0A122F4400FDAFC1 /* JSHTMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A494BF80A122F4400FDAFC1 /* JSHTMLElement.cpp */; };
@@ -7684 +7686 @@
                 1A3586DD15264C450022A659 /* RenderMultiColumnFlowThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMultiColumnFlowThread.cpp; sourceTree = "<group>"; };
                 1A3586DE15264C450022A659 /* RenderMultiColumnFlowThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMultiColumnFlowThread.h; sourceTree = "<group>"; };
+                1A3763691A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceProvider.cpp; sourceTree = "<group>"; };
+                1A37636A1A2E68BB009A7EE2 /* StorageNamespaceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceProvider.h; sourceTree = "<group>"; };
                 1A494BBB0A122DCD00FDAFC1 /* HTMLElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLElement.idl; sourceTree = "<group>"; };
                 1A494BF80A122F4400FDAFC1 /* JSHTMLElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLElement.cpp; sourceTree = "<group>"; };
@@ -15131 +15135 @@
                                 C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */,
                                 C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */,
+                                1A3763691A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp */,
+                                1A37636A1A2E68BB009A7EE2 /* StorageNamespaceProvider.h */,
                                 1AB09DB216AF5F6C008538E7 /* StorageStrategy.cpp */,
                                 1AB09DB316AF5F6C008538E7 /* StorageStrategy.h */,
@@ -24780 +24786 @@
                                 2E2D99CE10E2BBDA00496337 /* JSBlob.h in Headers */,
                                 1449E24C107D4A8400B5793F /* JSCallbackData.h in Headers */,
+                                1A37636C1A2E68BB009A7EE2 /* StorageNamespaceProvider.h in Headers */,
                                 65DF323A09D1DE65000BE325 /* JSCanvasGradient.h in Headers */,
                                 65DF323C09D1DE65000BE325 /* JSCanvasPattern.h in Headers */,
@@ -28559 +28566 @@
                                 BCD9C2C20C17B69E005C90A2 /* JSNodeList.cpp in Sources */,
                                 BCD9C2650C17AA67005C90A2 /* JSNodeListCustom.cpp in Sources */,
+                                1A37636B1A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp in Sources */,
                                 65DF31FD09D1CC60000BE325 /* JSNotation.cpp in Sources */,
                                 33503CA310179AD7003B47E1 /* JSNotification.cpp in Sources */,

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -93 +93 @@
 #include "StorageArea.h"
 #include "StorageNamespace.h"
+#include "StorageNamespaceProvider.h"
 #include "StyleMedia.h"
 #include "StyleResolver.h"
@@ -857 +858 @@
 
     RefPtr<StorageArea> storageArea;
-    if (!document->securityOrigin()->canAccessLocalStorage(document->topOrigin()))
-        storageArea = page->group().transientLocalStorage(document->topOrigin())->storageArea(document->securityOrigin());
-    else
-        storageArea = page->group().localStorage()->storageArea(document->securityOrigin());
+    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 (!storageArea->canAccessStorage(m_frame)) {

trunk/Source/WebCore/page/Page.cpp

@@ -80 +80 @@
 #include "StorageArea.h"
 #include "StorageNamespace.h"
+#include "StorageNamespaceProvider.h"
 #include "StyleResolver.h"
 #include "SubframeLoader.h"
@@ -202 +203 @@
     , m_lastSpatialNavigationCandidatesCount(0) // NOTE: Only called from Internals for Spatial Navigation testing.
     , m_framesHandlingBeforeUnloadEvent(0)
+    , m_storageNamespaceProvider(WTF::move(pageConfiguration.storageNamespaceProvider))
     , m_userContentController(WTF::move(pageConfiguration.userContentController))
     , m_visitedLinkStore(*WTF::move(pageConfiguration.visitedLinkStore))
@@ -212 +214 @@
     setTimerThrottlingEnabled(m_viewState & ViewState::IsVisuallyIdle);
 
+    if (m_storageNamespaceProvider)
+        m_storageNamespaceProvider->addPage(*this);
     if (m_userContentController)
         m_userContentController->addPage(*this);
@@ -1612 +1616 @@
 }
 
+void Page::setStorageNamespaceProvider(PassRef<StorageNamespaceProvider> storageNamespaceProvider)
+{
+    if (m_storageNamespaceProvider)
+        m_storageNamespaceProvider->removePage(*this);
+
+    m_storageNamespaceProvider = WTF::move(storageNamespaceProvider);
+    m_storageNamespaceProvider->addPage(*this);
+
+    // This needs to reset all the local storage namespaces of all the pages.
+}
+
 VisitedLinkStore& Page::visitedLinkStore()
 {

trunk/Source/WebCore/page/Page.h

@@ -101 +101 @@
 class Settings;
 class StorageNamespace;
+class StorageNamespaceProvider;
 class UserContentController;
 class ValidationMessageClient;
@@ -399 +400 @@
     unsigned lastSpatialNavigationCandidateCount() const { return m_lastSpatialNavigationCandidatesCount; }
 
+    StorageNamespaceProvider* storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
+    void setStorageNamespaceProvider(PassRef<StorageNamespaceProvider>);
+
     UserContentController* userContentController() { return m_userContentController.get(); }
     void setUserContentController(UserContentController*);
@@ -567 +571 @@
     unsigned m_framesHandlingBeforeUnloadEvent;
 
+    RefPtr<StorageNamespaceProvider> m_storageNamespaceProvider;
     RefPtr<UserContentController> m_userContentController;
     Ref<VisitedLinkStore> m_visitedLinkStore;

trunk/Source/WebCore/page/PageConfiguration.cpp

@@ -28 +28 @@
 
 #include "BackForwardClient.h"
+#include "StorageNamespaceProvider.h"
 #include "UserContentController.h"
 #include "VisitedLinkStore.h"

trunk/Source/WebCore/page/PageConfiguration.h

@@ -45 +45 @@
 class PlugInClient;
 class ProgressTrackerClient;
+class StorageNamespaceProvider;
 class UserContentController;
 class ValidationMessageClient;
@@ -70 +71 @@
     DiagnosticLoggingClient* diagnosticLoggingClient;
 
+    RefPtr<StorageNamespaceProvider> storageNamespaceProvider;
     RefPtr<UserContentController> userContentController;
     RefPtr<VisitedLinkStore> visitedLinkStore;