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

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: fixed handle issue in another CL Created 3 years, 10 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 1605 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 return; 1616 return;
1617 1617
1618 m_areMarkedTextMatchesHighlighted = flag; 1618 m_areMarkedTextMatchesHighlighted = flag;
1619 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch); 1619 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch);
1620 } 1620 }
1621 1621
1622 void Editor::respondToChangedSelection( 1622 void Editor::respondToChangedSelection(
1623 const Position& oldSelectionStart, 1623 const Position& oldSelectionStart,
1624 FrameSelection::SetSelectionOptions options) { 1624 FrameSelection::SetSelectionOptions options) {
1625 spellChecker().respondToChangedSelection(oldSelectionStart, options); 1625 spellChecker().respondToChangedSelection(oldSelectionStart, options);
1626 frame().inputMethodController().cancelCompositionIfSelectionIsInvalid();
1627 client().respondToChangedSelection(&frame(), 1626 client().respondToChangedSelection(&frame(),
1628 frame().selection().getSelectionType()); 1627 frame().selection().getSelectionType());
1629 setStartNewKillRingSequence(true); 1628 setStartNewKillRingSequence(true);
1630 } 1629 }
1631 1630
1632 SpellChecker& Editor::spellChecker() const { 1631 SpellChecker& Editor::spellChecker() const {
1633 return frame().spellChecker(); 1632 return frame().spellChecker();
1634 } 1633 }
1635 1634
1636 void Editor::toggleOverwriteModeEnabled() { 1635 void Editor::toggleOverwriteModeEnabled() {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
1699 1698
1700 DEFINE_TRACE(Editor) { 1699 DEFINE_TRACE(Editor) {
1701 visitor->trace(m_frame); 1700 visitor->trace(m_frame);
1702 visitor->trace(m_lastEditCommand); 1701 visitor->trace(m_lastEditCommand);
1703 visitor->trace(m_undoStack); 1702 visitor->trace(m_undoStack);
1704 visitor->trace(m_mark); 1703 visitor->trace(m_mark);
1705 visitor->trace(m_typingStyle); 1704 visitor->trace(m_typingStyle);
1706 } 1705 }
1707 1706
1708 } // namespace blink 1707 } // namespace blink
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698