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

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

Issue 261533003: Populate .current when navigator.serviceWorker is accessed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
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 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1316 } 1316 }
1317 1317
1318 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( 1318 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider(
1319 blink::WebLocalFrame* frame) { 1319 blink::WebLocalFrame* frame) {
1320 DCHECK(!frame_ || frame_ == frame); 1320 DCHECK(!frame_ || frame_ == frame);
1321 // At this point we should have non-null data source. 1321 // At this point we should have non-null data source.
1322 DCHECK(frame->dataSource()); 1322 DCHECK(frame->dataSource());
1323 ServiceWorkerNetworkProvider* provider = 1323 ServiceWorkerNetworkProvider* provider =
1324 ServiceWorkerNetworkProvider::FromDocumentState( 1324 ServiceWorkerNetworkProvider::FromDocumentState(
1325 DocumentState::FromDataSource(frame->dataSource())); 1325 DocumentState::FromDataSource(frame->dataSource()));
1326 int provider_id = provider ?
1327 provider->provider_id() :
1328 kInvalidServiceWorkerProviderId;
1329 return new WebServiceWorkerProviderImpl( 1326 return new WebServiceWorkerProviderImpl(
1330 ChildThread::current()->thread_safe_sender(), provider_id); 1327 ChildThread::current()->thread_safe_sender(),
1328 provider ? provider->context() : NULL);
michaeln 2014/05/01 01:25:18 ah.. i see the main docs instance is cons'd up her
kinuko 2014/05/02 10:00:56 Yup.
1331 } 1329 }
1332 1330
1333 void RenderFrameImpl::didAccessInitialDocument(blink::WebLocalFrame* frame) { 1331 void RenderFrameImpl::didAccessInitialDocument(blink::WebLocalFrame* frame) {
1334 DCHECK(!frame_ || frame_ == frame); 1332 DCHECK(!frame_ || frame_ == frame);
1335 // Notify the browser process that it is no longer safe to show the pending 1333 // Notify the browser process that it is no longer safe to show the pending
1336 // URL of the main frame, since a URL spoof is now possible. 1334 // URL of the main frame, since a URL spoof is now possible.
1337 if (!frame->parent() && render_view_->page_id_ == -1) 1335 if (!frame->parent() && render_view_->page_id_ == -1)
1338 Send(new FrameHostMsg_DidAccessInitialDocument(routing_id_)); 1336 Send(new FrameHostMsg_DidAccessInitialDocument(routing_id_));
1339 } 1337 }
1340 1338
(...skipping 1840 matching lines...) Expand 10 before | Expand all | Expand 10 after
3181 selection_text_offset_ = offset; 3179 selection_text_offset_ = offset;
3182 selection_range_ = range; 3180 selection_range_ = range;
3183 // This IPC is dispatched by RenderWidetHost, so use its routing ID. 3181 // This IPC is dispatched by RenderWidetHost, so use its routing ID.
3184 Send(new ViewHostMsg_SelectionChanged( 3182 Send(new ViewHostMsg_SelectionChanged(
3185 GetRenderWidget()->routing_id(), text, offset, range)); 3183 GetRenderWidget()->routing_id(), text, offset, range));
3186 } 3184 }
3187 GetRenderWidget()->UpdateSelectionBounds(); 3185 GetRenderWidget()->UpdateSelectionBounds();
3188 } 3186 }
3189 3187
3190 } // namespace content 3188 } // namespace content
OLDNEW
« content/child/service_worker/web_service_worker_provider_impl.h ('K') | « content/content_child.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698