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

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

Issue 2558643003: [InputEvent] Move 'beforeinput' logic into |CompositeEditCommand::willApplyEditing()| (3/3) (Closed)
Patch Set: Created 4 years 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) 2005, 2006, 2007 Apple, Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2007 Apple, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "core/editing/commands/EditCommand.h" 26 #include "core/editing/commands/EditCommand.h"
27 27
28 #include "core/dom/Document.h" 28 #include "core/dom/Document.h"
29 #include "core/dom/NodeTraversal.h" 29 #include "core/dom/NodeTraversal.h"
30 #include "core/editing/Editor.h"
30 #include "core/editing/FrameSelection.h" 31 #include "core/editing/FrameSelection.h"
31 #include "core/editing/commands/CompositeEditCommand.h" 32 #include "core/editing/commands/CompositeEditCommand.h"
32 #include "core/frame/LocalFrame.h" 33 #include "core/frame/LocalFrame.h"
33 #include "core/layout/LayoutText.h" 34 #include "core/layout/LayoutText.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
37 EditCommand::EditCommand(Document& document) 38 EditCommand::EditCommand(Document& document)
38 : m_document(&document), m_parent(nullptr) { 39 : m_document(&document), m_parent(nullptr) {
39 DCHECK(m_document); 40 DCHECK(m_document);
40 DCHECK(m_document->frame()); 41 DCHECK(m_document->frame());
41 setStartingSelection(m_document->frame()->selection().selection()); 42 setStartingSelection(m_document->frame()->selection().selection());
42 setEndingVisibleSelection(m_startingSelection); 43 setEndingVisibleSelection(m_startingSelection);
43 } 44 }
44 45
45 EditCommand::~EditCommand() {} 46 EditCommand::~EditCommand() {}
46 47
47 InputEvent::InputType EditCommand::inputType() const { 48 InputEvent::InputType EditCommand::inputType() const {
48 return InputEvent::InputType::None; 49 return InputEvent::InputType::None;
49 } 50 }
50 51
51 String EditCommand::textDataForInputEvent() const { 52 String EditCommand::textDataForInputEvent() const {
52 return nullAtom; 53 return nullAtom;
53 } 54 }
54 55
56 DataTransfer* EditCommand::dataTransferForInputEvent() const {
57 return nullptr;
58 }
59
60 RangeVector* EditCommand::targetRangesForInputEvent() const {
61 DCHECK(m_document);
62 DCHECK(m_document->frame());
63 if (!m_document->frame()->editor().canEditRichly())
64 return nullptr;
65 return new RangeVector(1, m_document->frame()->selection().firstRange());
66 }
67
55 static inline EditCommandComposition* compositionIfPossible( 68 static inline EditCommandComposition* compositionIfPossible(
56 EditCommand* command) { 69 EditCommand* command) {
57 if (!command->isCompositeEditCommand()) 70 if (!command->isCompositeEditCommand())
58 return 0; 71 return 0;
59 return toCompositeEditCommand(command)->composition(); 72 return toCompositeEditCommand(command)->composition();
60 } 73 }
61 74
62 void EditCommand::setStartingSelection(const VisibleSelection& selection) { 75 void EditCommand::setStartingSelection(const VisibleSelection& selection) {
63 for (EditCommand* command = this;; command = command->m_parent) { 76 for (EditCommand* command = this;; command = command->m_parent) {
64 if (EditCommandComposition* composition = compositionIfPossible(command)) { 77 if (EditCommandComposition* composition = compositionIfPossible(command)) {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 139 }
127 140
128 DEFINE_TRACE(EditCommand) { 141 DEFINE_TRACE(EditCommand) {
129 visitor->trace(m_document); 142 visitor->trace(m_document);
130 visitor->trace(m_startingSelection); 143 visitor->trace(m_startingSelection);
131 visitor->trace(m_endingSelection); 144 visitor->trace(m_endingSelection);
132 visitor->trace(m_parent); 145 visitor->trace(m_parent);
133 } 146 }
134 147
135 } // namespace blink 148 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698