| 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 4431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4442 DocumentState::FromDataSource(frame_->ProvisionalDataSource()); | 4442 DocumentState::FromDataSource(frame_->ProvisionalDataSource()); |
| 4443 int http_status_code = response.HttpStatusCode(); | 4443 int http_status_code = response.HttpStatusCode(); |
| 4444 | 4444 |
| 4445 // Record page load flags. | 4445 // Record page load flags. |
| 4446 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); | 4446 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); |
| 4447 if (extra_data) { | 4447 if (extra_data) { |
| 4448 document_state->set_was_fetched_via_spdy( | 4448 document_state->set_was_fetched_via_spdy( |
| 4449 extra_data->was_fetched_via_spdy()); | 4449 extra_data->was_fetched_via_spdy()); |
| 4450 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated()); | 4450 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated()); |
| 4451 document_state->set_alpn_negotiated_protocol( | 4451 document_state->set_alpn_negotiated_protocol( |
| 4452 extra_data->alpn_negotiated_protocol()); | 4452 response.AlpnNegotiatedProtocol().Utf8()); |
| 4453 document_state->set_was_alternate_protocol_available( | 4453 document_state->set_was_alternate_protocol_available( |
| 4454 extra_data->was_alternate_protocol_available()); | 4454 extra_data->was_alternate_protocol_available()); |
| 4455 document_state->set_connection_info( | 4455 document_state->set_connection_info(response.ConnectionInfo()); |
| 4456 extra_data->connection_info()); | |
| 4457 } | 4456 } |
| 4458 InternalDocumentStateData* internal_data = | 4457 InternalDocumentStateData* internal_data = |
| 4459 InternalDocumentStateData::FromDocumentState(document_state); | 4458 InternalDocumentStateData::FromDocumentState(document_state); |
| 4460 internal_data->set_http_status_code(http_status_code); | 4459 internal_data->set_http_status_code(http_status_code); |
| 4461 } | 4460 } |
| 4462 | 4461 |
| 4463 void RenderFrameImpl::DidLoadResourceFromMemoryCache( | 4462 void RenderFrameImpl::DidLoadResourceFromMemoryCache( |
| 4464 const blink::WebURLRequest& request, | 4463 const blink::WebURLRequest& request, |
| 4465 const blink::WebURLResponse& response) { | 4464 const blink::WebURLResponse& response) { |
| 4466 // The recipients of this message have no use for data: URLs: they don't | 4465 // The recipients of this message have no use for data: URLs: they don't |
| (...skipping 2391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6858 policy(info.default_policy), | 6857 policy(info.default_policy), |
| 6859 replaces_current_history_item(info.replaces_current_history_item), | 6858 replaces_current_history_item(info.replaces_current_history_item), |
| 6860 history_navigation_in_new_child_frame( | 6859 history_navigation_in_new_child_frame( |
| 6861 info.is_history_navigation_in_new_child_frame), | 6860 info.is_history_navigation_in_new_child_frame), |
| 6862 client_redirect(info.is_client_redirect), | 6861 client_redirect(info.is_client_redirect), |
| 6863 cache_disabled(info.is_cache_disabled), | 6862 cache_disabled(info.is_cache_disabled), |
| 6864 form(info.form), | 6863 form(info.form), |
| 6865 source_location(info.source_location) {} | 6864 source_location(info.source_location) {} |
| 6866 | 6865 |
| 6867 } // namespace content | 6866 } // namespace content |
| OLD | NEW |