Diff
Modified: trunk/Source/WebCore/ChangeLog (224960 => 224961)
--- trunk/Source/WebCore/ChangeLog 2017-11-17 05:49:55 UTC (rev 224960)
+++ trunk/Source/WebCore/ChangeLog 2017-11-17 06:14:28 UTC (rev 224961)
@@ -1,3 +1,30 @@
+2017-11-16 Yousuke Kimoto <[email protected]>
+
+ [WinCairo] Add network (curl) files for wincairo webkit
+ https://bugs.webkit.org/show_bug.cgi?id=179474
+
+ Reviewed by Alex Christensen.
+
+ No new behvaior, no new tests.
+
+ * PlatformWinCairo.cmake:
+ * platform/Curl.cmake:
+ * platform/network/curl/CookieStorageCurl.cpp: Added.
+ (WebCore::startObservingCookieChanges):
+ (WebCore::stopObservingCookieChanges):
+ * platform/network/curl/NetworkStorageSessionCurl.cpp: Added.
+ (WebCore::NetworkStorageSession::~NetworkStorageSession):
+ (WebCore::NetworkStorageSession::context const):
+ (WebCore::defaultSession):
+ (WebCore::NetworkStorageSession::ensureSession):
+ (WebCore::NetworkStorageSession::switchToNewTestingSession):
+ (WebCore::NetworkStorageSession::setCookies):
+ (WebCore::NetworkStorageSession::setCookie):
+ (WebCore::NetworkStorageSession::deleteCookie):
+ (WebCore::NetworkStorageSession::getAllCookies):
+ (WebCore::NetworkStorageSession::getCookies):
+ (WebCore::NetworkStorageSession::flushCookieStore):
+
2017-11-16 Alex Christensen <[email protected]>
Fix occasional crash when adding and removing videos
Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (224960 => 224961)
--- trunk/Source/WebCore/PlatformWinCairo.cmake 2017-11-17 05:49:55 UTC (rev 224960)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2017-11-17 06:14:28 UTC (rev 224961)
@@ -25,8 +25,6 @@
platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp
platform/graphics/win/SimpleFontDataCairoWin.cpp
- platform/network/NetworkStorageSessionStub.cpp
-
platform/text/win/LocaleWin.cpp
platform/win/DelayLoadedModulesEnumerator.cpp
Modified: trunk/Source/WebCore/platform/Curl.cmake (224960 => 224961)
--- trunk/Source/WebCore/platform/Curl.cmake 2017-11-17 05:49:55 UTC (rev 224960)
+++ trunk/Source/WebCore/platform/Curl.cmake 2017-11-17 06:14:28 UTC (rev 224961)
@@ -5,6 +5,7 @@
list(APPEND WebCore_SOURCES
platform/network/curl/AuthenticationChallengeCurl.cpp
platform/network/curl/CookieJarCurl.cpp
+ platform/network/curl/CookieStorageCurl.cpp
platform/network/curl/CredentialStorageCurl.cpp
platform/network/curl/CurlCacheEntry.cpp
platform/network/curl/CurlCacheManager.cpp
@@ -17,6 +18,7 @@
platform/network/curl/DNSCurl.cpp
platform/network/curl/FormDataStreamCurl.cpp
platform/network/curl/MultipartHandle.cpp
+ platform/network/curl/NetworkStorageSessionCurl.cpp
platform/network/curl/ProxyServerCurl.cpp
platform/network/curl/ResourceErrorCurl.cpp
platform/network/curl/ResourceHandleCurl.cpp
Deleted: trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp (224960 => 224961)
--- trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp 2017-11-17 05:49:55 UTC (rev 224960)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp 2017-11-17 06:14:28 UTC (rev 224961)
@@ -1,74 +0,0 @@
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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"
-
-#if !USE(SOUP)
-
-#include "NetworkStorageSession.h"
-
-#include "NetworkingContext.h"
-#include <wtf/NeverDestroyed.h>
-
-namespace WebCore {
-
-NetworkStorageSession::NetworkStorageSession(PAL::SessionID sessionID, NetworkingContext* context)
- : m_sessionID(sessionID)
- , m_context(context)
-{
-}
-
-NetworkStorageSession::~NetworkStorageSession() = default;
-
-NetworkingContext* NetworkStorageSession::context() const
-{
- return m_context.get();
-}
-
-void NetworkStorageSession::ensureSession(PAL::SessionID, const String&)
-{
- ASSERT_NOT_REACHED();
-}
-
-static std::unique_ptr<NetworkStorageSession>& defaultSession()
-{
- static NeverDestroyed<std::unique_ptr<NetworkStorageSession>> session;
- return session;
-}
-
-NetworkStorageSession& NetworkStorageSession::defaultStorageSession()
-{
- if (!defaultSession())
- defaultSession() = std::make_unique<NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
- return *defaultSession();
-}
-
-void NetworkStorageSession::switchToNewTestingSession()
-{
-}
-
-}
-
-#endif
Copied: trunk/Source/WebCore/platform/network/curl/CookieStorageCurl.cpp (from rev 224960, trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h) (0 => 224961)
--- trunk/Source/WebCore/platform/network/curl/CookieStorageCurl.cpp (rev 0)
+++ trunk/Source/WebCore/platform/network/curl/CookieStorageCurl.cpp 2017-11-17 06:14:28 UTC (rev 224961)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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 "CookieStorage.h"
+
+#if USE(CURL)
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+void startObservingCookieChanges(const NetworkStorageSession&, WTF::Function<void()>&&)
+{
+ notImplemented();
+}
+
+void stopObservingCookieChanges(const NetworkStorageSession&)
+{
+ notImplemented();
+}
+
+}
+
+#endif
Copied: trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp (from rev 224960, trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp) (0 => 224961)
--- trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp (rev 0)
+++ trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp 2017-11-17 06:14:28 UTC (rev 224961)
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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 "NetworkStorageSession.h"
+
+#if USE(CURL)
+
+#include "Cookie.h"
+#include "NetworkingContext.h"
+#include "ResourceHandle.h"
+
+#include <wtf/MainThread.h>
+#include <wtf/NeverDestroyed.h>
+
+namespace WebCore {
+
+NetworkStorageSession::NetworkStorageSession(PAL::SessionID sessionID, NetworkingContext* context)
+ : m_sessionID(sessionID)
+ , m_context(context)
+{
+}
+
+NetworkStorageSession::~NetworkStorageSession()
+{
+}
+
+NetworkingContext* NetworkStorageSession::context() const
+{
+ return m_context.get();
+}
+
+static std::unique_ptr<NetworkStorageSession>& defaultSession()
+{
+ ASSERT(isMainThread());
+ static NeverDestroyed<std::unique_ptr<NetworkStorageSession>> session;
+ return session;
+}
+
+NetworkStorageSession& NetworkStorageSession::defaultStorageSession()
+{
+ if (!defaultSession())
+ defaultSession() = std::make_unique<NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
+ return *defaultSession();
+}
+
+void NetworkStorageSession::ensureSession(PAL::SessionID, const String&)
+{
+ // FIXME: Implement for WebKit to use.
+}
+
+void NetworkStorageSession::switchToNewTestingSession()
+{
+ // FIXME: Implement for WebKit to use.
+}
+
+void NetworkStorageSession::setCookies(const Vector<Cookie>&, const URL&, const URL&)
+{
+ // FIXME: Implement for WebKit to use.
+}
+
+void NetworkStorageSession::setCookie(const Cookie&)
+{
+ // FIXME: Implement for WebKit to use.
+}
+
+void NetworkStorageSession::deleteCookie(const Cookie&)
+{
+ // FIXME: Implement for WebKit to use.
+}
+
+Vector<Cookie> NetworkStorageSession::getAllCookies()
+{
+ // FIXME: Implement for WebKit to use.
+ return { };
+}
+
+Vector<Cookie> NetworkStorageSession::getCookies(const URL&)
+{
+ // FIXME: Implement for WebKit to use.
+ return { };
+}
+
+void NetworkStorageSession::flushCookieStore()
+{
+ // FIXME: Implement for WebKit to use.
+}
+
+} // namespace WebCore
+
+#endif // USE(CURL)
Modified: trunk/Source/WebKit/ChangeLog (224960 => 224961)
--- trunk/Source/WebKit/ChangeLog 2017-11-17 05:49:55 UTC (rev 224960)
+++ trunk/Source/WebKit/ChangeLog 2017-11-17 06:14:28 UTC (rev 224961)
@@ -1,3 +1,17 @@
+2017-11-16 Yousuke Kimoto <[email protected]>
+
+ [WinCairo] Add network (curl) files for wincairo webkit
+ https://bugs.webkit.org/show_bug.cgi?id=179474
+
+ Reviewed by Alex Christensen.
+
+ * Shared/curl/WebCoreArgumentCodersCurl.cpp:
+ (IPC::ArgumentCoder<CertificateInfo>::decode): Fidex return value since currently no operation is needed for wincairo webkit.
+ (IPC::ArgumentCoder<ResourceError>::decodePlatformData): Fidex return value since currently no operation is needed for wincairo webkit.
+ * WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.cpp: Renamed from Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp.
+ (WebKit::WebFrameNetworkingContext::ensureWebsiteDataStoreSession):
+ * WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.h: Renamed from Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h.
+
2017-11-16 Don Olmstead <[email protected]>
[WinCairo] Update WinCairoRequirements
Modified: trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp (224960 => 224961)
--- trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp 2017-11-17 05:49:55 UTC (rev 224960)
+++ trunk/Source/WebKit/Shared/curl/WebCoreArgumentCodersCurl.cpp 2017-11-17 06:14:28 UTC (rev 224961)
@@ -53,7 +53,7 @@
bool ArgumentCoder<CertificateInfo>::decode(Decoder&, CertificateInfo&)
{
- return false;
+ return true;
}
void ArgumentCoder<ResourceError>::encodePlatformData(Encoder&, const ResourceError&)
@@ -62,7 +62,7 @@
bool ArgumentCoder<ResourceError>::decodePlatformData(Decoder&, ResourceError&)
{
- return false;
+ return true;
}
void ArgumentCoder<ProtectionSpace>::encodePlatformData(Encoder&, const ProtectionSpace&)
Copied: trunk/Source/WebKit/WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.cpp (from rev 224960, trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp) (0 => 224961)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.cpp (rev 0)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.cpp 2017-11-17 06:14:28 UTC (rev 224961)
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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 "WebFrameNetworkingContext.h"
+
+#include "NetworkSession.h"
+#include "SessionTracker.h"
+#include "WebFrame.h"
+#include "WebPage.h"
+#include "WebsiteDataStoreParameters.h"
+#include <WebCore/FrameLoader.h>
+#include <WebCore/NetworkStorageSession.h>
+#include <WebCore/ResourceError.h>
+#include <WebCore/Settings.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&)
+{
+ auto sessionID = parameters.networkSessionParameters.sessionID;
+ ASSERT(isMainThread());
+ ASSERT(sessionID.isEphemeral());
+
+ if (NetworkStorageSession::storageSession(sessionID))
+ return;
+
+ // FIXME: Implement to ensure a data storage session.
+}
+
+WebFrameNetworkingContext::WebFrameNetworkingContext(WebFrame* frame)
+ : FrameNetworkingContext(frame->coreFrame())
+{
+}
+
+NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
+{
+ if (frame()) {
+ if (auto* storageSession = NetworkStorageSession::storageSession(frame()->page()->sessionID()))
+ return *storageSession;
+ }
+ return NetworkStorageSession::defaultStorageSession();
+}
+
+WebFrameLoaderClient* WebFrameNetworkingContext::webFrameLoaderClient() const
+{
+ if (!frame())
+ return nullptr;
+
+ return toWebFrameLoaderClient(frame()->loader().client());
+}
+
+#if PLATFORM(WIN)
+WebCore::ResourceError WebFrameNetworkingContext::blockedError(const WebCore::ResourceRequest&) const
+{
+ return WebCore::ResourceError();
+}
+#endif
+
+}
Copied: trunk/Source/WebKit/WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.h (from rev 224960, trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h) (0 => 224961)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.h (rev 0)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.h 2017-11-17 06:14:28 UTC (rev 224961)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#pragma once
+
+#include <WebCore/FrameNetworkingContext.h>
+#include <pal/SessionID.h>
+
+namespace WebKit {
+
+class WebFrame;
+class WebFrameLoaderClient;
+struct WebsiteDataStoreParameters;
+
+class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
+public:
+ static Ref<WebFrameNetworkingContext> create(WebFrame* frame)
+ {
+ return adoptRef(*new WebFrameNetworkingContext(frame));
+ }
+
+ static void ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&);
+
+ WebFrameLoaderClient* webFrameLoaderClient() const;
+
+#if PLATFORM(WIN)
+ WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const;
+#endif
+
+private:
+ WebFrameNetworkingContext(WebFrame*);
+
+ WebCore::NetworkStorageSession& storageSession() const override;
+};
+
+}
Deleted: trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp (224960 => 224961)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp 2017-11-17 05:49:55 UTC (rev 224960)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp 2017-11-17 06:14:28 UTC (rev 224961)
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
- *
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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 "WebFrameNetworkingContext.h"
-
-#include "NetworkSession.h"
-#include "SessionTracker.h"
-#include "WebFrame.h"
-#include "WebPage.h"
-#include <WebCore/FrameLoader.h>
-#include <WebCore/NetworkStorageSession.h>
-#include <WebCore/ResourceError.h>
-#include <WebCore/Settings.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebFrameNetworkingContext::ensurePrivateBrowsingSession(PAL::SessionID sessionID)
-{
- ASSERT(isMainThread());
- ASSERT(sessionID.isEphemeral());
-
- if (NetworkStorageSession::storageSession(sessionID))
- return;
-}
-
-void WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&)
-{
- // FIXME: Implement
-}
-
-WebFrameNetworkingContext::WebFrameNetworkingContext(WebFrame* frame)
- : FrameNetworkingContext(frame->coreFrame())
-{
-}
-
-NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
-{
- if (frame()) {
- if (auto* storageSession = NetworkStorageSession::storageSession(frame()->page()->sessionID()))
- return *storageSession;
- }
- return NetworkStorageSession::defaultStorageSession();
-}
-
-WebFrameLoaderClient* WebFrameNetworkingContext::webFrameLoaderClient() const
-{
- if (!frame())
- return nullptr;
-
- return toWebFrameLoaderClient(frame()->loader().client());
-}
-
-WebCore::ResourceError WebFrameNetworkingContext::blockedError(const WebCore::ResourceRequest&) const
-{
- return WebCore::ResourceError();
-}
-
-}
Deleted: trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h (224960 => 224961)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h 2017-11-17 05:49:55 UTC (rev 224960)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h 2017-11-17 06:14:28 UTC (rev 224961)
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
- *
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#pragma once
-
-#include <WebCore/FrameNetworkingContext.h>
-#include <pal/SessionID.h>
-
-namespace WebKit {
-
-class WebFrame;
-class WebFrameLoaderClient;
-struct WebsiteDataStoreParameters;
-
-class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
-public:
- static Ref<WebFrameNetworkingContext> create(WebFrame* frame)
- {
- return adoptRef(*new WebFrameNetworkingContext(frame));
- }
-
- static void ensurePrivateBrowsingSession(PAL::SessionID);
- static void ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&);
-
- WebFrameLoaderClient* webFrameLoaderClient() const;
-
-
- WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const;
-
-private:
- WebFrameNetworkingContext(WebFrame*);
-
- WebCore::NetworkStorageSession& storageSession() const override;
-};
-
-}
