Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Unified Diff: content/renderer/render_view_impl.cc

Issue 12381054: Add a number of connection type fields to ExtraData instead of using the fields on WebURLResponse. … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Chrome style Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/glue/weburlloader_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index dcd48e6724904e0dfb39c14c93b80b4c39322e0f..8a25ef39511d996920e197a774bab01752b5d8a9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1609,7 +1609,10 @@ void RenderViewImpl::UpdateURL(WebFrame* frame) {
params.frame_id = frame->identifier();
params.socket_address.set_host(response.remoteIPAddress().utf8());
params.socket_address.set_port(response.remotePort());
- params.was_fetched_via_proxy = response.wasFetchedViaProxy();
+ WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response);
+ if (extra_data) {
+ params.was_fetched_via_proxy = extra_data->was_fetched_via_proxy();
+ }
params.was_within_same_page = navigation_state->was_within_same_page();
if (!document_state->security_info().empty()) {
// SSL state specified in the request takes precedence over the one in the
@@ -3881,16 +3884,19 @@ void RenderViewImpl::didReceiveResponse(
int http_status_code = response.httpStatusCode();
// Record page load flags.
- document_state->set_was_fetched_via_spdy(response.wasFetchedViaSPDY());
- document_state->set_was_npn_negotiated(response.wasNpnNegotiated());
WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response);
if (extra_data) {
+ document_state->set_was_fetched_via_spdy(
+ extra_data->was_fetched_via_spdy());
+ document_state->set_was_npn_negotiated(
+ extra_data->was_npn_negotiated());
document_state->set_npn_negotiated_protocol(
extra_data->npn_negotiated_protocol());
+ document_state->set_was_alternate_protocol_available(
+ extra_data->was_alternate_protocol_available());
+ document_state->set_was_fetched_via_proxy(
+ extra_data->was_fetched_via_proxy());
}
- document_state->set_was_alternate_protocol_available(
- response.wasAlternateProtocolAvailable());
- document_state->set_was_fetched_via_proxy(response.wasFetchedViaProxy());
document_state->set_http_status_code(http_status_code);
// Whether or not the http status code actually corresponds to an error is
// only checked when the page is done loading, if |use_error_page| is
« no previous file with comments | « no previous file | webkit/glue/weburlloader_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698