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 2394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2405 default: | 2405 default: |
2406 NOTREACHED(); | 2406 NOTREACHED(); |
2407 } | 2407 } |
2408 } | 2408 } |
2409 | 2409 |
2410 // Create the serviceworker's per-document network observing object if it | 2410 // Create the serviceworker's per-document network observing object if it |
2411 // does not exist (When navigation happens within a page, the provider already | 2411 // does not exist (When navigation happens within a page, the provider already |
2412 // exists). | 2412 // exists). |
2413 if (!ServiceWorkerNetworkProvider::FromDocumentState( | 2413 if (!ServiceWorkerNetworkProvider::FromDocumentState( |
2414 DocumentState::FromDataSource(datasource))) { | 2414 DocumentState::FromDataSource(datasource))) { |
2415 scoped_ptr<ServiceWorkerNetworkProvider> | 2415 scoped_ptr<ServiceWorkerNetworkProvider> network_provider( |
2416 network_provider(new ServiceWorkerNetworkProvider( | 2416 new ServiceWorkerNetworkProvider(routing_id_, |
2417 routing_id_, SERVICE_WORKER_PROVIDER_FOR_CONTROLLEE)); | 2417 SERVICE_WORKER_PROVIDER_FOR_WINDOW)); |
2418 ServiceWorkerNetworkProvider::AttachToDocumentState( | 2418 ServiceWorkerNetworkProvider::AttachToDocumentState( |
2419 DocumentState::FromDataSource(datasource), | 2419 DocumentState::FromDataSource(datasource), |
2420 network_provider.Pass()); | 2420 network_provider.Pass()); |
2421 } | 2421 } |
2422 } | 2422 } |
2423 | 2423 |
2424 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, | 2424 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, |
2425 bool is_transition_navigation, | 2425 bool is_transition_navigation, |
2426 double triggering_event_time) { | 2426 double triggering_event_time) { |
2427 DCHECK(!frame_ || frame_ == frame); | 2427 DCHECK(!frame_ || frame_ == frame); |
(...skipping 2260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4688 | 4688 |
4689 #if defined(ENABLE_BROWSER_CDMS) | 4689 #if defined(ENABLE_BROWSER_CDMS) |
4690 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4690 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4691 if (!cdm_manager_) | 4691 if (!cdm_manager_) |
4692 cdm_manager_ = new RendererCdmManager(this); | 4692 cdm_manager_ = new RendererCdmManager(this); |
4693 return cdm_manager_; | 4693 return cdm_manager_; |
4694 } | 4694 } |
4695 #endif // defined(ENABLE_BROWSER_CDMS) | 4695 #endif // defined(ENABLE_BROWSER_CDMS) |
4696 | 4696 |
4697 } // namespace content | 4697 } // namespace content |
OLD | NEW |