| 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 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1208 #endif | 1208 #endif |
| 1209 #else | 1209 #else |
| 1210 return NULL; | 1210 return NULL; |
| 1211 #endif | 1211 #endif |
| 1212 } | 1212 } |
| 1213 | 1213 |
| 1214 void RenderFrameImpl::LoadURLExternally(blink::WebLocalFrame* frame, | 1214 void RenderFrameImpl::LoadURLExternally(blink::WebLocalFrame* frame, |
| 1215 const blink::WebURLRequest& request, | 1215 const blink::WebURLRequest& request, |
| 1216 blink::WebNavigationPolicy policy) { | 1216 blink::WebNavigationPolicy policy) { |
| 1217 DCHECK(!frame_ || frame_ == frame); | 1217 DCHECK(!frame_ || frame_ == frame); |
| 1218 loadURLExternally(frame, request, policy); | 1218 loadURLExternally(frame, request, policy, WebString()); |
| 1219 } | 1219 } |
| 1220 | 1220 |
| 1221 void RenderFrameImpl::ExecuteJavaScript(const base::string16& javascript) { | 1221 void RenderFrameImpl::ExecuteJavaScript(const base::string16& javascript) { |
| 1222 OnJavaScriptExecuteRequest(javascript, 0, false); | 1222 OnJavaScriptExecuteRequest(javascript, 0, false); |
| 1223 } | 1223 } |
| 1224 | 1224 |
| 1225 void RenderFrameImpl::OnChildFrameProcessGone() { | 1225 void RenderFrameImpl::OnChildFrameProcessGone() { |
| 1226 if (compositing_helper_) | 1226 if (compositing_helper_) |
| 1227 compositing_helper_->ChildFrameGone(); | 1227 compositing_helper_->ChildFrameGone(); |
| 1228 } | 1228 } |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1503 static_cast<int32>(log_severity))); | 1503 static_cast<int32>(log_severity))); |
| 1504 } | 1504 } |
| 1505 | 1505 |
| 1506 Send(new FrameHostMsg_AddMessageToConsole(routing_id_, | 1506 Send(new FrameHostMsg_AddMessageToConsole(routing_id_, |
| 1507 static_cast<int32>(log_severity), | 1507 static_cast<int32>(log_severity), |
| 1508 message.text, | 1508 message.text, |
| 1509 static_cast<int32>(source_line), | 1509 static_cast<int32>(source_line), |
| 1510 source_name)); | 1510 source_name)); |
| 1511 } | 1511 } |
| 1512 | 1512 |
| 1513 void RenderFrameImpl::loadURLExternally(blink::WebLocalFrame* frame, | |
| 1514 const blink::WebURLRequest& request, | |
| 1515 blink::WebNavigationPolicy policy) { | |
| 1516 DCHECK(!frame_ || frame_ == frame); | |
| 1517 loadURLExternally(frame, request, policy, WebString()); | |
| 1518 } | |
| 1519 | |
| 1520 void RenderFrameImpl::loadURLExternally( | 1513 void RenderFrameImpl::loadURLExternally( |
| 1521 blink::WebLocalFrame* frame, | 1514 blink::WebLocalFrame* frame, |
| 1522 const blink::WebURLRequest& request, | 1515 const blink::WebURLRequest& request, |
| 1523 blink::WebNavigationPolicy policy, | 1516 blink::WebNavigationPolicy policy, |
| 1524 const blink::WebString& suggested_name) { | 1517 const blink::WebString& suggested_name) { |
| 1525 DCHECK(!frame_ || frame_ == frame); | 1518 DCHECK(!frame_ || frame_ == frame); |
| 1526 Referrer referrer(RenderViewImpl::GetReferrerFromRequest(frame, request)); | 1519 Referrer referrer(RenderViewImpl::GetReferrerFromRequest(frame, request)); |
| 1527 if (policy == blink::WebNavigationPolicyDownload) { | 1520 if (policy == blink::WebNavigationPolicyDownload) { |
| 1528 render_view_->Send(new ViewHostMsg_DownloadUrl(render_view_->GetRoutingID(), | 1521 render_view_->Send(new ViewHostMsg_DownloadUrl(render_view_->GetRoutingID(), |
| 1529 request.url(), referrer, | 1522 request.url(), referrer, |
| (...skipping 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3174 selection_text_offset_ = offset; | 3167 selection_text_offset_ = offset; |
| 3175 selection_range_ = range; | 3168 selection_range_ = range; |
| 3176 // This IPC is dispatched by RenderWidetHost, so use its routing ID. | 3169 // This IPC is dispatched by RenderWidetHost, so use its routing ID. |
| 3177 Send(new ViewHostMsg_SelectionChanged( | 3170 Send(new ViewHostMsg_SelectionChanged( |
| 3178 GetRenderWidget()->routing_id(), text, offset, range)); | 3171 GetRenderWidget()->routing_id(), text, offset, range)); |
| 3179 } | 3172 } |
| 3180 GetRenderWidget()->UpdateSelectionBounds(); | 3173 GetRenderWidget()->UpdateSelectionBounds(); |
| 3181 } | 3174 } |
| 3182 | 3175 |
| 3183 } // namespace content | 3176 } // namespace content |
| OLD | NEW |