Title: [163304] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 163304
- Author
- carlo...@webkit.org
- Date
- 2014-02-03 06:32:18 -0800 (Mon, 03 Feb 2014)
Log Message
Merge r163081 - [SOUP] Fix the build if !ENABLE(WEB_TIMING)
https://bugs.webkit.org/show_bug.cgi?id=127906
Reviewed by Gustavo Noronha Silva.
* platform/network/soup/SoupNetworkSession.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (163303 => 163304)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-02-03 14:22:34 UTC (rev 163303)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-02-03 14:32:18 UTC (rev 163304)
@@ -1,3 +1,12 @@
+2014-01-30 Csaba Osztrogonác <o...@webkit.org>
+
+ [SOUP] Fix the build if !ENABLE(WEB_TIMING)
+ https://bugs.webkit.org/show_bug.cgi?id=127906
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * platform/network/soup/SoupNetworkSession.cpp:
+
2014-01-29 Csaba Osztrogonác <o...@webkit.org>
Remove ENABLE(_javascript__DEBUGGER) leftovers
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (163303 => 163304)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2014-02-03 14:22:34 UTC (rev 163303)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2014-02-03 14:32:18 UTC (rev 163304)
@@ -78,6 +78,7 @@
handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(session, soupMessage, soupAuth, retrying, handle.get()));
}
+#if ENABLE(WEB_TIMING)
static void requestStartedCallback(SoupSession*, SoupMessage* soupMessage, SoupSocket*, gpointer)
{
RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(g_object_get_data(G_OBJECT(soupMessage), "handle"));
@@ -85,6 +86,7 @@
return;
handle->didStartRequest();
}
+#endif
SoupNetworkSession::SoupNetworkSession(SoupCookieJar* cookieJar)
: m_soupSession(adoptGRef(soup_session_async_new()))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
