Attachment 211781 Details for Bug 121431 – Patch

[patch] Patch

bug-121431-20130916162112.patch (text/plain), 4.16 KB, created by Csaba Osztrogonác on 2013-09-16 07:21:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2013-09-16 07:21:14 PDT

Size: 4.16 KB

patch

obsolete

>Subversion Revision: 155854
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 38f2293a9cec6dfd165176ea065e6b96bcb0e558..055a14661777fe59ff2b12060c095b853fd84ed3 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,20 @@
>+2013-09-16  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
>+
>+        Buildfix for !USE(PROTECTION_SPACE_AUTH_CALLBACK) platforms
>+        https://bugs.webkit.org/show_bug.cgi?id=121431
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Mising guards added.
>+
>+        Original patch by Balazs Kelemen <kbalazs@webkit.org>
>+        and Kwang Yul Seo <skyul@company100.net>
>+
>+        * NetworkProcess/NetworkResourceLoader.messages.in:
>+        * WebProcess/Network/WebResourceLoader.cpp:
>+        * WebProcess/Network/WebResourceLoader.h:
>+        * WebProcess/Network/WebResourceLoader.messages.in:
>+
> 2013-09-16  Eunmi Lee  <eunmi15.lee@samsung.com>
> 
>         [EFL][WK2] Implement pan and flick gesture.
>diff --git a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in
>index 00706af43cd4dd6e818b026d9562601c5f7fdacf..ebb8d7cd317e67acfc08c9eb3b9430669cd5a8ee 100644
>--- a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in
>+++ b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in
>@@ -24,5 +24,7 @@ messages -> NetworkResourceLoader LegacyReceiver {
> 
>     ContinueWillSendRequest(WebCore::ResourceRequest request)
>     ContinueDidReceiveResponse()
>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
>     ContinueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate)
>+#endif
> }
>diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
>index 2cef4566e1816a8a2b2644afa5edc0c3f29cf66e..a5ab5ad490dd16166ee1e3ca1a343c4a6e4dfdbd 100644
>--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
>+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
>@@ -159,6 +159,7 @@ void WebResourceLoader::didReceiveResource(const ShareableResource::Handle& hand
>     m_coreLoader->didFinishLoading(finishTime);
> }
> 
>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
> void WebResourceLoader::canAuthenticateAgainstProtectionSpace(const ProtectionSpace& protectionSpace)
> {
>     Ref<WebResourceLoader> protect(*this);
>@@ -170,6 +171,7 @@ void WebResourceLoader::canAuthenticateAgainstProtectionSpace(const ProtectionSp
> 
>     send(Messages::NetworkResourceLoader::ContinueCanAuthenticateAgainstProtectionSpace(result));
> }
>+#endif
> 
> } // namespace WebKit
> 
>diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.h b/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
>index b37e9b0f09280915fa5b24f50966c03d09d6b024..9c986f2e47e523188ea45d0b1349c7f480ded572 100644
>--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
>+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
>@@ -82,7 +82,9 @@ private:
>     void didFailResourceLoad(const WebCore::ResourceError&);
>     void didReceiveResource(const ShareableResource::Handle&, double finishTime);
> 
>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
>     void canAuthenticateAgainstProtectionSpace(const WebCore::ProtectionSpace&);
>+#endif
> 
>     RefPtr<WebCore::ResourceLoader> m_coreLoader;
> };
>diff --git a/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in b/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
>index 2ac264909f1561f8dd7e74ea314f0f63472f8b07..21a5f107e75cff57e4d79b1a7c56bcc0d8020d4b 100644
>--- a/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
>+++ b/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
>@@ -31,8 +31,10 @@ messages -> WebResourceLoader LegacyReceiver {
>     DidReceiveData(CoreIPC::DataReference data, int64_t encodedDataLength)
>     DidFinishResourceLoad(double finishTime)
>     DidFailResourceLoad(WebCore::ResourceError error)
>-    
>+
>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
>     CanAuthenticateAgainstProtectionSpace(WebCore::ProtectionSpace protectionSpace)
>+#endif
> 
>     // DidReceiveResource is for when we have the entire resource data available at once, such as when the resource is cached in memory
>     DidReceiveResource(WebKit::ShareableResource::Handle resource, double finishTime)

Actions: View | Formatted Diff | Diff

Attachments on bug 121431: 211781