| 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 3336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3347 DocumentState* document_state = DocumentState::FromDataSource(ds); | 3347 DocumentState* document_state = DocumentState::FromDataSource(ds); |
| 3348 NavigationState* navigation_state = document_state->navigation_state(); | 3348 NavigationState* navigation_state = document_state->navigation_state(); |
| 3349 InternalDocumentStateData* internal_data = | 3349 InternalDocumentStateData* internal_data = |
| 3350 InternalDocumentStateData::FromDocumentState(document_state); | 3350 InternalDocumentStateData::FromDocumentState(document_state); |
| 3351 | 3351 |
| 3352 FrameHostMsg_DidCommitProvisionalLoad_Params params; | 3352 FrameHostMsg_DidCommitProvisionalLoad_Params params; |
| 3353 params.http_status_code = response.httpStatusCode(); | 3353 params.http_status_code = response.httpStatusCode(); |
| 3354 params.url_is_unreachable = ds->hasUnreachableURL(); | 3354 params.url_is_unreachable = ds->hasUnreachableURL(); |
| 3355 params.is_post = false; | 3355 params.is_post = false; |
| 3356 params.post_id = -1; | 3356 params.post_id = -1; |
| 3357 params.page_id = render_view_->page_id_; | |
| 3358 // We need to track the RenderViewHost routing_id because of downstream | 3357 // We need to track the RenderViewHost routing_id because of downstream |
| 3359 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, | 3358 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, |
| 3360 // ResourceDispatcherHostImpl, MediaStreamUIProxy, | 3359 // ResourceDispatcherHostImpl, MediaStreamUIProxy, |
| 3361 // SpeechRecognitionDispatcherHost and possibly others). They look up the view | 3360 // SpeechRecognitionDispatcherHost and possibly others). They look up the view |
| 3362 // based on the ID stored in the resource requests. Once those dependencies | 3361 // based on the ID stored in the resource requests. Once those dependencies |
| 3363 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the | 3362 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the |
| 3364 // client to be based on the routing_id of the RenderFrameHost. | 3363 // client to be based on the routing_id of the RenderFrameHost. |
| 3365 params.render_view_routing_id = render_view_->routing_id(); | 3364 params.render_view_routing_id = render_view_->routing_id(); |
| 3366 params.socket_address.set_host(response.remoteIPAddress().utf8()); | 3365 params.socket_address.set_host(response.remoteIPAddress().utf8()); |
| 3367 params.socket_address.set_port(response.remotePort()); | 3366 params.socket_address.set_port(response.remotePort()); |
| (...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4115 | 4114 |
| 4116 #if defined(ENABLE_BROWSER_CDMS) | 4115 #if defined(ENABLE_BROWSER_CDMS) |
| 4117 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4116 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4118 if (!cdm_manager_) | 4117 if (!cdm_manager_) |
| 4119 cdm_manager_ = new RendererCdmManager(this); | 4118 cdm_manager_ = new RendererCdmManager(this); |
| 4120 return cdm_manager_; | 4119 return cdm_manager_; |
| 4121 } | 4120 } |
| 4122 #endif // defined(ENABLE_BROWSER_CDMS) | 4121 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4123 | 4122 |
| 4124 } // namespace content | 4123 } // namespace content |
| OLD | NEW |