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 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1619 const base::string16& text, | 1619 const base::string16& text, |
1620 const std::vector<blink::WebCompositionUnderline>& underlines, | 1620 const std::vector<blink::WebCompositionUnderline>& underlines, |
1621 const gfx::Range& replacement_range, | 1621 const gfx::Range& replacement_range, |
1622 int selection_start, | 1622 int selection_start, |
1623 int selection_end) { | 1623 int selection_end) { |
1624 Send(new InputMsg_ImeSetComposition( | 1624 Send(new InputMsg_ImeSetComposition( |
1625 GetRoutingID(), text, underlines, replacement_range, | 1625 GetRoutingID(), text, underlines, replacement_range, |
1626 selection_start, selection_end)); | 1626 selection_start, selection_end)); |
1627 } | 1627 } |
1628 | 1628 |
1629 void RenderWidgetHostImpl::ImeCommitText(const base::string16& text, | 1629 void RenderWidgetHostImpl::ImeCommitText( |
1630 const gfx::Range& replacement_range, | 1630 const base::string16& text, |
1631 int relative_cursor_pos) { | 1631 const std::vector<blink::WebCompositionUnderline>& underlines, |
1632 Send(new InputMsg_ImeCommitText(GetRoutingID(), text, replacement_range, | 1632 const gfx::Range& replacement_range, |
1633 relative_cursor_pos)); | 1633 int relative_cursor_pos) { |
| 1634 Send(new InputMsg_ImeCommitText(GetRoutingID(), text, underlines, |
| 1635 replacement_range, relative_cursor_pos)); |
1634 } | 1636 } |
1635 | 1637 |
1636 void RenderWidgetHostImpl::ImeFinishComposingText(bool keep_selection) { | 1638 void RenderWidgetHostImpl::ImeFinishComposingText(bool keep_selection) { |
1637 Send(new InputMsg_ImeFinishComposingText(GetRoutingID(), keep_selection)); | 1639 Send(new InputMsg_ImeFinishComposingText(GetRoutingID(), keep_selection)); |
1638 } | 1640 } |
1639 | 1641 |
1640 void RenderWidgetHostImpl::ImeCancelComposition() { | 1642 void RenderWidgetHostImpl::ImeCancelComposition() { |
1641 Send(new InputMsg_ImeSetComposition(GetRoutingID(), base::string16(), | 1643 Send(new InputMsg_ImeSetComposition(GetRoutingID(), base::string16(), |
1642 std::vector<blink::WebCompositionUnderline>(), | 1644 std::vector<blink::WebCompositionUnderline>(), |
1643 gfx::Range::InvalidRange(), 0, 0)); | 1645 gfx::Range::InvalidRange(), 0, 0)); |
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2503 // Note: We are using the origin URL provided by the sender here. It may be | 2505 // Note: We are using the origin URL provided by the sender here. It may be |
2504 // different from the receiver's. | 2506 // different from the receiver's. |
2505 file_system_file.url = | 2507 file_system_file.url = |
2506 GURL(storage::GetIsolatedFileSystemRootURIString( | 2508 GURL(storage::GetIsolatedFileSystemRootURIString( |
2507 file_system_url.origin(), filesystem_id, std::string()) | 2509 file_system_url.origin(), filesystem_id, std::string()) |
2508 .append(register_name)); | 2510 .append(register_name)); |
2509 } | 2511 } |
2510 } | 2512 } |
2511 | 2513 |
2512 } // namespace content | 2514 } // namespace content |
OLD | NEW |