<!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>[177119] trunk/Source/WebKit</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/177119">177119</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-10 17:31:52 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitCommonprops">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (177118 => 177119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -419,6 +419,7 @@
</span><span class="cx"> <ClCompile Include="..\..\win\WebWorkersPrivate.cpp" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><ins>+ <ClInclude Include="..\..\Storage\WebStorageNamespaceProvider.h" />
</ins><span class="cx"> <ClInclude Include="..\..\win\AccessibleBase.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\AccessibleDocument.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\AccessibleImage.h" />
</span><span class="lines">@@ -498,7 +499,6 @@
</span><span class="cx"> <ClInclude Include="..\..\win\WebScriptWorld.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebSecurityOrigin.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebSerializedJSValue.h" />
</span><del>- <ClCompile Include="..\..\Storage\WebStorageNamespaceProvider.h" />
</del><span class="cx"> <ClInclude Include="..\..\win\WebTextRenderer.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebURLAuthenticationChallenge.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebURLAuthenticationChallengeSender.h" />
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props (177118 => 177119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <PreprocessorDefinitions>WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</span><span class="cx"> <PrecompiledHeader>Use</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeaderFile>WebKitPrefix.h</PrecompiledHeaderFile>
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177118 => 177119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-12-10 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Should have copy and paste items in all text menus
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177118 => 177119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -954,6 +954,7 @@
</span><span class="cx"> pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
</span><ins>+ pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider();
</ins><span class="cx"> pageConfiguration.userContentController = &_private->group->userContentController();
</span><span class="cx"> pageConfiguration.visitedLinkStore = &_private->group->visitedLinkStore();
</span><span class="cx"> _private->page = new Page(pageConfiguration);
</span><span class="lines">@@ -1189,6 +1190,7 @@
</span><span class="cx"> pageConfiguration.inspectorClient = new WebInspectorClient(self);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
</span><ins>+ pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider();
</ins><span class="cx"> pageConfiguration.userContentController = &_private->group->userContentController();
</span><span class="cx"> pageConfiguration.visitedLinkStore = &_private->group->visitedLinkStore();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (177118 => 177119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-12-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177037.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (177118 => 177119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> #include "WebPlatformStrategies.h"
</span><span class="cx"> #include "WebPreferences.h"
</span><span class="cx"> #include "WebScriptWorld.h"
</span><ins>+#include "WebStorageNamespaceProvider.h"
</ins><span class="cx"> #include "WebVisitedLinkStore.h"
</span><span class="cx"> #include "resource.h"
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="lines">@@ -2726,7 +2727,16 @@
</span><span class="cx">
</span><span class="cx"> return shouldCreateScrollbars;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+static String localStorageDatabasePath(WebPreferences* preferences)
+{
+ BString localStorageDatabasePath;
+ if (FAILED(preferences->localStorageDatabasePath(&localStorageDatabasePath)))
+ return String();
+
+ return toString(localStorageDatabasePath);
+}
+
</ins><span class="cx"> HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
</span><span class="cx"> /* [in] */ RECT frame,
</span><span class="cx"> /* [in] */ BSTR frameName,
</span><span class="lines">@@ -2801,6 +2811,7 @@
</span><span class="cx"> configuration.inspectorClient = m_inspectorClient;
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx"> configuration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><ins>+ configuration.storageNamespaceProvider = WebStorageNamespaceProvider::create(localStorageDatabasePath(m_preferences.get()));
</ins><span class="cx"> configuration.progressTrackerClient = static_cast<WebFrameLoaderClient*>(configuration.loaderClientForMainFrame);
</span><span class="cx"> configuration.visitedLinkStore = &WebVisitedLinkStore::shared();
</span><span class="cx">
</span><span class="lines">@@ -2810,9 +2821,6 @@
</span><span class="cx"> unsigned layoutMilestones = DidFirstLayout | DidFirstVisuallyNonEmptyLayout;
</span><span class="cx"> m_page->addLayoutMilestones(static_cast<LayoutMilestones>(layoutMilestones));
</span><span class="cx">
</span><del>- BString localStoragePath;
- if (SUCCEEDED(m_preferences->localStorageDatabasePath(&localStoragePath)))
- m_page->settings().setLocalStorageDatabasePath(toString(localStoragePath));
</del><span class="cx">
</span><span class="cx"> if (m_uiDelegate) {
</span><span class="cx"> BString path;
</span></span></pre>
</div>
</div>
</body>
</html>