Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1149383004: [3/5 chromium] Shows the clients which are controlled by ServiceWorker in DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2442 matching lines...) Expand 10 before | Expand all | Expand 10 after
2453 NOTREACHED(); 2453 NOTREACHED();
2454 } 2454 }
2455 } 2455 }
2456 2456
2457 // Create the serviceworker's per-document network observing object if it 2457 // Create the serviceworker's per-document network observing object if it
2458 // does not exist (When navigation happens within a page, the provider already 2458 // does not exist (When navigation happens within a page, the provider already
2459 // exists). 2459 // exists).
2460 if (!ServiceWorkerNetworkProvider::FromDocumentState( 2460 if (!ServiceWorkerNetworkProvider::FromDocumentState(
2461 DocumentState::FromDataSource(datasource))) { 2461 DocumentState::FromDataSource(datasource))) {
2462 scoped_ptr<ServiceWorkerNetworkProvider> network_provider( 2462 scoped_ptr<ServiceWorkerNetworkProvider> network_provider(
2463 new ServiceWorkerNetworkProvider(routing_id_, 2463 new ServiceWorkerNetworkProvider(routing_id_, MSG_ROUTING_NONE));
2464 SERVICE_WORKER_PROVIDER_FOR_WINDOW));
2465 ServiceWorkerNetworkProvider::AttachToDocumentState( 2464 ServiceWorkerNetworkProvider::AttachToDocumentState(
2466 DocumentState::FromDataSource(datasource), 2465 DocumentState::FromDataSource(datasource),
2467 network_provider.Pass()); 2466 network_provider.Pass());
2468 } 2467 }
2469 } 2468 }
2470 2469
2471 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, 2470 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
2472 double triggering_event_time) { 2471 double triggering_event_time) {
2473 DCHECK(!frame_ || frame_ == frame); 2472 DCHECK(!frame_ || frame_ == frame);
2474 WebDataSource* ds = frame->provisionalDataSource(); 2473 WebDataSource* ds = frame->provisionalDataSource();
(...skipping 2448 matching lines...) Expand 10 before | Expand all | Expand 10 after
4923 #elif defined(ENABLE_BROWSER_CDMS) 4922 #elif defined(ENABLE_BROWSER_CDMS)
4924 cdm_manager_, 4923 cdm_manager_,
4925 #endif 4924 #endif
4926 this); 4925 this);
4927 } 4926 }
4928 4927
4929 return cdm_factory_; 4928 return cdm_factory_;
4930 } 4929 }
4931 4930
4932 } // namespace content 4931 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698