| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 1737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1748 | 1748 |
| 1749 are_marked_text_matches_highlighted_ = flag; | 1749 are_marked_text_matches_highlighted_ = flag; |
| 1750 GetFrame().GetDocument()->Markers().RepaintMarkers( | 1750 GetFrame().GetDocument()->Markers().RepaintMarkers( |
| 1751 DocumentMarker::kTextMatch); | 1751 DocumentMarker::kTextMatch); |
| 1752 } | 1752 } |
| 1753 | 1753 |
| 1754 void Editor::RespondToChangedSelection( | 1754 void Editor::RespondToChangedSelection( |
| 1755 const Position& old_selection_start, | 1755 const Position& old_selection_start, |
| 1756 FrameSelection::SetSelectionOptions options) { | 1756 FrameSelection::SetSelectionOptions options) { |
| 1757 GetSpellChecker().RespondToChangedSelection(old_selection_start, options); | 1757 GetSpellChecker().RespondToChangedSelection(old_selection_start, options); |
| 1758 GetFrame().GetInputMethodController().CancelCompositionIfSelectionIsInvalid(); |
| 1758 Client().RespondToChangedSelection(&GetFrame(), | 1759 Client().RespondToChangedSelection(&GetFrame(), |
| 1759 GetFrame() | 1760 GetFrame() |
| 1760 .Selection() | 1761 .Selection() |
| 1761 .GetSelectionInDOMTree() | 1762 .GetSelectionInDOMTree() |
| 1762 .SelectionTypeWithLegacyGranularity()); | 1763 .SelectionTypeWithLegacyGranularity()); |
| 1763 SetStartNewKillRingSequence(true); | 1764 SetStartNewKillRingSequence(true); |
| 1764 } | 1765 } |
| 1765 | 1766 |
| 1766 SpellChecker& Editor::GetSpellChecker() const { | 1767 SpellChecker& Editor::GetSpellChecker() const { |
| 1767 return GetFrame().GetSpellChecker(); | 1768 return GetFrame().GetSpellChecker(); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1837 | 1838 |
| 1838 DEFINE_TRACE(Editor) { | 1839 DEFINE_TRACE(Editor) { |
| 1839 visitor->Trace(frame_); | 1840 visitor->Trace(frame_); |
| 1840 visitor->Trace(last_edit_command_); | 1841 visitor->Trace(last_edit_command_); |
| 1841 visitor->Trace(undo_stack_); | 1842 visitor->Trace(undo_stack_); |
| 1842 visitor->Trace(mark_); | 1843 visitor->Trace(mark_); |
| 1843 visitor->Trace(typing_style_); | 1844 visitor->Trace(typing_style_); |
| 1844 } | 1845 } |
| 1845 | 1846 |
| 1846 } // namespace blink | 1847 } // namespace blink |
| OLD | NEW |