Attachment #222661 for bug #127906

View Details Raw Unified Return to Bug 127906



2014-01-30  Csaba Osztrogonác  <ossy@webkit.org>

        [SOUP] Fix the build if !ENABLE(WEB_TIMING)
        https://bugs.webkit.org/show_bug.cgi?id=127906

        Reviewed by NOBODY (OOPS!).

        * platform/network/soup/SoupNetworkSession.cpp:

2014-01-30  Andrei Bucur  <abucur@adobe.com>

        Remove the ACCELERATED_COMPOSITING flag



    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"));

        return;
    handle->didStartRequest();
}
#endif

SoupNetworkSession::SoupNetworkSession(SoupCookieJar* cookieJar)
    : m_soupSession(adoptGRef(soup_session_async_new()))

Return to Bug 127906

Lines 78-83 static void authenticateCallback(SoupSession* session, SoupMessage* soupMessage, a/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp_sec1
- a/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp +2 lines
78	handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(session, soupMessage, soupAuth, retrying, handle.get()));	78	handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(session, soupMessage, soupAuth, retrying, handle.get()));
79	}	79	}
80		80
		81	#if ENABLE(WEB_TIMING)
81	static void requestStartedCallback(SoupSession, SoupMessage soupMessage, SoupSocket*, gpointer)	82	static void requestStartedCallback(SoupSession, SoupMessage soupMessage, SoupSocket*, gpointer)
82	{	83	{
83	RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(g_object_get_data(G_OBJECT(soupMessage), "handle"));	84	RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(g_object_get_data(G_OBJECT(soupMessage), "handle"));
Lines 85-90 static void requestStartedCallback(SoupSession, SoupMessage soupMessage, SoupS a/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp_sec2
85	return;	86	return;
86	handle->didStartRequest();	87	handle->didStartRequest();
87	}	88	}
		89	#endif
88		90
89	SoupNetworkSession::SoupNetworkSession(SoupCookieJar* cookieJar)	91	SoupNetworkSession::SoupNetworkSession(SoupCookieJar* cookieJar)
90	: m_soupSession(adoptGRef(soup_session_async_new()))	92	: m_soupSession(adoptGRef(soup_session_async_new()))

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +9 lines
		1	2014-01-30 Csaba Osztrogonác <ossy@webkit.org>
		2
		3	[SOUP] Fix the build if !ENABLE(WEB_TIMING)
		4	https://bugs.webkit.org/show_bug.cgi?id=127906
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* platform/network/soup/SoupNetworkSession.cpp:
		9
1	2014-01-30 Andrei Bucur <abucur@adobe.com>	10	2014-01-30 Andrei Bucur <abucur@adobe.com>
2		11
3	Remove the ACCELERATED_COMPOSITING flag	12	Remove the ACCELERATED_COMPOSITING flag