Attachment 188906 Details for Bug 110115 – Patch

[patch] Patch

bug-110115-20130218182751.patch (text/plain), 12.04 KB, created by Balazs Kelemen on 2013-02-18 09:31:35 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Balazs Kelemen

Created: 2013-02-18 09:31:35 PST

Size: 12.04 KB

patch

obsolete

>Subversion Revision: 143173
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c9951082f5a132a5072bb93b620996db67ec1fac..2ae4b1a2ad4db72ae08a9d8ddbe3ac44b568c418 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2013-02-18  Balazs Kelemen  <kbalazs@webkit.org>
>+
>+        [WK2][Soup] Add platform specific stubs for NetworkProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=110115
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests since it is not used yet and does not supposed to change behavior anyway.
>+
>+        * platform/network/NetworkStorageSession.h:
>+        (WebCore::NetworkStorageSession::isPrivateBrowsingSession):
>+        (NetworkStorageSession):
>+        * platform/network/soup/NetworkStorageSessionSoup.cpp:
>+        (WebCore::NetworkStorageSession::NetworkStorageSession):
>+        Add NetworkStorageSession::isPrivateBrowsingSession for soup since WebKit2 calls it.
>+
> 2013-02-15  Eugene Klyuchnikov  <eustas@chromium.org>
> 
>         Web Inspector: Introduce ProfilesPanelDescriptor.
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 1757ffc44f7a98329aa63e80e4c814096eb33173..3e96950dc175043c3d73d77c2528172a37644368 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,31 @@
> 2013-02-18  Balazs Kelemen  <kbalazs@webkit.org>
> 
>+        [WK2][Soup] Add platform specific stubs for NetworkProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=110115
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/efl/NetworkProcessEfl.cpp: Added.
>+        (WebKit):
>+        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
>+        (WebKit::NetworkProcess::platformSetCacheModel):
>+        (WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost):
>+        Stubs.
>+        * NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp: Added.
>+        (WebKit):
>+        (WebKit::NetworkResourceLoadScheduler::platformInitializeMaximumHTTPConnectionCountPerHost):
>+        Added platform default based on the comment in ResourceRequestSoup.cpp.
>+        * UIProcess/Network/soup/NetworkProcessProxySoup.cpp: Added.
>+        (WebKit):
>+        (WebKit::NetworkProcessProxy::platformGetLaunchOptions):
>+        Stub.
>+        * UIProcess/soup/WebContextSoup.cpp: Added.
>+        (WebKit):
>+        (WebKit::WebContext::platformInitializeNetworkProcess):
>+        Stub.
>+
>+2013-02-18  Balazs Kelemen  <kbalazs@webkit.org>
>+
>         [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 7b161a00c9760b5cc12708a6752f9a1f3f6e8b8f..1ffe6eecfce904842ddec9785fb396ccd3ebb990 100644
>--- a/Source/WebCore/platform/network/NetworkStorageSession.h
>+++ b/Source/WebCore/platform/network/NetworkStorageSession.h
>@@ -58,6 +58,7 @@ public:
> #elif USE(SOUP)
>     void setSoupSession(SoupSession* session) { m_session = session; }
>     SoupSession* soupSession() const { return m_session; }
>+    bool isPrivateBrowsingSession() const { return m_isPrivate; }
> #else
>     NetworkStorageSession(NetworkingContext*);
>     ~NetworkStorageSession();
>@@ -73,6 +74,7 @@ private:
> #elif USE(SOUP)
>     NetworkStorageSession(SoupSession*);
>     SoupSession* m_session;
>+    bool m_isPrivate;
> #else
>     RefPtr<NetworkingContext> m_context;
> #endif
>diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>index dd56e2b89f51cd77ccb20273f7a2c5d38ebfead0..c29a4c064672daa1efee11da7e4c9d61c55dcdc6 100644
>--- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>@@ -35,6 +35,7 @@ namespace WebCore {
> 
> NetworkStorageSession::NetworkStorageSession(SoupSession* session)
>     : m_session(session)
>+    , m_isPrivate(false)
> {
> }
> 
>diff --git a/Source/WebKit2/NetworkProcess/efl/NetworkProcessEfl.cpp b/Source/WebKit2/NetworkProcess/efl/NetworkProcessEfl.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..589a7962931331d69d7b8ec5d726aab19a6ba6da
>--- /dev/null
>+++ b/Source/WebKit2/NetworkProcess/efl/NetworkProcessEfl.cpp
>@@ -0,0 +1,53 @@
>+/*
>+ * Copyright (C) 2013 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 "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();
>+}
>+
>+} // 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..7bab726b420e674d30d44aa9b50f4402593cfe9b
>--- /dev/null
>+++ b/Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp
>@@ -0,0 +1,41 @@
>+/*
>+ * Copyright (C) 2013 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 "NetworkResourceLoadScheduler.h"
>+
>+namespace WebKit {
>+
>+unsigned NetworkResourceLoadScheduler::platformInitializeMaximumHTTPConnectionCountPerHost()
>+{
>+    // See: ResourceRequestSoup.cpp
>+    return 10000;
>+}
>+
>+} // 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