| 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 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 // routing_id_ as a result. | 1166 // routing_id_ as a result. |
| 1167 Send(new FrameHostMsg_PluginCrashed(routing_id_, plugin_path, plugin_pid)); | 1167 Send(new FrameHostMsg_PluginCrashed(routing_id_, plugin_path, plugin_pid)); |
| 1168 } | 1168 } |
| 1169 | 1169 |
| 1170 void RenderFrameImpl::SimulateImeSetComposition( | 1170 void RenderFrameImpl::SimulateImeSetComposition( |
| 1171 const base::string16& text, | 1171 const base::string16& text, |
| 1172 const std::vector<blink::WebCompositionUnderline>& underlines, | 1172 const std::vector<blink::WebCompositionUnderline>& underlines, |
| 1173 int selection_start, | 1173 int selection_start, |
| 1174 int selection_end) { | 1174 int selection_end) { |
| 1175 render_view_->OnImeSetComposition( | 1175 render_view_->OnImeSetComposition( |
| 1176 text, underlines, selection_start, selection_end); | 1176 text, underlines, gfx::Range::InvalidRange(), |
| 1177 selection_start, selection_end); |
| 1177 } | 1178 } |
| 1178 | 1179 |
| 1179 void RenderFrameImpl::SimulateImeConfirmComposition( | 1180 void RenderFrameImpl::SimulateImeConfirmComposition( |
| 1180 const base::string16& text, | 1181 const base::string16& text, |
| 1181 const gfx::Range& replacement_range) { | 1182 const gfx::Range& replacement_range) { |
| 1182 render_view_->OnImeConfirmComposition(text, replacement_range, false); | 1183 render_view_->OnImeConfirmComposition(text, replacement_range, false); |
| 1183 } | 1184 } |
| 1184 | 1185 |
| 1185 void RenderFrameImpl::OnImeSetComposition( | 1186 void RenderFrameImpl::OnImeSetComposition( |
| 1186 const base::string16& text, | 1187 const base::string16& text, |
| (...skipping 4862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6049 int match_count, | 6050 int match_count, |
| 6050 int ordinal, | 6051 int ordinal, |
| 6051 const WebRect& selection_rect, | 6052 const WebRect& selection_rect, |
| 6052 bool final_status_update) { | 6053 bool final_status_update) { |
| 6053 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6054 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6054 selection_rect, ordinal, | 6055 selection_rect, ordinal, |
| 6055 final_status_update)); | 6056 final_status_update)); |
| 6056 } | 6057 } |
| 6057 | 6058 |
| 6058 } // namespace content | 6059 } // namespace content |
| OLD | NEW |