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

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

Issue 1753703005: Simplify TypingCommand::insertText (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 4 years, 9 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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 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
(...skipping 21 matching lines...) Expand all
32 #include "core/events/BeforeTextInsertedEvent.h" 32 #include "core/events/BeforeTextInsertedEvent.h"
33 #include "core/frame/LocalFrame.h" 33 #include "core/frame/LocalFrame.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 TextInsertionBaseCommand::TextInsertionBaseCommand(Document& document) 37 TextInsertionBaseCommand::TextInsertionBaseCommand(Document& document)
38 : CompositeEditCommand(document) 38 : CompositeEditCommand(document)
39 { 39 {
40 } 40 }
41 41
42 void TextInsertionBaseCommand::applyTextInsertionCommand(LocalFrame* frame, Pass RefPtrWillBeRawPtr<TextInsertionBaseCommand> command, const VisibleSelection& se lectionForInsertion, const VisibleSelection& endingSelection)
43 {
44 bool changeSelection = !equalSelectionsInDOMTree(selectionForInsertion, endi ngSelection);
45 if (changeSelection) {
46 command->setStartingSelection(selectionForInsertion);
47 command->setEndingSelection(selectionForInsertion);
48 }
49 command->apply();
50 if (changeSelection) {
51 command->setEndingSelection(endingSelection);
52 frame->selection().setSelection(endingSelection);
53 }
54 }
55
56 String dispatchBeforeTextInsertedEvent(const String& text, const VisibleSelectio n& selectionForInsertion, bool insertionIsForUpdatingComposition) 42 String dispatchBeforeTextInsertedEvent(const String& text, const VisibleSelectio n& selectionForInsertion, bool insertionIsForUpdatingComposition)
57 { 43 {
58 if (insertionIsForUpdatingComposition) 44 if (insertionIsForUpdatingComposition)
59 return text; 45 return text;
60 46
61 String newText = text; 47 String newText = text;
62 if (Node* startNode = selectionForInsertion.start().computeContainerNode()) { 48 if (Node* startNode = selectionForInsertion.start().computeContainerNode()) {
63 if (startNode->rootEditableElement()) { 49 if (startNode->rootEditableElement()) {
64 // Send BeforeTextInsertedEvent. The event handler will update text if necessary. 50 // Send BeforeTextInsertedEvent. The event handler will update text if necessary.
65 RefPtrWillBeRawPtr<BeforeTextInsertedEvent> evt = BeforeTextInserted Event::create(text); 51 RefPtrWillBeRawPtr<BeforeTextInsertedEvent> evt = BeforeTextInserted Event::create(text);
66 startNode->rootEditableElement()->dispatchEvent(evt); 52 startNode->rootEditableElement()->dispatchEvent(evt);
67 newText = evt->text(); 53 newText = evt->text();
68 } 54 }
69 } 55 }
70 return newText; 56 return newText;
71 } 57 }
72 58
73 bool canAppendNewLineFeedToSelection(const VisibleSelection& selection) 59 bool canAppendNewLineFeedToSelection(const VisibleSelection& selection)
74 { 60 {
75 Element* element = selection.rootEditableElement(); 61 Element* element = selection.rootEditableElement();
76 if (!element) 62 if (!element)
77 return false; 63 return false;
78 64
79 RefPtrWillBeRawPtr<BeforeTextInsertedEvent> event = BeforeTextInsertedEvent: :create(String("\n")); 65 RefPtrWillBeRawPtr<BeforeTextInsertedEvent> event = BeforeTextInsertedEvent: :create(String("\n"));
80 element->dispatchEvent(event); 66 element->dispatchEvent(event);
81 return event->text().length(); 67 return event->text().length();
82 } 68 }
83 69
84 } // namespace blink 70 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698