<!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>[176614] 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/176614">176614</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-01 16:55:48 -0800 (Mon, 01 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove IWebCookieManager on Windows
https://bugs.webkit.org/show_bug.cgi?id=139144
Reviewed by Sam Weinig.
Source/WebCore:
Remove code that handles overriding the cookie storage.
* platform/network/NetworkStorageSession.h:
* platform/network/cf/NetworkStorageSessionCFNet.cpp:
(WebCore::cookieStorageOverride): Deleted.
(WebCore::overrideCookieStorage): Deleted.
(WebCore::overridenCookieStorage): Deleted.
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::createCFURLConnection):
Source/WebKit:
Remove files.
* WebKit.vcxproj/Interfaces/Interfaces.vcxproj:
* WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters:
* WebKit.vcxproj/WebKit/WebKit.vcxproj:
* WebKit.vcxproj/WebKit/WebKit.vcxproj.filters:
Source/WebKit/win:
Remove WebCookieManager.
* ForEachCoClass.h:
* Interfaces/IWebCookieManager.idl: Removed.
* Interfaces/WebKit.idl:
* WebCookieManager.cpp: Removed.
* WebCookieManager.h: Removed.
* WebCookieManagerCFNet.cpp: Removed.
* WebCookieManagerCurl.cpp: Removed.
* WebKitClassFactory.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStorageSessionh">trunk/Source/WebCore/platform/network/NetworkStorageSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp">trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj">trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxprojfilters">trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinForEachCoClassh">trunk/Source/WebKit/win/ForEachCoClass.h</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesWebKitidl">trunk/Source/WebKit/win/Interfaces/WebKit.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebKitClassFactorycpp">trunk/Source/WebKit/win/WebKitClassFactory.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinInterfacesIWebCookieManageridl">trunk/Source/WebKit/win/Interfaces/IWebCookieManager.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebCookieManagercpp">trunk/Source/WebKit/win/WebCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCookieManagerh">trunk/Source/WebKit/win/WebCookieManager.h</a></li>
<li><a href="#trunkSourceWebKitwinWebCookieManagerCFNetcpp">trunk/Source/WebKit/win/WebCookieManagerCFNet.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCookieManagerCurlcpp">trunk/Source/WebKit/win/WebCookieManagerCurl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebCore/ChangeLog 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-01 Anders Carlsson <andersca@apple.com>
+
+ Remove IWebCookieManager on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=139144
+
+ Reviewed by Sam Weinig.
+
+ Remove code that handles overriding the cookie storage.
+
+ * platform/network/NetworkStorageSession.h:
+ * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+ (WebCore::cookieStorageOverride): Deleted.
+ (WebCore::overrideCookieStorage): Deleted.
+ (WebCore::overridenCookieStorage): Deleted.
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::createCFURLConnection):
+
</ins><span class="cx"> 2014-12-01 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS Media] Slider knob should not have a border
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStorageSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -82,12 +82,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) && USE(CFNETWORK)
-// Needed for WebKit1 API only.
-void overrideCookieStorage(CFHTTPCookieStorageRef);
-CFHTTPCookieStorageRef overridenCookieStorage();
-#endif
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // NetworkStorageSession_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -63,26 +63,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
-static RetainPtr<CFHTTPCookieStorageRef>& cookieStorageOverride()
-{
- static NeverDestroyed<RetainPtr<CFHTTPCookieStorageRef>> cookieStorage;
- return cookieStorage;
-}
-
-void overrideCookieStorage(CFHTTPCookieStorageRef cookieStorage)
-{
- ASSERT(isMainThread());
- // FIXME: Why don't we retain it? The only caller is an API method that takes cookie storage as a raw argument.
- cookieStorageOverride() = adoptCF(cookieStorage);
-}
-
-CFHTTPCookieStorageRef overridenCookieStorage()
-{
- return cookieStorageOverride().get();
-}
-#endif
-
</del><span class="cx"> NetworkStorageSession& NetworkStorageSession::defaultStorageSession()
</span><span class="cx"> {
</span><span class="cx"> if (!defaultNetworkStorageSession())
</span><span class="lines">@@ -106,11 +86,6 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFHTTPCookieStorageRef> NetworkStorageSession::cookieStorage() const
</span><span class="cx"> {
</span><del>-#if PLATFORM(WIN)
- if (RetainPtr<CFHTTPCookieStorageRef>& override = cookieStorageOverride())
- return override;
-#endif
-
</del><span class="cx"> if (m_platformSession)
</span><span class="cx"> return adoptCF(wkCopyHTTPCookieStorage(m_platformSession.get()));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -178,13 +178,6 @@
</span><span class="cx"> if (sslProps)
</span><span class="cx"> CFURLRequestSetSSLProperties(request.get(), sslProps.get());
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
- if (CFHTTPCookieStorageRef cookieStorage = overridenCookieStorage()) {
- // Overridden cookie storage doesn't come from a session, so the request does not have it yet.
- CFURLRequestSetHTTPCookieStorage(request.get(), cookieStorage);
- }
-#endif
-
</del><span class="cx"> CFMutableDictionaryRef streamProperties = CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span class="cx">
</span><span class="cx"> if (!shouldUseCredentialStorage) {
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/ChangeLog 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-12-01 Anders Carlsson <andersca@apple.com>
+
+ Remove IWebCookieManager on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=139144
+
+ Reviewed by Sam Weinig.
+
+ Remove files.
+
+ * WebKit.vcxproj/Interfaces/Interfaces.vcxproj:
+ * WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters:
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj.filters:
+
</ins><span class="cx"> 2014-11-27 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a stubbed out WebVisitedLinkStore class on Windows
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -540,20 +540,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </Midl>
</span><del>- <Midl Include="..\..\win\Interfaces\IWebCookieManager.idl">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </Midl>
</del><span class="cx"> <Midl Include="..\..\win\Interfaces\IWebCoreStatistics.idl">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -46,9 +46,6 @@
</span><span class="cx"> <Midl Include="..\..\win\Interfaces\IWebCache.idl">
</span><span class="cx"> <Filter>IDL</Filter>
</span><span class="cx"> </Midl>
</span><del>- <Midl Include="..\..\win\Interfaces\IWebCookieManager.idl">
- <Filter>IDL</Filter>
- </Midl>
</del><span class="cx"> <Midl Include="..\..\win\Interfaces\IWebCoreStatistics.idl">
</span><span class="cx"> <Filter>IDL</Filter>
</span><span class="cx"> </Midl>
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -305,23 +305,6 @@
</span><span class="cx"> <ClCompile Include="..\..\win\WebArchive.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\WebBackForwardList.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\WebCache.cpp" />
</span><del>- <ClCompile Include="..\..\win\WebCookieManager.cpp" />
- <ClCompile Include="..\..\win\WebCookieManagerCFNet.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\win\WebCookieManagerCurl.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\..\win\WebCoreStatistics.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\WebCoreSupport\AcceleratedCompositingContext.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\WebCoreSupport\EmbeddedWidget.cpp" />
</span><span class="lines">@@ -460,7 +443,6 @@
</span><span class="cx"> <ClInclude Include="..\..\win\WebBackForwardList.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebCache.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebCachedFramePlatformData.h" />
</span><del>- <ClInclude Include="..\..\win\WebCookieManager.h" />
</del><span class="cx"> <ClInclude Include="..\..\win\WebCoreStatistics.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebCoreSupport\AcceleratedCompositingContext.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebCoreSupport\EmbeddedWidget.h" />
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -109,15 +109,6 @@
</span><span class="cx"> <ClCompile Include="..\..\win\WebCache.cpp">
</span><span class="cx"> <Filter>Sources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\..\win\WebCookieManager.cpp">
- <Filter>Sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\win\WebCookieManagerCFNet.cpp">
- <Filter>Sources</Filter>
- </ClCompile>
- <ClCompile Include="..\..\win\WebCookieManagerCurl.cpp">
- <Filter>Sources</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\..\win\WebCoreStatistics.cpp">
</span><span class="cx"> <Filter>Sources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -388,9 +379,6 @@
</span><span class="cx"> <ClInclude Include="..\..\win\WebCachedFramePlatformData.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\..\win\WebCookieManager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\..\win\WebCoreStatistics.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/ChangeLog 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-12-01 Anders Carlsson <andersca@apple.com>
+
+ Remove IWebCookieManager on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=139144
+
+ Reviewed by Sam Weinig.
+
+ Remove WebCookieManager.
+
+ * ForEachCoClass.h:
+ * Interfaces/IWebCookieManager.idl: Removed.
+ * Interfaces/WebKit.idl:
+ * WebCookieManager.cpp: Removed.
+ * WebCookieManager.h: Removed.
+ * WebCookieManagerCFNet.cpp: Removed.
+ * WebCookieManagerCurl.cpp: Removed.
+ * WebKitClassFactory.cpp:
+
</ins><span class="cx"> 2014-11-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Switch over to using WebVisitedLinkStore on Windows
</span></span></pre></div>
<a id="trunkSourceWebKitwinForEachCoClassh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ForEachCoClass.h (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ForEachCoClass.h 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/ForEachCoClass.h 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> macro(WebView) \
</span><span class="cx"> macro(WebArchive) \
</span><span class="cx"> macro(WebCoreStatistics) \
</span><del>- macro(WebCookieManager) \
</del><span class="cx"> macro(WebWorkersPrivate) \
</span><span class="cx"> macro(WebScriptWorld) \
</span><span class="cx"> macro(WebGeolocationPosition) \
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebCookieManageridl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/win/Interfaces/IWebCookieManager.idl (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebCookieManager.idl 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/Interfaces/IWebCookieManager.idl 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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 DO_NO_IMPORTS
-import "oaidl.idl";
-import "ocidl.idl";
-#endif
-
-cpp_quote("// this is done to get midl to treat the CFHTTPCookieStorageRef as pointer types")
-cpp_quote("#if 0")
-typedef void* CFHTTPCookieStorageRef;
-cpp_quote("#else")
-cpp_quote("typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;")
-cpp_quote("#endif")
-
-interface IWebCookieStorageObserver;
-
-[
- object,
- oleautomation,
- hidden,
- uuid(7053FE94-3623-444f-A298-209A90879A8C),
- pointer_default(unique)
-]
-interface IWebCookieManager : IUnknown
-{
- [local] HRESULT cookieStorage([out, retval] CFHTTPCookieStorageRef* storage);
-
- [local] HRESULT setCookieStorage([in] CFHTTPCookieStorageRef storage);
-}
</del></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesWebKitidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/WebKit.idl (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/WebKit.idl 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/Interfaces/WebKit.idl 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> #include "IWebBackForwardList.idl"
</span><span class="cx"> #include "IWebBackForwardListPrivate.idl"
</span><span class="cx"> #include "IWebCache.idl"
</span><del>-#include "IWebCookieManager.idl"
</del><span class="cx"> #include "IWebCoreStatistics.idl"
</span><span class="cx"> #include "IWebDataSource.idl"
</span><span class="cx"> #include "IWebDatabaseManager.idl"
</span><span class="lines">@@ -266,11 +265,6 @@
</span><span class="cx"> [default] interface IWebCoreStatistics;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [uuid(3F35F332-BB2B-49b3-AEDD-27B317687E07)]
- coclass WebCookieManager{
- [default] interface IWebCookieManager;
- }
-
</del><span class="cx"> [uuid(0967AAFF-2FFE-4fcc-81F3-3FF2A9C6DCE2)]
</span><span class="cx"> coclass WebWorkersPrivate{
</span><span class="cx"> [default] interface IWebWorkersPrivate;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCookieManagercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/win/WebCookieManager.cpp (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCookieManager.cpp 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/WebCookieManager.cpp 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -1,80 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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 "WebKitDLL.h"
-#include "WebCookieManager.h"
-
-// WebCookieManager -------------------------------------------------------
-
-WebCookieManager* WebCookieManager::createInstance()
-{
- WebCookieManager* manager = new WebCookieManager;
- manager->AddRef();
- return manager;
-}
-
-WebCookieManager::WebCookieManager()
- : m_refCount(0)
-{
- gClassCount++;
- gClassNameCount().add("WebCookieManager");
-}
-
-WebCookieManager::~WebCookieManager()
-{
- gClassCount--;
- gClassNameCount().remove("WebCookieManager");
-}
-
-// IUnknown ---------------------------------------------------------------
-
-HRESULT STDMETHODCALLTYPE WebCookieManager::QueryInterface(REFIID riid, void** ppvObject)
-{
- *ppvObject = 0;
- if (IsEqualGUID(riid, IID_IUnknown))
- *ppvObject = static_cast<WebCookieManager*>(this);
- else if (IsEqualGUID(riid, __uuidof(IWebCookieManager)))
- *ppvObject = static_cast<IWebCookieManager*>(this);
- else
- return E_NOINTERFACE;
-
- AddRef();
- return S_OK;
-}
-
-ULONG STDMETHODCALLTYPE WebCookieManager::AddRef()
-{
- return ++m_refCount;
-}
-
-ULONG STDMETHODCALLTYPE WebCookieManager::Release()
-{
- ULONG newRef = --m_refCount;
- if (!newRef)
- delete this;
-
- return newRef;
-}
</del></span></pre></div>
<a id="trunkSourceWebKitwinWebCookieManagerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/win/WebCookieManager.h (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCookieManager.h 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/WebCookieManager.h 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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 WebCookieManager_h
-#define WebCookieManager_h
-
-#include "WebKit.h"
-
-typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
-
-class WebCookieManager : public IWebCookieManager {
-public:
- static WebCookieManager* createInstance();
-
- // IUnknown
- virtual HRESULT STDMETHODCALLTYPE QueryInterface(
- /* [in] */ REFIID riid,
- /* [iid_is][out] */ void** ppvObject);
-
- virtual ULONG STDMETHODCALLTYPE AddRef();
-
- virtual ULONG STDMETHODCALLTYPE Release();
-
- // IWebCookieManager
- virtual /* [local] */ HRESULT STDMETHODCALLTYPE cookieStorage(
- /* [retval][out] */ CFHTTPCookieStorageRef* storage);
-
- virtual /* [local] */ HRESULT STDMETHODCALLTYPE setCookieStorage(
- /* [in] */ CFHTTPCookieStorageRef storage);
-
-private:
- WebCookieManager();
- ~WebCookieManager();
-
- ULONG m_refCount;
-};
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitwinWebCookieManagerCFNetcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/win/WebCookieManagerCFNet.cpp (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCookieManagerCFNet.cpp 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/WebCookieManagerCFNet.cpp 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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 "WebKitDLL.h"
-#include "WebCookieManager.h"
-
-#include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <WebCore/NetworkStorageSession.h>
-
-using namespace WebCore;
-
-// IWebCookieManager -------------------------------------------------------
-
-HRESULT STDMETHODCALLTYPE WebCookieManager::cookieStorage(
- /* [retval][out] */ CFHTTPCookieStorageRef* storage)
-{
- if (!storage)
- return E_POINTER;
-
- *storage = overridenCookieStorage();
- return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE WebCookieManager::setCookieStorage(
- /* [in] */ CFHTTPCookieStorageRef storage)
-{
- overrideCookieStorage(storage);
- return S_OK;
-}
</del></span></pre></div>
<a id="trunkSourceWebKitwinWebCookieManagerCurlcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/win/WebCookieManagerCurl.cpp (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCookieManagerCurl.cpp 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/WebCookieManagerCurl.cpp 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Brent Fulgham <bfulgham@gmail.com>. 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 "WebKitDLL.h"
-#include "WebCookieManager.h"
-
-#include "NotImplemented.h"
-
-// IWebCookieManager -------------------------------------------------------
-
-HRESULT STDMETHODCALLTYPE WebCookieManager::cookieStorage(
- /* [retval][out] */ CFHTTPCookieStorageRef* storage)
-{
- notImplemented();
- return E_FAIL;
-}
-
-HRESULT STDMETHODCALLTYPE WebCookieManager::setCookieStorage(
- /* [in] */ CFHTTPCookieStorageRef storage)
-{
- notImplemented();
- return E_FAIL;
-}
</del></span></pre></div>
<a id="trunkSourceWebKitwinWebKitClassFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitClassFactory.cpp (176613 => 176614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitClassFactory.cpp 2014-12-02 00:49:49 UTC (rev 176613)
+++ trunk/Source/WebKit/win/WebKitClassFactory.cpp 2014-12-02 00:55:48 UTC (rev 176614)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "ForEachCoClass.h"
</span><span class="cx"> #include "WebArchive.h"
</span><span class="cx"> #include "WebCache.h"
</span><del>-#include "WebCookieManager.h"
</del><span class="cx"> #include "WebCoreStatistics.h"
</span><span class="cx"> #include "WebDatabaseManager.h"
</span><span class="cx"> #include "WebDownload.h"
</span></span></pre>
</div>
</div>
</body>
</html>