<!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>[178222] trunk/Source</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/178222">178222</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-09 16:34:40 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the database strategy
https://bugs.webkit.org/show_bug.cgi?id=140322
Reviewed by Sam Weinig.
Source/WebCore:
* CMakeLists.txt:
* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::ProposedDatabase::ProposedDatabase):
(WebCore::DatabaseManager::DatabaseManager):
* WebCore.exp.in:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* platform/DatabaseStrategy.cpp: Removed.
* platform/DatabaseStrategy.h: Removed.
* platform/PlatformStrategies.h:
(WebCore::PlatformStrategies::PlatformStrategies):
(WebCore::PlatformStrategies::databaseStrategy): Deleted.
Source/WebKit/mac:
* WebCoreSupport/WebPlatformStrategies.h:
* WebCoreSupport/WebPlatformStrategies.mm:
(WebPlatformStrategies::createDatabaseStrategy): Deleted.
Source/WebKit/win:
* WebCoreSupport/WebPlatformStrategies.cpp:
(WebPlatformStrategies::createDatabaseStrategy): Deleted.
* WebCoreSupport/WebPlatformStrategies.h:
Source/WebKit2:
* NetworkProcess/NetworkProcessPlatformStrategies.cpp:
(WebKit::NetworkProcessPlatformStrategies::createDatabaseStrategy): Deleted.
* NetworkProcess/NetworkProcessPlatformStrategies.h:
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::createDatabaseStrategy): Deleted.
(WebKit::WebPlatformStrategies::getDatabaseServer): Deleted.
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformStrategiesh">trunk/Source/WebCore/platform/PlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessPlatformStrategiescpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessPlatformStrategiesh">trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformDatabaseStrategycpp">trunk/Source/WebCore/platform/DatabaseStrategy.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformDatabaseStrategyh">trunk/Source/WebCore/platform/DatabaseStrategy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -1961,7 +1961,6 @@
</span><span class="cx"> platform/ContextMenu.cpp
</span><span class="cx"> platform/ContextMenuItem.cpp
</span><span class="cx"> platform/CrossThreadCopier.cpp
</span><del>- platform/DatabaseStrategy.cpp
</del><span class="cx"> platform/DateComponents.cpp
</span><span class="cx"> platform/Decimal.cpp
</span><span class="cx"> platform/DisplaySleepDisabler.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/ChangeLog 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-09 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the database strategy
+ https://bugs.webkit.org/show_bug.cgi?id=140322
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt:
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::ProposedDatabase::ProposedDatabase):
+ (WebCore::DatabaseManager::DatabaseManager):
+ * WebCore.exp.in:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/DatabaseStrategy.cpp: Removed.
+ * platform/DatabaseStrategy.h: Removed.
+ * platform/PlatformStrategies.h:
+ (WebCore::PlatformStrategies::PlatformStrategies):
+ (WebCore::PlatformStrategies::databaseStrategy): Deleted.
+
</ins><span class="cx"> 2015-01-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move the Windows only plug-in code to WebKit/win
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "DatabaseBackendContext.h"
</span><span class="cx"> #include "DatabaseCallback.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><del>-#include "DatabaseStrategy.h"
</del><ins>+#include "DatabaseServer.h"
</ins><span class="cx"> #include "DatabaseTask.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "InspectorDatabaseInstrumentation.h"
</span><span class="lines">@@ -47,8 +47,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-DatabaseManager::ProposedDatabase::ProposedDatabase(DatabaseManager& manager,
- SecurityOrigin* origin, const String& name, const String& displayName, unsigned long estimatedSize)
</del><ins>+DatabaseManager::ProposedDatabase::ProposedDatabase(DatabaseManager& manager, SecurityOrigin* origin, const String& name, const String& displayName, unsigned long estimatedSize)
</ins><span class="cx"> : m_manager(manager)
</span><span class="cx"> , m_origin(origin->isolatedCopy())
</span><span class="cx"> , m_details(name.isolatedCopy(), displayName.isolatedCopy(), estimatedSize, 0, 0, 0)
</span><span class="lines">@@ -73,7 +72,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DatabaseManager::DatabaseManager()
</span><del>- : m_server(platformStrategies()->databaseStrategy()->getDatabaseServer())
</del><ins>+ : m_server(new DatabaseServer)
</ins><span class="cx"> , m_client(0)
</span><span class="cx"> , m_databaseIsAvailable(true)
</span><span class="cx"> #if !ASSERT_DISABLED
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -686,7 +686,6 @@
</span><span class="cx"> __ZN7WebCore16CSSParserContextC1ERNS_8DocumentERKNS_3URLERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore16CalculationValue6createENSt3__110unique_ptrINS_18CalcExpressionNodeENS1_14default_deleteIS3_EEEENS_30CalculationPermittedValueRangeE
</span><span class="cx"> __ZN7WebCore16DatabaseProviderD2Ev
</span><del>-__ZN7WebCore16DatabaseStrategy17getDatabaseServerEv
</del><span class="cx"> __ZN7WebCore16DeviceMotionData12Acceleration6createEbdbdbd
</span><span class="cx"> __ZN7WebCore16DeviceMotionData12RotationRate6createEbdbdbd
</span><span class="cx"> __ZN7WebCore16DeviceMotionData6createEN3WTF10PassRefPtrINS0_12AccelerationEEES4_NS2_INS0_12RotationRateEEEbd
</span><span class="lines">@@ -2121,7 +2120,6 @@
</span><span class="cx"> __ZTVN7WebCore15PlatformCALayerE
</span><span class="cx"> __ZTVN7WebCore16BlobRegistryImplE
</span><span class="cx"> __ZTVN7WebCore16DatabaseProviderE
</span><del>-__ZTVN7WebCore16DatabaseStrategyE
</del><span class="cx"> __ZTVN7WebCore16IconDatabaseBaseE
</span><span class="cx"> __ZTVN7WebCore17FrameLoaderClientE
</span><span class="cx"> __ZTVN7WebCore17PageConsoleClientE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -7361,7 +7361,6 @@
</span><span class="cx"> <ClCompile Include="..\platform\ContextMenuItem.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\CrossThreadCopier.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\Cursor.cpp" />
</span><del>- <ClCompile Include="..\platform\DatabaseStrategy.cpp" />
</del><span class="cx"> <ClCompile Include="..\platform\DateComponents.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\Decimal.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\DisplaySleepDisabler.cpp" />
</span><span class="lines">@@ -19302,7 +19301,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\CookiesStrategy.h" />
</span><span class="cx"> <ClInclude Include="..\platform\CrossThreadCopier.h" />
</span><span class="cx"> <ClInclude Include="..\platform\Cursor.h" />
</span><del>- <ClInclude Include="..\platform\DatabaseStrategy.h" />
</del><span class="cx"> <ClInclude Include="..\platform\DateComponents.h" />
</span><span class="cx"> <ClInclude Include="..\platform\Decimal.h" />
</span><span class="cx"> <ClInclude Include="..\platform\DisplaySleepDisabler.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -1068,9 +1068,6 @@
</span><span class="cx"> <ClCompile Include="..\platform\Cursor.cpp">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\platform\DatabaseStrategy.cpp">
- <Filter>platform</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\platform\DateComponents.cpp">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -8055,9 +8052,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\Cursor.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\platform\DatabaseStrategy.h">
- <Filter>platform</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\platform\DateComponents.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -6695,8 +6695,6 @@
</span><span class="cx"> FED13D400CEA939400D89466 /* IconIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D3F0CEA939400D89466 /* IconIOS.mm */; };
</span><span class="cx"> FED13D520CEA949700D89466 /* RenderThemeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = FED13D500CEA949700D89466 /* RenderThemeIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FED48390CED66C3255F72C59 /* MathMLSelectElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F75A059AF170D8FAA5B8CABE /* MathMLSelectElement.cpp */; };
</span><del>- FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDEF83F16797108000E444A /* DatabaseStrategy.cpp */; };
- FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDEF84016797108000E444A /* DatabaseStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> FEE1811316C319E800084849 /* SQLTransactionBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */; };
</span><span class="cx"> FEE1811416C319E800084849 /* SQLTransactionBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = FEE1811216C319E800084849 /* SQLTransactionBackend.h */; };
</span><span class="cx"> FF945ECB161F7F3600971BC8 /* PseudoElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FF945EC9161F7F3600971BC8 /* PseudoElement.cpp */; };
</span><span class="lines">@@ -14286,8 +14284,6 @@
</span><span class="cx"> FED13D3B0CEA936A00D89466 /* FrameIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FrameIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> FED13D3F0CEA939400D89466 /* IconIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = IconIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> FED13D500CEA949700D89466 /* RenderThemeIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderThemeIOS.h; sourceTree = "<group>"; };
</span><del>- FEDEF83F16797108000E444A /* DatabaseStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseStrategy.cpp; sourceTree = "<group>"; };
- FEDEF84016797108000E444A /* DatabaseStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseStrategy.h; sourceTree = "<group>"; };
</del><span class="cx"> FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionBackend.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FEE1811216C319E800084849 /* SQLTransactionBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionBackend.h; sourceTree = "<group>"; };
</span><span class="cx"> FF945EC9161F7F3600971BC8 /* PseudoElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PseudoElement.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -21408,8 +21404,6 @@
</span><span class="cx"> 2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */,
</span><span class="cx"> E11AF15011B9A1A300805103 /* Cursor.cpp */,
</span><span class="cx"> F587868402DE3B8601EA4122 /* Cursor.h */,
</span><del>- FEDEF83F16797108000E444A /* DatabaseStrategy.cpp */,
- FEDEF84016797108000E444A /* DatabaseStrategy.h */,
</del><span class="cx"> A5732B08136A161D005C8D7C /* DateComponents.cpp */,
</span><span class="cx"> A5732B09136A161D005C8D7C /* DateComponents.h */,
</span><span class="cx"> 45FEA5CD156DDE8C00654101 /* Decimal.cpp */,
</span><span class="lines">@@ -23816,7 +23810,6 @@
</span><span class="cx"> FE456F191677D74E005EDDF9 /* DatabaseManager.h in Headers */,
</span><span class="cx"> 97BC6A331505F081001B74AC /* DatabaseManagerClient.h in Headers */,
</span><span class="cx"> FEAF6654167970320062D0C5 /* DatabaseServer.h in Headers */,
</span><del>- FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */,
</del><span class="cx"> 97BC6A2E1505F081001B74AC /* DatabaseTask.h in Headers */,
</span><span class="cx"> 97BC6A301505F081001B74AC /* DatabaseThread.h in Headers */,
</span><span class="cx"> 97BC6A321505F081001B74AC /* DatabaseTracker.h in Headers */,
</span><span class="lines">@@ -27516,7 +27509,6 @@
</span><span class="cx"> 97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */,
</span><span class="cx"> FE456F181677D74E005EDDF9 /* DatabaseManager.cpp in Sources */,
</span><span class="cx"> FEB26D28167A8F2A00FDD26B /* DatabaseServer.cpp in Sources */,
</span><del>- FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */,
</del><span class="cx"> 97BC6A2D1505F081001B74AC /* DatabaseTask.cpp in Sources */,
</span><span class="cx"> 97BC6A2F1505F081001B74AC /* DatabaseThread.cpp in Sources */,
</span><span class="cx"> 97BC6A311505F081001B74AC /* DatabaseTracker.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDatabaseStrategycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/DatabaseStrategy.cpp (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DatabaseStrategy.cpp 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/platform/DatabaseStrategy.cpp 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 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 "DatabaseStrategy.h"
-
-#include "DatabaseServer.h"
-
-namespace WebCore {
-
-#if ENABLE(SQL_DATABASE)
-AbstractDatabaseServer* DatabaseStrategy::getDatabaseServer()
-{
- return new DatabaseServer;
-}
-#endif // ENABLE(SQL_DATABASE)
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformDatabaseStrategyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/DatabaseStrategy.h (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DatabaseStrategy.h 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/platform/DatabaseStrategy.h 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 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.
- */
-
-#ifndef DatabaseStrategy_h
-#define DatabaseStrategy_h
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class AbstractDatabaseServer;
-
-class WEBCORE_EXPORT DatabaseStrategy {
-public:
-#if ENABLE(SQL_DATABASE)
- WEBCORE_EXPORT virtual AbstractDatabaseServer* getDatabaseServer();
-#endif
-
-protected:
- virtual ~DatabaseStrategy() { }
-};
-
-} // namespace WebCore
-
-#endif // DatabaseStrategy_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformStrategies.h (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformStrategies.h 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebCore/platform/PlatformStrategies.h 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CookiesStrategy;
</span><del>-class DatabaseStrategy;
</del><span class="cx"> class LoaderStrategy;
</span><span class="cx"> class PasteboardStrategy;
</span><span class="cx"> class PluginStrategy;
</span><span class="lines">@@ -44,13 +43,6 @@
</span><span class="cx"> return m_cookiesStrategy;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DatabaseStrategy* databaseStrategy()
- {
- if (!m_databaseStrategy)
- m_databaseStrategy = createDatabaseStrategy();
- return m_databaseStrategy;
- }
-
</del><span class="cx"> LoaderStrategy* loaderStrategy()
</span><span class="cx"> {
</span><span class="cx"> if (!m_loaderStrategy)
</span><span class="lines">@@ -82,7 +74,6 @@
</span><span class="cx"> protected:
</span><span class="cx"> PlatformStrategies()
</span><span class="cx"> : m_cookiesStrategy(nullptr)
</span><del>- , m_databaseStrategy(nullptr)
</del><span class="cx"> , m_loaderStrategy(nullptr)
</span><span class="cx"> , m_pasteboardStrategy(nullptr)
</span><span class="cx"> , m_pluginStrategy(nullptr)
</span><span class="lines">@@ -96,14 +87,12 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual CookiesStrategy* createCookiesStrategy() = 0;
</span><del>- virtual DatabaseStrategy* createDatabaseStrategy() = 0;
</del><span class="cx"> virtual LoaderStrategy* createLoaderStrategy() = 0;
</span><span class="cx"> virtual PasteboardStrategy* createPasteboardStrategy() = 0;
</span><span class="cx"> virtual PluginStrategy* createPluginStrategy() = 0;
</span><span class="cx"> virtual SharedWorkerStrategy* createSharedWorkerStrategy() = 0;
</span><span class="cx">
</span><span class="cx"> CookiesStrategy* m_cookiesStrategy;
</span><del>- DatabaseStrategy* m_databaseStrategy;
</del><span class="cx"> LoaderStrategy* m_loaderStrategy;
</span><span class="cx"> PasteboardStrategy* m_pasteboardStrategy;
</span><span class="cx"> PluginStrategy* m_pluginStrategy;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-09 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the database strategy
+ https://bugs.webkit.org/show_bug.cgi?id=140322
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::createDatabaseStrategy): Deleted.
+
</ins><span class="cx"> 2015-01-08 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Can't use DataDetectors after immediate action preparation
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WebPlatformStrategies_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/CookiesStrategy.h>
</span><del>-#include <WebCore/DatabaseStrategy.h>
</del><span class="cx"> #include <WebCore/LoaderStrategy.h>
</span><span class="cx"> #include <WebCore/PasteboardStrategy.h>
</span><span class="cx"> #include <WebCore/PlatformStrategies.h>
</span><span class="lines">@@ -37,7 +36,7 @@
</span><span class="cx"> struct PasteboardImage;
</span><span class="cx"> struct PasteboardWebContent;
</span><span class="cx">
</span><del>-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
</del><ins>+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
</ins><span class="cx"> public:
</span><span class="cx"> static void initializeIfNecessary();
</span><span class="cx">
</span><span class="lines">@@ -46,7 +45,6 @@
</span><span class="cx">
</span><span class="cx"> // WebCore::PlatformStrategies
</span><span class="cx"> virtual WebCore::CookiesStrategy* createCookiesStrategy() override;
</span><del>- virtual WebCore::DatabaseStrategy* createDatabaseStrategy() override;
</del><span class="cx"> virtual WebCore::LoaderStrategy* createLoaderStrategy() override;
</span><span class="cx"> virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
</span><span class="cx"> virtual WebCore::PluginStrategy* createPluginStrategy() override;
</span><span class="lines">@@ -60,9 +58,6 @@
</span><span class="cx"> virtual bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&) override;
</span><span class="cx"> virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
</span><span class="cx">
</span><del>- // WebCore::DatabaseStrategy
- // - Using default implementation.
-
</del><span class="cx"> // WebCore::LoaderStrategy
</span><span class="cx"> // - Using default implementation.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -60,11 +60,6 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DatabaseStrategy* WebPlatformStrategies::createDatabaseStrategy()
-{
- return this;
-}
-
</del><span class="cx"> LoaderStrategy* WebPlatformStrategies::createLoaderStrategy()
</span><span class="cx"> {
</span><span class="cx"> return this;
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-09 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the database strategy
+ https://bugs.webkit.org/show_bug.cgi?id=140322
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebPlatformStrategies::createDatabaseStrategy): Deleted.
+ * WebCoreSupport/WebPlatformStrategies.h:
+
</ins><span class="cx"> 2015-01-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move the Windows only plug-in code to WebKit/win
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -52,11 +52,6 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DatabaseStrategy* WebPlatformStrategies::createDatabaseStrategy()
-{
- return this;
-}
-
</del><span class="cx"> LoaderStrategy* WebPlatformStrategies::createLoaderStrategy()
</span><span class="cx"> {
</span><span class="cx"> return this;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -27,13 +27,12 @@
</span><span class="cx"> #define WebPlatformStrategies_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/CookiesStrategy.h>
</span><del>-#include <WebCore/DatabaseStrategy.h>
</del><span class="cx"> #include <WebCore/LoaderStrategy.h>
</span><span class="cx"> #include <WebCore/PlatformStrategies.h>
</span><span class="cx"> #include <WebCore/PluginStrategy.h>
</span><span class="cx"> #include <WebCore/SharedWorkerStrategy.h>
</span><span class="cx">
</span><del>-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
</del><ins>+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::LoaderStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
</ins><span class="cx"> public:
</span><span class="cx"> static void initialize();
</span><span class="cx">
</span><span class="lines">@@ -42,7 +41,6 @@
</span><span class="cx">
</span><span class="cx"> // WebCore::PlatformStrategies
</span><span class="cx"> virtual WebCore::CookiesStrategy* createCookiesStrategy();
</span><del>- virtual WebCore::DatabaseStrategy* createDatabaseStrategy();
</del><span class="cx"> virtual WebCore::LoaderStrategy* createLoaderStrategy();
</span><span class="cx"> virtual WebCore::PasteboardStrategy* createPasteboardStrategy();
</span><span class="cx"> virtual WebCore::PluginStrategy* createPluginStrategy();
</span><span class="lines">@@ -56,9 +54,6 @@
</span><span class="cx"> virtual bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&);
</span><span class="cx"> virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&);
</span><span class="cx">
</span><del>- // WebCore::DatabaseStrategy
- // - Using default implementation.
-
</del><span class="cx"> // WebCore::PluginStrategy
</span><span class="cx"> virtual void refreshPlugins();
</span><span class="cx"> virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-09 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the database strategy
+ https://bugs.webkit.org/show_bug.cgi?id=140322
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/NetworkProcessPlatformStrategies.cpp:
+ (WebKit::NetworkProcessPlatformStrategies::createDatabaseStrategy): Deleted.
+ * NetworkProcess/NetworkProcessPlatformStrategies.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::createDatabaseStrategy): Deleted.
+ (WebKit::WebPlatformStrategies::getDatabaseServer): Deleted.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
</ins><span class="cx"> 2015-01-09 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Remove deprecated WKRenderingProgressEvents
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -44,11 +44,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DatabaseStrategy* NetworkProcessPlatformStrategies::createDatabaseStrategy()
-{
- return 0;
-}
-
</del><span class="cx"> LoaderStrategy* NetworkProcessPlatformStrategies::createLoaderStrategy()
</span><span class="cx"> {
</span><span class="cx"> return this;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> private:
</span><span class="cx"> // WebCore::PlatformStrategies
</span><span class="cx"> virtual WebCore::CookiesStrategy* createCookiesStrategy() override;
</span><del>- virtual WebCore::DatabaseStrategy* createDatabaseStrategy() override;
</del><span class="cx"> virtual WebCore::LoaderStrategy* createLoaderStrategy() override;
</span><span class="cx"> virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
</span><span class="cx"> virtual WebCore::PluginStrategy* createPluginStrategy() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -90,11 +90,6 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DatabaseStrategy* WebPlatformStrategies::createDatabaseStrategy()
-{
- return this;
-}
-
</del><span class="cx"> LoaderStrategy* WebPlatformStrategies::createLoaderStrategy()
</span><span class="cx"> {
</span><span class="cx"> return this;
</span><span class="lines">@@ -196,15 +191,6 @@
</span><span class="cx"> WebCore::deleteCookie(session, url, cookieName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// DatabaseStrategy
-
-#if ENABLE(SQL_DATABASE)
-AbstractDatabaseServer* WebPlatformStrategies::getDatabaseServer()
-{
- return DatabaseStrategy::getDatabaseServer();
-}
-#endif // ENABLE(SQL_DATABASE)
-
</del><span class="cx"> // LoaderStrategy
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (178221 => 178222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2015-01-10 00:30:57 UTC (rev 178221)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2015-01-10 00:34:40 UTC (rev 178222)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WebPlatformStrategies_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/CookiesStrategy.h>
</span><del>-#include <WebCore/DatabaseStrategy.h>
</del><span class="cx"> #include <WebCore/LoaderStrategy.h>
</span><span class="cx"> #include <WebCore/PasteboardStrategy.h>
</span><span class="cx"> #include <WebCore/PlatformStrategies.h>
</span><span class="lines">@@ -37,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::DatabaseStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
</del><ins>+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::LoaderStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy, private WebCore::SharedWorkerStrategy {
</ins><span class="cx"> friend class NeverDestroyed<WebPlatformStrategies>;
</span><span class="cx"> public:
</span><span class="cx"> static void initialize();
</span><span class="lines">@@ -47,7 +46,6 @@
</span><span class="cx">
</span><span class="cx"> // WebCore::PlatformStrategies
</span><span class="cx"> virtual WebCore::CookiesStrategy* createCookiesStrategy() override;
</span><del>- virtual WebCore::DatabaseStrategy* createDatabaseStrategy() override;
</del><span class="cx"> virtual WebCore::LoaderStrategy* createLoaderStrategy() override;
</span><span class="cx"> virtual WebCore::PasteboardStrategy* createPasteboardStrategy() override;
</span><span class="cx"> virtual WebCore::PluginStrategy* createPluginStrategy() override;
</span><span class="lines">@@ -61,11 +59,6 @@
</span><span class="cx"> virtual bool getRawCookies(const WebCore::NetworkStorageSession&, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&) override;
</span><span class="cx"> virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
</span><span class="cx">
</span><del>- // WebCore::DatabaseStrategy
-#if ENABLE(SQL_DATABASE)
- virtual WebCore::AbstractDatabaseServer* getDatabaseServer() override;
-#endif
-
</del><span class="cx"> // WebCore::LoaderStrategy
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
</span></span></pre>
</div>
</div>
</body>
</html>