Chromium Code Reviews| 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 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2947 DocumentState* document_state = DocumentState::FromDataSource(ds); | 2947 DocumentState* document_state = DocumentState::FromDataSource(ds); |
| 2948 NavigationState* navigation_state = document_state->navigation_state(); | 2948 NavigationState* navigation_state = document_state->navigation_state(); |
| 2949 InternalDocumentStateData* internal_data = | 2949 InternalDocumentStateData* internal_data = |
| 2950 InternalDocumentStateData::FromDocumentState(document_state); | 2950 InternalDocumentStateData::FromDocumentState(document_state); |
| 2951 | 2951 |
| 2952 FrameHostMsg_DidCommitProvisionalLoad_Params params; | 2952 FrameHostMsg_DidCommitProvisionalLoad_Params params; |
| 2953 params.http_status_code = response.httpStatusCode(); | 2953 params.http_status_code = response.httpStatusCode(); |
| 2954 params.is_post = false; | 2954 params.is_post = false; |
| 2955 params.post_id = -1; | 2955 params.post_id = -1; |
| 2956 params.page_id = render_view_->page_id_; | 2956 params.page_id = render_view_->page_id_; |
| 2957 // We need to track the RenderViewHost routing_id because of downstream | |
| 2958 // dependencies on being able to look up the view based on the ID stored | |
| 2959 // in the resource requests (without it a lot of things break). Once | |
| 2960 // those dependencies are unwound or moved to RenderViewHost we can move | |
|
nasko
2014/07/21 13:11:23
Same as other comment.
| |
| 2961 // the client to be based on the routing_id of the RenderViewHost | |
| 2962 // instead (see crbug.com/392171). | |
| 2963 params.render_view_routing_id = render_view_->routing_id(); | |
| 2957 params.socket_address.set_host(response.remoteIPAddress().utf8()); | 2964 params.socket_address.set_host(response.remoteIPAddress().utf8()); |
| 2958 params.socket_address.set_port(response.remotePort()); | 2965 params.socket_address.set_port(response.remotePort()); |
| 2959 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); | 2966 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); |
| 2960 if (extra_data) | 2967 if (extra_data) |
| 2961 params.was_fetched_via_proxy = extra_data->was_fetched_via_proxy(); | 2968 params.was_fetched_via_proxy = extra_data->was_fetched_via_proxy(); |
| 2962 params.was_within_same_page = navigation_state->was_within_same_page(); | 2969 params.was_within_same_page = navigation_state->was_within_same_page(); |
| 2963 params.security_info = response.securityInfo(); | 2970 params.security_info = response.securityInfo(); |
| 2964 | 2971 |
| 2965 // Set the URL to be displayed in the browser UI to the user. | 2972 // Set the URL to be displayed in the browser UI to the user. |
| 2966 params.url = GetLoadingUrl(); | 2973 params.url = GetLoadingUrl(); |
| (...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3571 | 3578 |
| 3572 #if defined(ENABLE_BROWSER_CDMS) | 3579 #if defined(ENABLE_BROWSER_CDMS) |
| 3573 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3580 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3574 if (!cdm_manager_) | 3581 if (!cdm_manager_) |
| 3575 cdm_manager_ = new RendererCdmManager(this); | 3582 cdm_manager_ = new RendererCdmManager(this); |
| 3576 return cdm_manager_; | 3583 return cdm_manager_; |
| 3577 } | 3584 } |
| 3578 #endif // defined(ENABLE_BROWSER_CDMS) | 3585 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3579 | 3586 |
| 3580 } // namespace content | 3587 } // namespace content |
| OLD | NEW |