https://bugs.webkit.org/show_bug.cgi?id=139425
Reviewed by Tim Horton.
Source/WebKit/mac:
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
Set the storage namespace provider from the web page group.
Source/WebKit/win:
* WebView.cpp:
(localStorageDatabasePath):
Helper from getting the local storage database path given a WebPreferences instance.
(WebView::initWithFrame):
Create a storage namespace provider.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177037
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
<ClCompile Include="..\..\win\WebWorkersPrivate.cpp" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\Storage\WebStorageNamespaceProvider.h" />
<ClInclude Include="..\..\win\AccessibleBase.h" />
<ClInclude Include="..\..\win\AccessibleDocument.h" />
<ClInclude Include="..\..\win\AccessibleImage.h" />
<ClInclude Include="..\..\win\WebScriptWorld.h" />
<ClInclude Include="..\..\win\WebSecurityOrigin.h" />
<ClInclude Include="..\..\win\WebSerializedJSValue.h" />
- <ClCompile Include="..\..\Storage\WebStorageNamespaceProvider.h" />
<ClInclude Include="..\..\win\WebTextRenderer.h" />
<ClInclude Include="..\..\win\WebURLAuthenticationChallenge.h" />
<ClInclude Include="..\..\win\WebURLAuthenticationChallengeSender.h" />
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\..\..\win;$(ProjectDir)\..\..\win\WebCoreSupport;$(ConfigurationBuildDir)\include\WebKit;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\Include\JavaScriptCore;$(ConfigurationBuildDir)\Include\private\JavaScriptCore;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\DerivedSources;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;$(WebKit_Libraries)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include\JavaScriptCore;$(WebKit_Libraries)\Include\private\JavaScriptCore;$(IntDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\..\..\win;$(ProjectDir)\..\..\win\WebCoreSupport;$(ProjectDir)\..\..\Storage;$(ConfigurationBuildDir)\include\WebKit;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\Include\JavaScriptCore;$(ConfigurationBuildDir)\Include\private\JavaScriptCore;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\DerivedSources;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;$(WebKit_Libraries)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include\JavaScriptCore;$(WebKit_Libraries)\Include\private\JavaScriptCore;$(IntDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>WebKitPrefix.h</PrecompiledHeaderFile>
+2014-12-08 Anders Carlsson <andersca@apple.com>
+
+ Use the new storage namespace provider in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=139425
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ Set the storage namespace provider from the web page group.
+
2014-12-09 Myles C. Maxfield <mmaxfield@apple.com>
Delete Node::boundingBox()
#import "WebScriptWorldInternal.h"
#import "WebSelectionServiceController.h"
#import "WebStorageManagerInternal.h"
+#import "WebStorageNamespaceProvider.h"
#import "WebSystemInterface.h"
#import "WebTextCompletionController.h"
#import "WebTextIterator.h"
pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
+ pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider();
pageConfiguration.userContentController = &_private->group->userContentController();
pageConfiguration.visitedLinkStore = &_private->group->visitedLinkStore();
_private->page = new Page(pageConfiguration);
pageConfiguration.inspectorClient = new WebInspectorClient(self);
pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
+ pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider();
pageConfiguration.userContentController = &_private->group->userContentController();
pageConfiguration.visitedLinkStore = &_private->group->visitedLinkStore();
+2014-12-08 Anders Carlsson <andersca@apple.com>
+
+ Use the new storage namespace provider in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=139425
+
+ Reviewed by Tim Horton.
+
+ * WebView.cpp:
+ (localStorageDatabasePath):
+ Helper from getting the local storage database path given a WebPreferences instance.
+
+ (WebView::initWithFrame):
+ Create a storage namespace provider.
+
2014-12-05 Anders Carlsson <andersca@apple.com>
Get rid of config.h includes and include config.h in the prefix header instead
#include "WebPlatformStrategies.h"
#include "WebPreferences.h"
#include "WebScriptWorld.h"
+#include "WebStorageNamespaceProvider.h"
#include "WebVisitedLinkStore.h"
#include "resource.h"
#include <JavaScriptCore/APICast.h>
return shouldCreateScrollbars;
}
-
+
+static String localStorageDatabasePath(WebPreferences* preferences)
+{
+ BString localStorageDatabasePath;
+ if (FAILED(preferences->localStorageDatabasePath(&localStorageDatabasePath)))
+ return String();
+
+ return toString(localStorageDatabasePath);
+}
+
HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
/* [in] */ RECT frame,
/* [in] */ BSTR frameName,
configuration.inspectorClient = m_inspectorClient;
#endif // ENABLE(INSPECTOR)
configuration.loaderClientForMainFrame = new WebFrameLoaderClient;
+ configuration.storageNamespaceProvider = WebStorageNamespaceProvider::create(localStorageDatabasePath(m_preferences.get()));
configuration.progressTrackerClient = static_cast<WebFrameLoaderClient*>(configuration.loaderClientForMainFrame);
configuration.visitedLinkStore = &WebVisitedLinkStore::shared();
unsigned layoutMilestones = DidFirstLayout | DidFirstVisuallyNonEmptyLayout;
m_page->addLayoutMilestones(static_cast<LayoutMilestones>(layoutMilestones));
- BString localStoragePath;
- if (SUCCEEDED(m_preferences->localStorageDatabasePath(&localStoragePath)))
- m_page->settings().setLocalStorageDatabasePath(toString(localStoragePath));
if (m_uiDelegate) {
BString path;