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 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1392 const std::vector<blink::WebCompositionUnderline>& underlines, | 1392 const std::vector<blink::WebCompositionUnderline>& underlines, |
1393 int selection_start, | 1393 int selection_start, |
1394 int selection_end) { | 1394 int selection_end) { |
1395 render_view_->OnImeSetComposition( | 1395 render_view_->OnImeSetComposition( |
1396 text, underlines, gfx::Range::InvalidRange(), | 1396 text, underlines, gfx::Range::InvalidRange(), |
1397 selection_start, selection_end); | 1397 selection_start, selection_end); |
1398 } | 1398 } |
1399 | 1399 |
1400 void RenderFrameImpl::SimulateImeCommitText( | 1400 void RenderFrameImpl::SimulateImeCommitText( |
1401 const base::string16& text, | 1401 const base::string16& text, |
| 1402 const std::vector<blink::WebCompositionUnderline>& underlines, |
1402 const gfx::Range& replacement_range) { | 1403 const gfx::Range& replacement_range) { |
1403 render_view_->OnImeCommitText(text, replacement_range, 0); | 1404 render_view_->OnImeCommitText(text, underlines, replacement_range, 0); |
1404 } | 1405 } |
1405 | 1406 |
1406 void RenderFrameImpl::SimulateImeFinishComposingText(bool keep_selection) { | 1407 void RenderFrameImpl::SimulateImeFinishComposingText(bool keep_selection) { |
1407 render_view_->OnImeFinishComposingText(keep_selection); | 1408 render_view_->OnImeFinishComposingText(keep_selection); |
1408 } | 1409 } |
1409 | 1410 |
1410 void RenderFrameImpl::OnImeSetComposition( | 1411 void RenderFrameImpl::OnImeSetComposition( |
1411 const base::string16& text, | 1412 const base::string16& text, |
1412 const std::vector<blink::WebCompositionUnderline>& underlines, | 1413 const std::vector<blink::WebCompositionUnderline>& underlines, |
1413 int selection_start, | 1414 int selection_start, |
(...skipping 5262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6676 // event target. Potentially a Pepper plugin will receive the event. | 6677 // event target. Potentially a Pepper plugin will receive the event. |
6677 // In order to tell whether a plugin gets the last mouse event and which it | 6678 // In order to tell whether a plugin gets the last mouse event and which it |
6678 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6679 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6679 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6680 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6680 // |pepper_last_mouse_event_target_|. | 6681 // |pepper_last_mouse_event_target_|. |
6681 pepper_last_mouse_event_target_ = nullptr; | 6682 pepper_last_mouse_event_target_ = nullptr; |
6682 #endif | 6683 #endif |
6683 } | 6684 } |
6684 | 6685 |
6685 } // namespace content | 6686 } // namespace content |
OLD | NEW |