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