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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 182863004: Wire provider_id into scriptable API provider to start listening events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit fix Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/service_worker/service_worker_messages.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6200b3480aa2e5a38f255e3c412fc817cb30a73f..3a30087e3dbed77be8a8dcb3ab2b4bc85eff94b8 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1039,10 +1039,16 @@ blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebFrame* frame) {
blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider(
blink::WebFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
- // TODO(kinuko): Get the provider_id for the frame (via dataSource) and
- // pass it to the WebServiceWorkerProviderImpl constructor.
+ // At this point we should have non-null data source.
+ DCHECK(frame->dataSource());
+ ServiceWorkerNetworkProvider* provider =
+ ServiceWorkerNetworkProvider::FromDocumentState(
+ DocumentState::FromDataSource(frame->dataSource()));
+ int provider_id = provider ?
+ provider->provider_id() :
+ kInvalidServiceWorkerProviderId;
return new WebServiceWorkerProviderImpl(
- ChildThread::current()->thread_safe_sender());
+ ChildThread::current()->thread_safe_sender(), provider_id);
}
void RenderFrameImpl::didAccessInitialDocument(blink::WebFrame* frame) {
« no previous file with comments | « content/common/service_worker/service_worker_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698