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 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1330 } | 1330 } |
1331 | 1331 |
1332 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( | 1332 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( |
1333 blink::WebLocalFrame* frame) { | 1333 blink::WebLocalFrame* frame) { |
1334 DCHECK(!frame_ || frame_ == frame); | 1334 DCHECK(!frame_ || frame_ == frame); |
1335 // At this point we should have non-null data source. | 1335 // At this point we should have non-null data source. |
1336 DCHECK(frame->dataSource()); | 1336 DCHECK(frame->dataSource()); |
1337 ServiceWorkerNetworkProvider* provider = | 1337 ServiceWorkerNetworkProvider* provider = |
1338 ServiceWorkerNetworkProvider::FromDocumentState( | 1338 ServiceWorkerNetworkProvider::FromDocumentState( |
1339 DocumentState::FromDataSource(frame->dataSource())); | 1339 DocumentState::FromDataSource(frame->dataSource())); |
1340 int provider_id = provider ? | |
1341 provider->provider_id() : | |
1342 kInvalidServiceWorkerProviderId; | |
1343 return new WebServiceWorkerProviderImpl( | 1340 return new WebServiceWorkerProviderImpl( |
1344 ChildThread::current()->thread_safe_sender(), provider_id); | 1341 ChildThread::current()->thread_safe_sender(), |
| 1342 provider ? provider->context() : NULL); |
1345 } | 1343 } |
1346 | 1344 |
1347 void RenderFrameImpl::didAccessInitialDocument(blink::WebLocalFrame* frame) { | 1345 void RenderFrameImpl::didAccessInitialDocument(blink::WebLocalFrame* frame) { |
1348 DCHECK(!frame_ || frame_ == frame); | 1346 DCHECK(!frame_ || frame_ == frame); |
1349 // Notify the browser process that it is no longer safe to show the pending | 1347 // Notify the browser process that it is no longer safe to show the pending |
1350 // URL of the main frame, since a URL spoof is now possible. | 1348 // URL of the main frame, since a URL spoof is now possible. |
1351 if (!frame->parent() && render_view_->page_id_ == -1) | 1349 if (!frame->parent() && render_view_->page_id_ == -1) |
1352 Send(new FrameHostMsg_DidAccessInitialDocument(routing_id_)); | 1350 Send(new FrameHostMsg_DidAccessInitialDocument(routing_id_)); |
1353 } | 1351 } |
1354 | 1352 |
(...skipping 1882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3237 selection_text_offset_ = offset; | 3235 selection_text_offset_ = offset; |
3238 selection_range_ = range; | 3236 selection_range_ = range; |
3239 // This IPC is dispatched by RenderWidetHost, so use its routing ID. | 3237 // This IPC is dispatched by RenderWidetHost, so use its routing ID. |
3240 Send(new ViewHostMsg_SelectionChanged( | 3238 Send(new ViewHostMsg_SelectionChanged( |
3241 GetRenderWidget()->routing_id(), text, offset, range)); | 3239 GetRenderWidget()->routing_id(), text, offset, range)); |
3242 } | 3240 } |
3243 GetRenderWidget()->UpdateSelectionBounds(); | 3241 GetRenderWidget()->UpdateSelectionBounds(); |
3244 } | 3242 } |
3245 | 3243 |
3246 } // namespace content | 3244 } // namespace content |
OLD | NEW |