| 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 3273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3284 const WebURLRequest& request = ds->request(); | 3284 const WebURLRequest& request = ds->request(); |
| 3285 const WebURLResponse& response = ds->response(); | 3285 const WebURLResponse& response = ds->response(); |
| 3286 | 3286 |
| 3287 DocumentState* document_state = DocumentState::FromDataSource(ds); | 3287 DocumentState* document_state = DocumentState::FromDataSource(ds); |
| 3288 NavigationState* navigation_state = document_state->navigation_state(); | 3288 NavigationState* navigation_state = document_state->navigation_state(); |
| 3289 InternalDocumentStateData* internal_data = | 3289 InternalDocumentStateData* internal_data = |
| 3290 InternalDocumentStateData::FromDocumentState(document_state); | 3290 InternalDocumentStateData::FromDocumentState(document_state); |
| 3291 | 3291 |
| 3292 FrameHostMsg_DidCommitProvisionalLoad_Params params; | 3292 FrameHostMsg_DidCommitProvisionalLoad_Params params; |
| 3293 params.http_status_code = response.httpStatusCode(); | 3293 params.http_status_code = response.httpStatusCode(); |
| 3294 params.url_is_unreachable = ds->hasUnreachableURL(); |
| 3294 params.is_post = false; | 3295 params.is_post = false; |
| 3295 params.post_id = -1; | 3296 params.post_id = -1; |
| 3296 params.page_id = render_view_->page_id_; | 3297 params.page_id = render_view_->page_id_; |
| 3297 // We need to track the RenderViewHost routing_id because of downstream | 3298 // We need to track the RenderViewHost routing_id because of downstream |
| 3298 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, | 3299 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, |
| 3299 // ResourceDispatcherHostImpl, MediaStreamUIProxy, | 3300 // ResourceDispatcherHostImpl, MediaStreamUIProxy, |
| 3300 // SpeechRecognitionDispatcherHost and possibly others). They look up the view | 3301 // SpeechRecognitionDispatcherHost and possibly others). They look up the view |
| 3301 // based on the ID stored in the resource requests. Once those dependencies | 3302 // based on the ID stored in the resource requests. Once those dependencies |
| 3302 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the | 3303 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the |
| 3303 // client to be based on the routing_id of the RenderFrameHost. | 3304 // client to be based on the routing_id of the RenderFrameHost. |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3923 | 3924 |
| 3924 #if defined(ENABLE_BROWSER_CDMS) | 3925 #if defined(ENABLE_BROWSER_CDMS) |
| 3925 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3926 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3926 if (!cdm_manager_) | 3927 if (!cdm_manager_) |
| 3927 cdm_manager_ = new RendererCdmManager(this); | 3928 cdm_manager_ = new RendererCdmManager(this); |
| 3928 return cdm_manager_; | 3929 return cdm_manager_; |
| 3929 } | 3930 } |
| 3930 #endif // defined(ENABLE_BROWSER_CDMS) | 3931 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3931 | 3932 |
| 3932 } // namespace content | 3933 } // namespace content |
| OLD | NEW |