Attachment 206004 Details for Bug 110115 – Patch

[patch] Patch

bug-110115-20130704002351.patch (text/plain), 11.95 KB, created by Kwang Yul Seo on 2013-07-03 08:26:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kwang Yul Seo

Created: 2013-07-03 08:26:18 PDT

Size: 11.95 KB

patch

obsolete

>Subversion Revision: 152322
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9f7574a1af0836bb1ddd16f2600d9f4455a72984..3561dfdc29be3bc7031748cabbda25bbc9938aa9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2013-06-30  Kwang Yul Seo  <skyul@company100.net>
>+
>+        [WK2][Soup] Add platform specific stubs for NetworkProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=110115
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Original patch by Balazs Kelemen <kbalazs@webkit.org>.
>+
>+        No new tests since it is not used yet and is not supposed to change behavior anyway.
>+
>+        * platform/network/NetworkStorageSession.h:
>+        (WebCore::NetworkStorageSession::isPrivateBrowsingSession):
>+        Removed the platform guards and make it return false for non Mac ports.
>+
> 2013-07-02  Radu Stavila  <stavila@adobe.com>
> 
>         [CSS Regions] Improve implementation of elements in region being flowed to another flow thread
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index d081dea22a1fbb3a7690a25f267e84d759b9d5f3..bbc6b059be28d31d995a86a4e4f787e354916908 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,31 @@
> 2013-06-30  Kwang Yul Seo  <skyul@company100.net>
> 
>+        [WK2][Soup] Add platform specific stubs for NetworkProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=110115
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Original patch by Balazs Kelemen <kbalazs@webkit.org>.
>+
>+        * NetworkProcess/gtk/NetworkProcessSoup.cpp: Added.
>+        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
>+        (WebKit::NetworkProcess::platformSetCacheModel):
>+        (WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost):
>+        Stubs.
>+        (WebKit::NetworkProcess::clearCacheForAllOrigins):
>+        (WebKit::NetworkProcess::platformTerminate):
>+        * NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp: Added.
>+        (WebKit::NetworkResourceLoadScheduler::platformInitializeMaximumHTTPConnectionCountPerHost):
>+        Added platform default based on the comment in ResourceRequestSoup.cpp.
>+        * UIProcess/Network/soup/NetworkProcessProxySoup.cpp: Added.
>+        (WebKit::NetworkProcessProxy::platformGetLaunchOptions):
>+        Stub.
>+        * UIProcess/soup/WebContextSoup.cpp: Added.
>+        (WebKit::WebContext::platformInitializeNetworkProcess):
>+        Stub.
>+
>+2013-06-30  Kwang Yul Seo  <skyul@company100.net>
>+
>         [WK2] Port RemoteNetworkingContext for Soup
>         https://bugs.webkit.org/show_bug.cgi?id=110097
> 
>diff --git a/Source/WebCore/platform/network/NetworkStorageSession.h b/Source/WebCore/platform/network/NetworkStorageSession.h
>index 033249a061d89f90898291f0cdb16d07dc06c0bb..9d30de4170a678563f63db1a61b786b63748875f 100644
>--- a/Source/WebCore/platform/network/NetworkStorageSession.h
>+++ b/Source/WebCore/platform/network/NetworkStorageSession.h
>@@ -50,6 +50,15 @@ public:
> 
>     static void switchToNewTestingSession();
> 
>+    bool isPrivateBrowsingSession() const
>+    {
>+#if PLATFORM(MAC) || USE(CFNETWORK)
>+        return m_isPrivate;
>+#else
>+        return false;
>+#endif
>+    }
>+
> #if PLATFORM(MAC) || USE(CFNETWORK)
>     // May be null, in which case a Foundation default should be used.
>     CFURLStorageSessionRef platformSession() { return m_platformSession.get(); }
>diff --git a/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp b/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..d8ebacbd0d7f4515ced10c1734bc417cebbc9ef6
>--- /dev/null
>+++ b/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
>@@ -0,0 +1,64 @@
>+/*
>+ * Copyright (C) 2013 Apple Inc. All rights reserved.
>+ * Copyright (C) 2013 Comapny 100 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"
>+#if ENABLE(NETWORK_PROCESS)
>+#include "NetworkProcess.h"
>+
>+#include "NetworkProcessCreationParameters.h"
>+#include <WebCore/NotImplemented.h>
>+
>+using namespace WebCore;
>+
>+namespace WebKit {
>+
>+void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters&)
>+{
>+}
>+
>+void NetworkProcess::platformSetCacheModel(CacheModel)
>+{
>+    notImplemented();
>+}
>+
>+void NetworkProcess::allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo&, const String&)
>+{
>+    notImplemented();
>+}
>+
>+void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
>+{
>+    notImplemented();
>+}
>+
>+void NetworkProcess::platformTerminate()
>+{
>+    notImplemented();
>+}
>+
>+} // namespace WebKit
>+
>+#endif
>diff --git a/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp b/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..8f867acb995e690da3a2b4c1980a012adee80427
>--- /dev/null
>+++ b/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
>@@ -0,0 +1,46 @@
>+/*
>+ * Copyright (C) 2013 Apple Inc. All rights reserved.
>+ * Copyright (C) 2013 Company 100 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"
>+#if ENABLE(NETWORK_PROCESS)
>+
>+#include "NetworkResourceLoadScheduler.h"
>+
>+namespace WebKit {
>+
>+void NetworkResourceLoadScheduler::platformInitializeMaximumHTTPConnectionCountPerHost()
>+{
>+    // Soup has its own queue control; it wants to have all requests
>+    // given to it, so that it is able to look ahead, and schedule
>+    // them in a good way.
>+    // See also ResourceRequestSoup.cpp
>+    static const unsigned unlimitedConnectionCount = 10000;
>+    m_maxRequestsInFlightPerHost = unlimitedConnectionCount;
>+}
>+
>+} // namespace WebKit
>+
>+#endif
>diff --git a/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp b/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..7e0d225de29d181faa7c5ee0211069b91dc9b877
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp
>@@ -0,0 +1,39 @@
>+/*
>+ * 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 ENABLE(NETWORK_PROCESS)
>+
>+#include "NetworkProcessProxy.h"
>+
>+namespace WebKit {
>+
>+void NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
>+{
>+}
>+
>+}
>+
>+#endif // ENABLE(NETWORK_PROCESS)
>diff --git a/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp b/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..9cb9cdf3da6d6f02c45f40eb5e781ddc92b5ddbf
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp
>@@ -0,0 +1,40 @@
>+/*
>+ * 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 ENABLE(NETWORK_PROCESS)
>+#include "WebContext.h"
>+
>+#include "NetworkProcessCreationParameters.h"
>+
>+namespace WebKit {
>+
>+void WebContext::platformInitializeNetworkProcess(NetworkProcessCreationParameters&)
>+{
>+}
>+
>+}
>+
>+#endif

Actions: View | Formatted Diff | Diff

Attachments on bug 110115: 188906 | 205783 | 205966 | 206004 | 206005 | 206200 | 206202 | 207494 | 213880