| 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 4474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4485 DocumentState::FromDataSource(frame_->provisionalDataSource()); | 4485 DocumentState::FromDataSource(frame_->provisionalDataSource()); |
| 4486 int http_status_code = response.httpStatusCode(); | 4486 int http_status_code = response.httpStatusCode(); |
| 4487 | 4487 |
| 4488 // Record page load flags. | 4488 // Record page load flags. |
| 4489 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); | 4489 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); |
| 4490 if (extra_data) { | 4490 if (extra_data) { |
| 4491 document_state->set_was_fetched_via_spdy( | 4491 document_state->set_was_fetched_via_spdy( |
| 4492 extra_data->was_fetched_via_spdy()); | 4492 extra_data->was_fetched_via_spdy()); |
| 4493 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated()); | 4493 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated()); |
| 4494 document_state->set_alpn_negotiated_protocol( | 4494 document_state->set_alpn_negotiated_protocol( |
| 4495 extra_data->alpn_negotiated_protocol()); | 4495 response.alpnNegotiatedProtocol().utf8()); |
| 4496 document_state->set_was_alternate_protocol_available( | 4496 document_state->set_was_alternate_protocol_available( |
| 4497 extra_data->was_alternate_protocol_available()); | 4497 extra_data->was_alternate_protocol_available()); |
| 4498 document_state->set_connection_info( | 4498 document_state->set_connection_info(response.connectionInfo().utf8()); |
| 4499 extra_data->connection_info()); | |
| 4500 } | 4499 } |
| 4501 InternalDocumentStateData* internal_data = | 4500 InternalDocumentStateData* internal_data = |
| 4502 InternalDocumentStateData::FromDocumentState(document_state); | 4501 InternalDocumentStateData::FromDocumentState(document_state); |
| 4503 internal_data->set_http_status_code(http_status_code); | 4502 internal_data->set_http_status_code(http_status_code); |
| 4504 } | 4503 } |
| 4505 | 4504 |
| 4506 void RenderFrameImpl::didLoadResourceFromMemoryCache( | 4505 void RenderFrameImpl::didLoadResourceFromMemoryCache( |
| 4507 const blink::WebURLRequest& request, | 4506 const blink::WebURLRequest& request, |
| 4508 const blink::WebURLResponse& response) { | 4507 const blink::WebURLResponse& response) { |
| 4509 // The recipients of this message have no use for data: URLs: they don't | 4508 // The recipients of this message have no use for data: URLs: they don't |
| (...skipping 2459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6969 policy(info.defaultPolicy), | 6968 policy(info.defaultPolicy), |
| 6970 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6969 replaces_current_history_item(info.replacesCurrentHistoryItem), |
| 6971 history_navigation_in_new_child_frame( | 6970 history_navigation_in_new_child_frame( |
| 6972 info.isHistoryNavigationInNewChildFrame), | 6971 info.isHistoryNavigationInNewChildFrame), |
| 6973 client_redirect(info.isClientRedirect), | 6972 client_redirect(info.isClientRedirect), |
| 6974 cache_disabled(info.isCacheDisabled), | 6973 cache_disabled(info.isCacheDisabled), |
| 6975 form(info.form), | 6974 form(info.form), |
| 6976 source_location(info.sourceLocation) {} | 6975 source_location(info.sourceLocation) {} |
| 6977 | 6976 |
| 6978 } // namespace content | 6977 } // namespace content |
| OLD | NEW |