Diff
Modified: trunk/Source/WebCore/ChangeLog (176613 => 176614)
--- 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)
@@ -1,3 +1,20 @@
+2014-12-01 Anders Carlsson <[email protected]>
+
+ 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):
+
2014-12-01 Dean Jackson <[email protected]>
[iOS Media] Slider knob should not have a border
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (176613 => 176614)
--- 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)
@@ -82,12 +82,6 @@
#endif
};
-#if PLATFORM(WIN) && USE(CFNETWORK)
-// Needed for WebKit1 API only.
-void overrideCookieStorage(CFHTTPCookieStorageRef);
-CFHTTPCookieStorageRef overridenCookieStorage();
-#endif
-
}
#endif // NetworkStorageSession_h
Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (176613 => 176614)
--- 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)
@@ -63,26 +63,6 @@
#endif
}
-#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
-
NetworkStorageSession& NetworkStorageSession::defaultStorageSession()
{
if (!defaultNetworkStorageSession())
@@ -106,11 +86,6 @@
RetainPtr<CFHTTPCookieStorageRef> NetworkStorageSession::cookieStorage() const
{
-#if PLATFORM(WIN)
- if (RetainPtr<CFHTTPCookieStorageRef>& override = cookieStorageOverride())
- return override;
-#endif
-
if (m_platformSession)
return adoptCF(wkCopyHTTPCookieStorage(m_platformSession.get()));
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (176613 => 176614)
--- 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)
@@ -178,13 +178,6 @@
if (sslProps)
CFURLRequestSetSSLProperties(request.get(), sslProps.get());
-#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
-
CFMutableDictionaryRef streamProperties = CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
if (!shouldUseCredentialStorage) {
Modified: trunk/Source/WebKit/ChangeLog (176613 => 176614)
--- 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)
@@ -1,3 +1,17 @@
+2014-12-01 Anders Carlsson <[email protected]>
+
+ 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:
+
2014-11-27 Anders Carlsson <[email protected]>
Add a stubbed out WebVisitedLinkStore class on Windows
Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj (176613 => 176614)
--- 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)
@@ -540,20 +540,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</Midl>
- <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>
<Midl Include="..\..\win\Interfaces\IWebCoreStatistics.idl">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters (176613 => 176614)
--- 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)
@@ -46,9 +46,6 @@
<Midl Include="..\..\win\Interfaces\IWebCache.idl">
<Filter>IDL</Filter>
</Midl>
- <Midl Include="..\..\win\Interfaces\IWebCookieManager.idl">
- <Filter>IDL</Filter>
- </Midl>
<Midl Include="..\..\win\Interfaces\IWebCoreStatistics.idl">
<Filter>IDL</Filter>
</Midl>
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (176613 => 176614)
--- 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)
@@ -305,23 +305,6 @@
<ClCompile Include="..\..\win\WebArchive.cpp" />
<ClCompile Include="..\..\win\WebBackForwardList.cpp" />
<ClCompile Include="..\..\win\WebCache.cpp" />
- <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>
<ClCompile Include="..\..\win\WebCoreStatistics.cpp" />
<ClCompile Include="..\..\win\WebCoreSupport\AcceleratedCompositingContext.cpp" />
<ClCompile Include="..\..\win\WebCoreSupport\EmbeddedWidget.cpp" />
@@ -460,7 +443,6 @@
<ClInclude Include="..\..\win\WebBackForwardList.h" />
<ClInclude Include="..\..\win\WebCache.h" />
<ClInclude Include="..\..\win\WebCachedFramePlatformData.h" />
- <ClInclude Include="..\..\win\WebCookieManager.h" />
<ClInclude Include="..\..\win\WebCoreStatistics.h" />
<ClInclude Include="..\..\win\WebCoreSupport\AcceleratedCompositingContext.h" />
<ClInclude Include="..\..\win\WebCoreSupport\EmbeddedWidget.h" />
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters (176613 => 176614)
--- 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)
@@ -109,15 +109,6 @@
<ClCompile Include="..\..\win\WebCache.cpp">
<Filter>Sources</Filter>
</ClCompile>
- <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>
<ClCompile Include="..\..\win\WebCoreStatistics.cpp">
<Filter>Sources</Filter>
</ClCompile>
@@ -388,9 +379,6 @@
<ClInclude Include="..\..\win\WebCachedFramePlatformData.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\win\WebCookieManager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\win\WebCoreStatistics.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/Source/WebKit/win/ChangeLog (176613 => 176614)
--- 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)
@@ -1,3 +1,21 @@
+2014-12-01 Anders Carlsson <[email protected]>
+
+ 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:
+
2014-11-29 Anders Carlsson <[email protected]>
Switch over to using WebVisitedLinkStore on Windows
Modified: trunk/Source/WebKit/win/ForEachCoClass.h (176613 => 176614)
--- 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)
@@ -60,7 +60,6 @@
macro(WebView) \
macro(WebArchive) \
macro(WebCoreStatistics) \
- macro(WebCookieManager) \
macro(WebWorkersPrivate) \
macro(WebScriptWorld) \
macro(WebGeolocationPosition) \
Deleted: trunk/Source/WebKit/win/Interfaces/IWebCookieManager.idl (176613 => 176614)
--- 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)
@@ -1,52 +0,0 @@
-/*
- * 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);
-}
Modified: trunk/Source/WebKit/win/Interfaces/WebKit.idl (176613 => 176614)
--- 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)
@@ -74,7 +74,6 @@
#include "IWebBackForwardList.idl"
#include "IWebBackForwardListPrivate.idl"
#include "IWebCache.idl"
-#include "IWebCookieManager.idl"
#include "IWebCoreStatistics.idl"
#include "IWebDataSource.idl"
#include "IWebDatabaseManager.idl"
@@ -266,11 +265,6 @@
[default] interface IWebCoreStatistics;
}
- [uuid(3F35F332-BB2B-49b3-AEDD-27B317687E07)]
- coclass WebCookieManager{
- [default] interface IWebCookieManager;
- }
-
[uuid(0967AAFF-2FFE-4fcc-81F3-3FF2A9C6DCE2)]
coclass WebWorkersPrivate{
[default] interface IWebWorkersPrivate;
Deleted: trunk/Source/WebKit/win/WebCookieManager.cpp (176613 => 176614)
--- 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)
@@ -1,80 +0,0 @@
-/*
- * 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;
-}
Deleted: trunk/Source/WebKit/win/WebCookieManager.h (176613 => 176614)
--- 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)
@@ -1,60 +0,0 @@
-/*
- * 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
Deleted: trunk/Source/WebKit/win/WebCookieManagerCFNet.cpp (176613 => 176614)
--- 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)
@@ -1,52 +0,0 @@
-/*
- * 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;
-}
Deleted: trunk/Source/WebKit/win/WebCookieManagerCurl.cpp (176613 => 176614)
--- 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)
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2008 Brent Fulgham <[email protected]>. 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;
-}
Modified: trunk/Source/WebKit/win/WebKitClassFactory.cpp (176613 => 176614)
--- 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)
@@ -31,7 +31,6 @@
#include "ForEachCoClass.h"
#include "WebArchive.h"
#include "WebCache.h"
-#include "WebCookieManager.h"
#include "WebCoreStatistics.h"
#include "WebDatabaseManager.h"
#include "WebDownload.h"
