1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
From d42f4dd5b4ead39771d8822ac4c67a0d48a41040 Mon Sep 17 00:00:00 2001
From: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date: Sun, 25 Oct 2009 18:29:35 -0200
Subject: [PATCH] Use WebKitNetworkResponse
WebKit/gtk/ChangeLog | 26 +++++++++++++
WebKit/gtk/webkit/webkitdownload.cpp | 67 +++++++++++++++++++++++++++++-----
WebKit/gtk/webkit/webkitdownload.h | 3 ++
3 files changed, 86 insertions(+), 10 deletions(-)
2009-10-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Reviewed by NOBODY (OOPS!).
https://bugs.webkit.org/show_bug.cgi?id=30759
[GTK] Should use WebKitNetworkResponse, and expose it
WebKitDownload now uses our WebKitNetworkResponse instead of using
ResourceResponse directly. By exposing the response, like we do
with the request, we give our users the ability to look at the
response headers, status code, and so on, through the SoupMessage
object.
* webkit/webkitdownload.cpp:
(webkit_download_dispose):
(webkit_download_finalize):
(webkit_download_get_property):
(webkit_download_set_property):
(webkit_download_class_init):
(webkit_download_get_network_response):
(webkit_download_set_response):
(webkit_download_get_total_size):
(webkit_download_get_progress):
(webkit_download_received_data):
* webkit/webkitdownload.h:
---
diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp
index 568378c..dd6629b 100644
--- WebKit/gtk/webkit/webkitdownload.cpp
+++ WebKit/gtk/webkit/webkitdownload.cpp
@@ -31,6 +31,7 @@
#include "webkitdownload.h"
#include "webkitenumtypes.h"
#include "webkitmarshal.h"
+#include "webkitnetworkresponse.h"
#include "webkitprivate.h"
#include <glib/gstdio.h>
@@ -74,7 +75,7 @@ struct _WebKitDownloadPrivate {
GFileOutputStream* outputStream;
DownloadClient* downloadClient;
WebKitNetworkRequest* networkRequest;
- ResourceResponse* networkResponse;
+ WebKitNetworkResponse* networkResponse;
RefPtr<ResourceHandle> resourceHandle;
};
@@ -95,7 +96,8 @@ enum {
PROP_PROGRESS,
PROP_STATUS,
PROP_CURRENT_SIZE,
- PROP_TOTAL_SIZE
+ PROP_TOTAL_SIZE,
+ PROP_NETWORK_RESPONSE
};
G_DEFINE_TYPE(WebKitDownload, webkit_download, G_TYPE_OBJECT);
@@ -119,6 +121,11 @@ static void webkit_download_dispose(GObject* object)
priv->networkRequest = NULL;
}
+ if (priv->networkResponse) {
+ g_object_unref(priv->networkResponse);
+ priv->networkResponse = NULL;
+ }
+
G_OBJECT_CLASS(webkit_download_parent_class)->dispose(object);
}
@@ -138,7 +145,6 @@ static void webkit_download_finalize(GObject* object)
}
delete priv->downloadClient;
- delete priv->networkResponse;
// The download object may never have _start called on it, so we
// need to make sure timer is non-NULL.
@@ -159,6 +165,9 @@ static void webkit_download_get_property(GObject* object, guint prop_id, GValue*
case PROP_NETWORK_REQUEST:
g_value_set_object(value, webkit_download_get_network_request(download));
break;
+ case PROP_NETWORK_RESPONSE:
+ g_value_set_object(value, webkit_download_get_network_response(download));
+ break;
case PROP_DESTINATION_URI:
g_value_set_string(value, webkit_download_get_destination_uri(download));
break;
@@ -191,6 +200,9 @@ static void webkit_download_set_property(GObject* object, guint prop_id, const G
case PROP_NETWORK_REQUEST:
priv->networkRequest = WEBKIT_NETWORK_REQUEST(g_value_dup_object(value));
break;
+ case PROP_NETWORK_RESPONSE:
+ priv->networkResponse = WEBKIT_NETWORK_RESPONSE(g_value_dup_object(value));
+ break;
case PROP_DESTINATION_URI:
webkit_download_set_destination_uri(download, g_value_get_string(value));
break;
@@ -252,6 +264,21 @@ static void webkit_download_class_init(WebKitDownloadClass* downloadClass)
(GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
/**
+ * WebKitDownload:network-response
+ *
+ * The #WebKitNetworkResponse instance associated with the download.
+ *
+ * Since: 1.1.16
+ */
+ g_object_class_install_property(objectClass,
+ PROP_NETWORK_RESPONSE,
+ g_param_spec_object("network-response",
+ _("Network Response"),
+ _("The network response for the URI that should be downloaded"),
+ WEBKIT_TYPE_NETWORK_RESPONSE,
+ (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
+
+ /**
* WebKitDownload:destination-uri
*
* The URI of the save location for this download.
@@ -530,11 +557,29 @@ WebKitNetworkRequest* webkit_download_get_network_request(WebKitDownload* downlo
return priv->networkRequest;
}
+/**
+ * webkit_download_get_network_response:
+ * @download: the #WebKitDownload
+ *
+ * Retrieves the #WebKitNetworkResponse object that backs the download
+ * process.
+ *
+ * Returns: the #WebKitNetworkResponse instance
+ *
+ * Since: 1.1.16
+ */
+WebKitNetworkResponse* webkit_download_get_network_response(WebKitDownload* download)
+{
+ g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), NULL);
+
+ WebKitDownloadPrivate* priv = download->priv;
+ return priv->networkResponse;
+}
+
static void webkit_download_set_response(WebKitDownload* download, const ResourceResponse& response)
{
- // FIXME Use WebKitNetworkResponse when it's merged.
WebKitDownloadPrivate* priv = download->priv;
- priv->networkResponse = new ResourceResponse(response);
+ priv->networkResponse = webkit_network_response_new_with_core_response(response);
if (!response.isNull() && !response.suggestedFilename().isEmpty())
webkit_download_set_suggested_filename(download, response.suggestedFilename().utf8().data());
@@ -704,10 +749,12 @@ guint64 webkit_download_get_total_size(WebKitDownload* download)
g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), 0);
WebKitDownloadPrivate* priv = download->priv;
- if (!priv->networkResponse)
+ SoupMessage* message = priv->networkResponse ? webkit_network_response_get_message(priv->networkResponse) : NULL;
+
+ if (!message)
return 0;
- return MAX(priv->currentSize, priv->networkResponse->expectedContentLength());
+ return MAX(priv->currentSize, soup_message_headers_get_content_length(message->response_headers));
}
/**
@@ -744,9 +791,9 @@ gdouble webkit_download_get_progress(WebKitDownload* download)
WebKitDownloadPrivate* priv = download->priv;
if (!priv->networkResponse)
- return 0;
+ return 0.0;
- gdouble total_size = (gdouble)priv->networkResponse->expectedContentLength();
+ gdouble total_size = static_cast<gdouble>(webkit_download_get_total_size(download));
if (total_size == 0)
return 1.0;
@@ -803,7 +850,7 @@ static void webkit_download_received_data(WebKitDownload* download, const gchar*
g_object_notify(G_OBJECT(download), "current-size");
ASSERT(priv->networkResponse);
- if (priv->currentSize > priv->networkResponse->expectedContentLength())
+ if (priv->currentSize > webkit_download_get_total_size(download))
g_object_notify(G_OBJECT(download), "total-size");
gdouble lastProgress = webkit_download_get_progress(download);
diff --git a/WebKit/gtk/webkit/webkitdownload.h b/WebKit/gtk/webkit/webkitdownload.h
index 6e7f38b..a732a57 100644
--- WebKit/gtk/webkit/webkitdownload.h
+++ WebKit/gtk/webkit/webkitdownload.h
@@ -84,6 +84,9 @@ webkit_download_get_uri (WebKitDownload *download);
WEBKIT_API WebKitNetworkRequest*
webkit_download_get_network_request (WebKitDownload *download);
+WEBKIT_API WebKitNetworkResponse*
+webkit_download_get_network_response (WebKitDownload *download);
+
WEBKIT_API const gchar*
webkit_download_get_suggested_filename (WebKitDownload *download);
--
1.6.5
|
