2010-11-24 Sheriff Bot <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r72647.
        http://trac.webkit.org/changeset/72647
        https://bugs.webkit.org/show_bug.cgi?id=50009

        breaks the http layout tests (Requested by philn-tp on
        #webkit).

        * platform/network/soup/ResourceHandleSoup.cpp:
        (WebCore::sendRequestCallback):
        (WebCore::startHttp):
        (WebCore::ResourceHandle::platformSetDefersLoading):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72649 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 63b38432
2010-11-24 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r72647.
http://trac.webkit.org/changeset/72647
https://bugs.webkit.org/show_bug.cgi?id=50009
breaks the http layout tests (Requested by philn-tp on
#webkit).
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::sendRequestCallback):
(WebCore::startHttp):
(WebCore::ResourceHandle::platformSetDefersLoading):
2010-11-23 Philippe Normand <pnormand@igalia.com>
Reviewed by Martin Robinson.
......@@ -545,9 +545,6 @@ static void sendRequestCallback(GObject* source, GAsyncResult* res, gpointer use
}
}
if (d->m_defersLoading)
soup_session_pause_message(handle->defaultSession(), d->m_soupMessage.get());
g_input_stream_read_async(d->m_inputStream.get(), d->m_buffer, READ_BUFFER_SIZE,
G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, 0);
}
......@@ -657,11 +654,8 @@ static bool startHttp(ResourceHandle* handle)
if (!soup_message_headers_get_one(soupMessage->request_headers, "Accept"))
soup_message_headers_append(soupMessage->request_headers, "Accept", "*/*");
// Send the request only if it's not been explicitely deferred.
if (!d->m_defersLoading) {
d->m_cancellable = adoptPlatformRef(g_cancellable_new());
webkit_soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, 0);
}
d->m_cancellable = adoptPlatformRef(g_cancellable_new());
webkit_soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, 0);
return true;
}
......@@ -734,28 +728,9 @@ bool ResourceHandle::supportsBufferedData()
return false;
}
void ResourceHandle::platformSetDefersLoading(bool defersLoading)
void ResourceHandle::platformSetDefersLoading(bool)
{
// Initial implementation of this method was required for bug #44157.
if (d->m_cancelled)
return;
if (!defersLoading && !d->m_cancellable && d->m_soupRequest.get()) {
d->m_cancellable = adoptPlatformRef(g_cancellable_new());
webkit_soup_request_send_async(d->m_soupRequest.get(), d->m_cancellable.get(), sendRequestCallback, 0);
return;
}
// Only supported for http(s) transfers. Something similar would
// probably be needed for data transfers done with GIO.
if (!d->m_soupMessage)
return;
if (defersLoading)
soup_session_pause_message(defaultSession(), d->m_soupMessage.get());
else
soup_session_unpause_message(defaultSession(), d->m_soupMessage.get());
notImplemented();
}
bool ResourceHandle::loadsBlocked()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment