| 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 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1357 DocumentState::FromDataSource(frame->dataSource())); | 1357 DocumentState::FromDataSource(frame->dataSource())); |
| 1358 int provider_id = provider ? | 1358 int provider_id = provider ? |
| 1359 provider->provider_id() : | 1359 provider->provider_id() : |
| 1360 kInvalidServiceWorkerProviderId; | 1360 kInvalidServiceWorkerProviderId; |
| 1361 return new WebServiceWorkerProviderImpl( | 1361 return new WebServiceWorkerProviderImpl( |
| 1362 ChildThread::current()->thread_safe_sender(), provider_id); | 1362 ChildThread::current()->thread_safe_sender(), provider_id); |
| 1363 } | 1363 } |
| 1364 | 1364 |
| 1365 void RenderFrameImpl::didAccessInitialDocument(blink::WebLocalFrame* frame) { | 1365 void RenderFrameImpl::didAccessInitialDocument(blink::WebLocalFrame* frame) { |
| 1366 DCHECK(!frame_ || frame_ == frame); | 1366 DCHECK(!frame_ || frame_ == frame); |
| 1367 render_view_->didAccessInitialDocument(frame); | 1367 // Notify the browser process that it is no longer safe to show the pending |
| 1368 // URL of the main frame, since a URL spoof is now possible. |
| 1369 if (!frame->parent() && render_view_->page_id_ == -1) |
| 1370 Send(new FrameHostMsg_DidAccessInitialDocument(routing_id_)); |
| 1368 } | 1371 } |
| 1369 | 1372 |
| 1370 blink::WebFrame* RenderFrameImpl::createChildFrame( | 1373 blink::WebFrame* RenderFrameImpl::createChildFrame( |
| 1371 blink::WebLocalFrame* parent, | 1374 blink::WebLocalFrame* parent, |
| 1372 const blink::WebString& name) { | 1375 const blink::WebString& name) { |
| 1373 // Synchronously notify the browser of a child frame creation to get the | 1376 // Synchronously notify the browser of a child frame creation to get the |
| 1374 // routing_id for the RenderFrame. | 1377 // routing_id for the RenderFrame. |
| 1375 int child_routing_id = MSG_ROUTING_NONE; | 1378 int child_routing_id = MSG_ROUTING_NONE; |
| 1376 Send(new FrameHostMsg_CreateChildFrame(routing_id_, | 1379 Send(new FrameHostMsg_CreateChildFrame(routing_id_, |
| 1377 base::UTF16ToUTF8(name), | 1380 base::UTF16ToUTF8(name), |
| (...skipping 1820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3198 selection_text_offset_ = offset; | 3201 selection_text_offset_ = offset; |
| 3199 selection_range_ = range; | 3202 selection_range_ = range; |
| 3200 // This IPC is dispatched by RenderWidetHost, so use its routing ID. | 3203 // This IPC is dispatched by RenderWidetHost, so use its routing ID. |
| 3201 Send(new ViewHostMsg_SelectionChanged( | 3204 Send(new ViewHostMsg_SelectionChanged( |
| 3202 GetRenderWidget()->routing_id(), text, offset, range)); | 3205 GetRenderWidget()->routing_id(), text, offset, range)); |
| 3203 } | 3206 } |
| 3204 GetRenderWidget()->UpdateSelectionBounds(); | 3207 GetRenderWidget()->UpdateSelectionBounds(); |
| 3205 } | 3208 } |
| 3206 | 3209 |
| 3207 } // namespace content | 3210 } // namespace content |
| OLD | NEW |