Title: [177119] trunk/Source/WebKit
- Revision
- 177119
- Author
- [email protected]
- Date
- 2014-12-10 17:31:52 -0800 (Wed, 10 Dec 2014)
Log Message
Use the new storage namespace provider in WebKit1
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (177118 => 177119)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2014-12-11 01:18:14 UTC (rev 177118)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2014-12-11 01:31:52 UTC (rev 177119)
@@ -419,6 +419,7 @@
<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" />
@@ -498,7 +499,6 @@
<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" />
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props (177118 => 177119)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props 2014-12-11 01:18:14 UTC (rev 177118)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props 2014-12-11 01:31:52 UTC (rev 177119)
@@ -5,7 +5,7 @@
</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\_javascript_Core;$(ConfigurationBuildDir)\Include\private\_javascript_Core;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\DerivedSources;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;$(WebKit_Libraries)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include\_javascript_Core;$(WebKit_Libraries)\Include\private\_javascript_Core;$(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\_javascript_Core;$(ConfigurationBuildDir)\Include\private\_javascript_Core;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\DerivedSources;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;$(WebKit_Libraries)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include\_javascript_Core;$(WebKit_Libraries)\Include\private\_javascript_Core;$(IntDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>WebKitPrefix.h</PrecompiledHeaderFile>
Modified: trunk/Source/WebKit/mac/ChangeLog (177118 => 177119)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-11 01:18:14 UTC (rev 177118)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-11 01:31:52 UTC (rev 177119)
@@ -1,3 +1,15 @@
+2014-12-08 Anders Carlsson <[email protected]>
+
+ 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-10 Timothy Horton <[email protected]>
Should have copy and paste items in all text menus
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177118 => 177119)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-11 01:18:14 UTC (rev 177118)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-11 01:31:52 UTC (rev 177119)
@@ -954,6 +954,7 @@
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);
@@ -1189,6 +1190,7 @@
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();
Modified: trunk/Source/WebKit/win/ChangeLog (177118 => 177119)
--- trunk/Source/WebKit/win/ChangeLog 2014-12-11 01:18:14 UTC (rev 177118)
+++ trunk/Source/WebKit/win/ChangeLog 2014-12-11 01:31:52 UTC (rev 177119)
@@ -1,3 +1,17 @@
+2014-12-08 Anders Carlsson <[email protected]>
+
+ 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-09 Commit Queue <[email protected]>
Unreviewed, rolling out r177037.
Modified: trunk/Source/WebKit/win/WebView.cpp (177118 => 177119)
--- trunk/Source/WebKit/win/WebView.cpp 2014-12-11 01:18:14 UTC (rev 177118)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-12-11 01:31:52 UTC (rev 177119)
@@ -64,6 +64,7 @@
#include "WebPlatformStrategies.h"
#include "WebPreferences.h"
#include "WebScriptWorld.h"
+#include "WebStorageNamespaceProvider.h"
#include "WebVisitedLinkStore.h"
#include "resource.h"
#include <_javascript_Core/APICast.h>
@@ -2726,7 +2727,16 @@
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,
@@ -2801,6 +2811,7 @@
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();
@@ -2810,9 +2821,6 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
