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