ChangeLog

2013-12-08  Gustavo Noronha Silva  <gns@gnome.org>

        [Soup] Send original encoded data size to didReceiveBuffer

        https://bugs.webkit.org/show_bug.cgi?id=125410

        Reviewed by NOBODY (OOPS!).

        No tests, the only way to test this seems to be through the inspector UI.

        * platform/network/ResourceHandle.h:

        * platform/network/ResourceHandleInternal.h:

        (WebCore::ResourceHandleInternal::ResourceHandleInternal): data member to track stream

        position.

        * platform/network/soup/ResourceHandleSoup.cpp:

        (WebCore::ResourceHandle::currentStreamPosition): obtains the current stream position by querying

        the first seekable input stream we find.

        (WebCore::nextMultipartResponsePartCallback): store the position before we start reading a new part.

        (WebCore::sendRequestCallback): store the position before we start reading the response body.

        (WebCore::readCallback): pass the position delta to didReceiveData.

2013-12-07  ChangSeok Oh  <changseok.oh@collabora.com>

        Unreviewed. Build fix for gtk port after r160260.

Source/WebCore/platform/network/ResourceHandle.h

@@public:

    void sendPendingRequest();

    bool cancelledOrClientless();

    void ensureReadBuffer();

183 size_t currentStreamPosition() const;

    static SoupSession* defaultSession();

    static SoupSession* createTestingSession();

    static SoupSession* createPrivateBrowsingSession();

Source/WebCore/platform/network/ResourceHandleInternal.h

@@namespace WebCore {

            , m_bodySize(0)

            , m_bodyDataSent(0)

            , m_redirectCount(0)

114 , m_previousPosition(0)

#endif

#if PLATFORM(MAC)

            , m_startWhenScheduled(false)

@@namespace WebCore {

        unsigned long m_bodyDataSent;

        SoupSession* soupSession();

        int m_redirectCount;

207 size_t m_previousPosition;

#endif

#if PLATFORM(GTK)

        struct {

Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@static bool handleUnignoredTLSErrors(ResourceHandle* handle)

    return true;

}

size_t ResourceHandle::currentStreamPosition() const

{

    GInputStream* baseStream = d->m_inputStream.get();

    while (!G_IS_SEEKABLE(baseStream))

        baseStream = g_filter_input_stream_get_base_stream(G_FILTER_INPUT_STREAM(baseStream));

    return g_seekable_tell(G_SEEKABLE(baseStream));

}

static void nextMultipartResponsePartCallback(GObject* /*source*/, GAsyncResult* result, gpointer data)

{

    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);

@@static void nextMultipartResponsePartCallback(GObject* /*source*/, GAsyncResult*

        return;

    }

649 d->m_previousPosition = handle->currentStreamPosition();

650

    handle->ensureReadBuffer();

    g_input_stream_read_async(d->m_inputStream.get(), d->m_readBufferPtr, d->m_readBufferSize,

        G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, handle.get());

@@static void sendRequestCallback(GObject*, GAsyncResult* result, gpointer data)

    d->m_inputStream = inputStream;

727 d->m_previousPosition = handle->currentStreamPosition();

728

    handle->ensureReadBuffer();

    g_input_stream_read_async(d->m_inputStream.get(), d->m_readBufferPtr, d->m_readBufferSize,

        G_PRIORITY_DEFAULT, d->m_cancellable.get(), readCallback, handle.get());

@@static void readCallback(GObject*, GAsyncResult* asyncResult, gpointer data)

    // It's mandatory to have sent a response before sending data

    ASSERT(!d->m_response.isNull());

1335 handle->client()->didReceiveData(handle.get(), d->m_readBufferPtr, bytesRead, bytesRead);

    size_t currentPosition = handle->currentStreamPosition();

    handle->client()->didReceiveData(handle.get(), d->m_readBufferPtr, bytesRead, currentPosition - d->m_previousPosition);

    d->m_previousPosition = currentPosition;

    // didReceiveData may cancel the load, which may release the last reference.

    if (handle->cancelledOrClientless()) {