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 4151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4162 // TODO(clamy): Make sure that navigation requests are not modified somewhere | 4162 // TODO(clamy): Make sure that navigation requests are not modified somewhere |
| 4163 // else in blink. | 4163 // else in blink. |
| 4164 willSendRequest(frame_, 0, *request, blink::WebURLResponse()); | 4164 willSendRequest(frame_, 0, *request, blink::WebURLResponse()); |
| 4165 | 4165 |
| 4166 // TODO(clamy): Same-document navigations should not be sent back to the | 4166 // TODO(clamy): Same-document navigations should not be sent back to the |
| 4167 // browser. | 4167 // browser. |
| 4168 // TODO(clamy): Data urls should not be sent back to the browser either. | 4168 // TODO(clamy): Data urls should not be sent back to the browser either. |
| 4169 Send(new FrameHostMsg_BeginNavigation(routing_id_, | 4169 Send(new FrameHostMsg_BeginNavigation(routing_id_, |
| 4170 MakeBeginNavigationParams(request), | 4170 MakeBeginNavigationParams(request), |
| 4171 MakeCommonNavigationParams(request))); | 4171 MakeCommonNavigationParams(request))); |
| 4172 Send(new FrameHostMsg_DidStartLoading(routing_id_, true)); | |
|
nasko
2014/11/24 23:15:00
Shouldn't this be fired off before the BeginNaviga
clamy
2014/11/26 12:47:43
Done.
| |
| 4172 } | 4173 } |
| 4173 | 4174 |
| 4174 GURL RenderFrameImpl::GetLoadingUrl() const { | 4175 GURL RenderFrameImpl::GetLoadingUrl() const { |
| 4175 WebDataSource* ds = frame_->dataSource(); | 4176 WebDataSource* ds = frame_->dataSource(); |
| 4176 if (ds->hasUnreachableURL()) | 4177 if (ds->hasUnreachableURL()) |
| 4177 return ds->unreachableURL(); | 4178 return ds->unreachableURL(); |
| 4178 | 4179 |
| 4179 const WebURLRequest& request = ds->request(); | 4180 const WebURLRequest& request = ds->request(); |
| 4180 return request.url(); | 4181 return request.url(); |
| 4181 } | 4182 } |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4233 | 4234 |
| 4234 #if defined(ENABLE_BROWSER_CDMS) | 4235 #if defined(ENABLE_BROWSER_CDMS) |
| 4235 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4236 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4236 if (!cdm_manager_) | 4237 if (!cdm_manager_) |
| 4237 cdm_manager_ = new RendererCdmManager(this); | 4238 cdm_manager_ = new RendererCdmManager(this); |
| 4238 return cdm_manager_; | 4239 return cdm_manager_; |
| 4239 } | 4240 } |
| 4240 #endif // defined(ENABLE_BROWSER_CDMS) | 4241 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4241 | 4242 |
| 4242 } // namespace content | 4243 } // namespace content |
| OLD | NEW |