| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 4414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4425 DocumentState::FromDataSource(frame_->ProvisionalDataSource()); | 4425 DocumentState::FromDataSource(frame_->ProvisionalDataSource()); |
| 4426 int http_status_code = response.HttpStatusCode(); | 4426 int http_status_code = response.HttpStatusCode(); |
| 4427 | 4427 |
| 4428 // Record page load flags. | 4428 // Record page load flags. |
| 4429 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); | 4429 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); |
| 4430 if (extra_data) { | 4430 if (extra_data) { |
| 4431 document_state->set_was_fetched_via_spdy( | 4431 document_state->set_was_fetched_via_spdy( |
| 4432 extra_data->was_fetched_via_spdy()); | 4432 extra_data->was_fetched_via_spdy()); |
| 4433 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated()); | 4433 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated()); |
| 4434 document_state->set_alpn_negotiated_protocol( | 4434 document_state->set_alpn_negotiated_protocol( |
| 4435 extra_data->alpn_negotiated_protocol()); | 4435 response.AlpnNegotiatedProtocol().Utf8()); |
| 4436 document_state->set_was_alternate_protocol_available( | 4436 document_state->set_was_alternate_protocol_available( |
| 4437 extra_data->was_alternate_protocol_available()); | 4437 extra_data->was_alternate_protocol_available()); |
| 4438 document_state->set_connection_info( | 4438 document_state->set_connection_info(response.ConnectionInfo()); |
| 4439 extra_data->connection_info()); | |
| 4440 } | 4439 } |
| 4441 InternalDocumentStateData* internal_data = | 4440 InternalDocumentStateData* internal_data = |
| 4442 InternalDocumentStateData::FromDocumentState(document_state); | 4441 InternalDocumentStateData::FromDocumentState(document_state); |
| 4443 internal_data->set_http_status_code(http_status_code); | 4442 internal_data->set_http_status_code(http_status_code); |
| 4444 } | 4443 } |
| 4445 | 4444 |
| 4446 void RenderFrameImpl::DidLoadResourceFromMemoryCache( | 4445 void RenderFrameImpl::DidLoadResourceFromMemoryCache( |
| 4447 const blink::WebURLRequest& request, | 4446 const blink::WebURLRequest& request, |
| 4448 const blink::WebURLResponse& response) { | 4447 const blink::WebURLResponse& response) { |
| 4449 // The recipients of this message have no use for data: URLs: they don't | 4448 // The recipients of this message have no use for data: URLs: they don't |
| (...skipping 2423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6873 replaces_current_history_item(info.replaces_current_history_item), | 6872 replaces_current_history_item(info.replaces_current_history_item), |
| 6874 history_navigation_in_new_child_frame( | 6873 history_navigation_in_new_child_frame( |
| 6875 info.is_history_navigation_in_new_child_frame), | 6874 info.is_history_navigation_in_new_child_frame), |
| 6876 client_redirect(info.is_client_redirect), | 6875 client_redirect(info.is_client_redirect), |
| 6877 triggering_event_info(info.triggering_event_info), | 6876 triggering_event_info(info.triggering_event_info), |
| 6878 cache_disabled(info.is_cache_disabled), | 6877 cache_disabled(info.is_cache_disabled), |
| 6879 form(info.form), | 6878 form(info.form), |
| 6880 source_location(info.source_location) {} | 6879 source_location(info.source_location) {} |
| 6881 | 6880 |
| 6882 } // namespace content | 6881 } // namespace content |
| OLD | NEW |