OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/renderer_host/render_widget_host_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <tuple> | 10 #include <tuple> |
(...skipping 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1620 const base::string16& text, | 1620 const base::string16& text, |
1621 const std::vector<blink::WebCompositionUnderline>& underlines, | 1621 const std::vector<blink::WebCompositionUnderline>& underlines, |
1622 const gfx::Range& replacement_range, | 1622 const gfx::Range& replacement_range, |
1623 int selection_start, | 1623 int selection_start, |
1624 int selection_end) { | 1624 int selection_end) { |
1625 Send(new InputMsg_ImeSetComposition( | 1625 Send(new InputMsg_ImeSetComposition( |
1626 GetRoutingID(), text, underlines, replacement_range, | 1626 GetRoutingID(), text, underlines, replacement_range, |
1627 selection_start, selection_end)); | 1627 selection_start, selection_end)); |
1628 } | 1628 } |
1629 | 1629 |
1630 void RenderWidgetHostImpl::ImeCommitText(const base::string16& text, | 1630 void RenderWidgetHostImpl::ImeCommitText( |
1631 const gfx::Range& replacement_range, | 1631 const base::string16& text, |
1632 int relative_cursor_pos) { | 1632 const std::vector<blink::WebCompositionUnderline>& underlines, |
1633 Send(new InputMsg_ImeCommitText(GetRoutingID(), text, replacement_range, | 1633 const gfx::Range& replacement_range, |
1634 relative_cursor_pos)); | 1634 int relative_cursor_pos) { |
| 1635 Send(new InputMsg_ImeCommitText(GetRoutingID(), text, underlines, |
| 1636 replacement_range, relative_cursor_pos)); |
1635 } | 1637 } |
1636 | 1638 |
1637 void RenderWidgetHostImpl::ImeFinishComposingText(bool keep_selection) { | 1639 void RenderWidgetHostImpl::ImeFinishComposingText(bool keep_selection) { |
1638 Send(new InputMsg_ImeFinishComposingText(GetRoutingID(), keep_selection)); | 1640 Send(new InputMsg_ImeFinishComposingText(GetRoutingID(), keep_selection)); |
1639 } | 1641 } |
1640 | 1642 |
1641 void RenderWidgetHostImpl::ImeCancelComposition() { | 1643 void RenderWidgetHostImpl::ImeCancelComposition() { |
1642 Send(new InputMsg_ImeSetComposition(GetRoutingID(), base::string16(), | 1644 Send(new InputMsg_ImeSetComposition(GetRoutingID(), base::string16(), |
1643 std::vector<blink::WebCompositionUnderline>(), | 1645 std::vector<blink::WebCompositionUnderline>(), |
1644 gfx::Range::InvalidRange(), 0, 0)); | 1646 gfx::Range::InvalidRange(), 0, 0)); |
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2506 // different from the receiver's. | 2508 // different from the receiver's. |
2507 file_system_file.url = | 2509 file_system_file.url = |
2508 GURL(storage::GetIsolatedFileSystemRootURIString( | 2510 GURL(storage::GetIsolatedFileSystemRootURIString( |
2509 file_system_url.origin(), filesystem_id, std::string()) | 2511 file_system_url.origin(), filesystem_id, std::string()) |
2510 .append(register_name)); | 2512 .append(register_name)); |
2511 file_system_file.filesystem_id = filesystem_id; | 2513 file_system_file.filesystem_id = filesystem_id; |
2512 } | 2514 } |
2513 } | 2515 } |
2514 | 2516 |
2515 } // namespace content | 2517 } // namespace content |
OLD | NEW |