Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Side by Side Diff: third_party/WebKit/Source/core/editing/Editor.cpp

Issue 2370663002: Remove logic to reset input method more than needed (Closed)
Patch Set: fix test, fix IMC Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1620 return; 1620 return;
1621 1621
1622 m_areMarkedTextMatchesHighlighted = flag; 1622 m_areMarkedTextMatchesHighlighted = flag;
1623 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch); 1623 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch);
1624 } 1624 }
1625 1625
1626 void Editor::respondToChangedSelection( 1626 void Editor::respondToChangedSelection(
1627 const Position& oldSelectionStart, 1627 const Position& oldSelectionStart,
1628 FrameSelection::SetSelectionOptions options) { 1628 FrameSelection::SetSelectionOptions options) {
1629 spellChecker().respondToChangedSelection(oldSelectionStart, options); 1629 spellChecker().respondToChangedSelection(oldSelectionStart, options);
1630 frame().inputMethodController().cancelCompositionIfSelectionIsInvalid();
1631 client().respondToChangedSelection(&frame(), 1630 client().respondToChangedSelection(&frame(),
1632 frame().selection().getSelectionType()); 1631 frame().selection().getSelectionType());
1633 setStartNewKillRingSequence(true); 1632 setStartNewKillRingSequence(true);
1634 } 1633 }
1635 1634
1636 SpellChecker& Editor::spellChecker() const { 1635 SpellChecker& Editor::spellChecker() const {
1637 return frame().spellChecker(); 1636 return frame().spellChecker();
1638 } 1637 }
1639 1638
1640 void Editor::toggleOverwriteModeEnabled() { 1639 void Editor::toggleOverwriteModeEnabled() {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
1702 } 1701 }
1703 1702
1704 DEFINE_TRACE(Editor) { 1703 DEFINE_TRACE(Editor) {
1705 visitor->trace(m_frame); 1704 visitor->trace(m_frame);
1706 visitor->trace(m_lastEditCommand); 1705 visitor->trace(m_lastEditCommand);
1707 visitor->trace(m_undoStack); 1706 visitor->trace(m_undoStack);
1708 visitor->trace(m_mark); 1707 visitor->trace(m_mark);
1709 } 1708 }
1710 1709
1711 } // namespace blink 1710 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698