Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

1 files changed, 7 insertions, 6 deletions

diff --git a/Source/WebCore/platform/network/ResourceHandleInternal.h b/Source/WebCore/platform/network/ResourceHandleInternal.h
index ed66944..5512062 100644
--- a/Source/WebCore/platform/network/ResourceHandleInternal.h
+++ b/Source/WebCore/platform/network/ResourceHandleInternal.h
@@ -46,8 +46,9 @@
 #endif
 
 #if USE(SOUP)
-#include "soup-requester.h"
 #include <GRefPtr.h>
+#define LIBSOUP_USE_UNSTABLE_REQUEST_API
+#include <libsoup/soup-request.h>
 #include <libsoup/soup.h>
 class Frame;
 #endif
@@ -114,6 +115,8 @@ namespace WebCore {
             , m_cancelled(false)
             , m_buffer(0)
             , m_total(0)
+            , m_bodySize(0)
+            , m_bodyDataSent(0)
             , m_idleHandler(0)
             , m_gotChunkHandler(0)
 #endif
@@ -132,9 +135,6 @@ namespace WebCore {
             m_user = url.user();
             m_pass = url.pass();
             m_firstRequest.removeCredentials();
-#if USE(SOUP)
-            m_requester = adoptGRef(webkit_soup_requester_new());
-#endif
         }
         
         ~ResourceHandleInternal();
@@ -190,12 +190,13 @@ namespace WebCore {
         GRefPtr<SoupMessage> m_soupMessage;
         ResourceResponse m_response;
         bool m_cancelled;
-        GRefPtr<WebKitSoupRequest> m_soupRequest;
-        GRefPtr<WebKitSoupRequester> m_requester;
+        GRefPtr<SoupRequest> m_soupRequest;
         GRefPtr<GInputStream> m_inputStream;
         GRefPtr<GCancellable> m_cancellable;
         char* m_buffer;
         gsize m_total;
+        unsigned long m_bodySize;
+        unsigned long m_bodyDataSent;
         guint m_idleHandler;
         RefPtr<NetworkingContext> m_context;
         gulong m_gotChunkHandler;