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

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

Issue 2617753002: [InputEvent] Move attributes from |EditCommand| to |CompositeEditCommand| (2/11) (Closed)
Patch Set: 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 Element* endRoot, 118 Element* endRoot,
119 InputEvent::InputType inputType, 119 InputEvent::InputType inputType,
120 const String& data, 120 const String& data,
121 InputEvent::EventIsComposing isComposing) { 121 InputEvent::EventIsComposing isComposing) {
122 if (startRoot) 122 if (startRoot)
123 dispatchInputEvent(startRoot, inputType, data, isComposing); 123 dispatchInputEvent(startRoot, inputType, data, isComposing);
124 if (endRoot && endRoot != startRoot) 124 if (endRoot && endRoot != startRoot)
125 dispatchInputEvent(endRoot, inputType, data, isComposing); 125 dispatchInputEvent(endRoot, inputType, data, isComposing);
126 } 126 }
127 127
128 InputEvent::EventIsComposing isComposingFromCommand(
129 const CompositeEditCommand* command) {
130 if (command->isTypingCommand() &&
131 toTypingCommand(command)->compositionType() !=
132 TypingCommand::TextCompositionNone)
133 return InputEvent::EventIsComposing::IsComposing;
134 return InputEvent::EventIsComposing::NotComposing;
135 }
136
137 } // anonymous namespace 128 } // anonymous namespace
138 129
139 Editor::RevealSelectionScope::RevealSelectionScope(Editor* editor) 130 Editor::RevealSelectionScope::RevealSelectionScope(Editor* editor)
140 : m_editor(editor) { 131 : m_editor(editor) {
141 ++m_editor->m_preventRevealSelection; 132 ++m_editor->m_preventRevealSelection;
142 } 133 }
143 134
144 Editor::RevealSelectionScope::~RevealSelectionScope() { 135 Editor::RevealSelectionScope::~RevealSelectionScope() {
145 DCHECK(m_editor->m_preventRevealSelection); 136 DCHECK(m_editor->m_preventRevealSelection);
146 --m_editor->m_preventRevealSelection; 137 --m_editor->m_preventRevealSelection;
(...skipping 1560 matching lines...) Expand 10 before | Expand all | Expand 10 after
1707 } 1698 }
1708 1699
1709 DEFINE_TRACE(Editor) { 1700 DEFINE_TRACE(Editor) {
1710 visitor->trace(m_frame); 1701 visitor->trace(m_frame);
1711 visitor->trace(m_lastEditCommand); 1702 visitor->trace(m_lastEditCommand);
1712 visitor->trace(m_undoStack); 1703 visitor->trace(m_undoStack);
1713 visitor->trace(m_mark); 1704 visitor->trace(m_mark);
1714 } 1705 }
1715 1706
1716 } // namespace blink 1707 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698