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

Side by Side Diff: Source/core/editing/TextInsertionBaseCommand.cpp

Issue 1201423002: Use VisibleSelection::InDOMTree::equalSelections() instead of operator==() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-06-24T15:30:20 Rebase - exclude FrameSelection Created 5 years, 6 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 24 matching lines...) Expand all
35 35
36 namespace blink { 36 namespace blink {
37 37
38 TextInsertionBaseCommand::TextInsertionBaseCommand(Document& document) 38 TextInsertionBaseCommand::TextInsertionBaseCommand(Document& document)
39 : CompositeEditCommand(document) 39 : CompositeEditCommand(document)
40 { 40 {
41 } 41 }
42 42
43 void TextInsertionBaseCommand::applyTextInsertionCommand(LocalFrame* frame, Pass RefPtrWillBeRawPtr<TextInsertionBaseCommand> command, const VisibleSelection& se lectionForInsertion, const VisibleSelection& endingSelection) 43 void TextInsertionBaseCommand::applyTextInsertionCommand(LocalFrame* frame, Pass RefPtrWillBeRawPtr<TextInsertionBaseCommand> command, const VisibleSelection& se lectionForInsertion, const VisibleSelection& endingSelection)
44 { 44 {
45 bool changeSelection = selectionForInsertion != endingSelection; 45 bool changeSelection = !VisibleSelection::InDOMTree::equalSelections(selecti onForInsertion, endingSelection);
46 if (changeSelection) { 46 if (changeSelection) {
47 command->setStartingSelection(selectionForInsertion); 47 command->setStartingSelection(selectionForInsertion);
48 command->setEndingSelection(selectionForInsertion); 48 command->setEndingSelection(selectionForInsertion);
49 } 49 }
50 command->apply(); 50 command->apply();
51 if (changeSelection) { 51 if (changeSelection) {
52 command->setEndingSelection(endingSelection); 52 command->setEndingSelection(endingSelection);
53 frame->selection().setSelection(endingSelection); 53 frame->selection().setSelection(endingSelection);
54 } 54 }
55 } 55 }
(...skipping 20 matching lines...) Expand all
76 Element* element = selection.rootEditableElement(); 76 Element* element = selection.rootEditableElement();
77 if (!element) 77 if (!element)
78 return false; 78 return false;
79 79
80 RefPtrWillBeRawPtr<BeforeTextInsertedEvent> event = BeforeTextInsertedEvent: :create(String("\n")); 80 RefPtrWillBeRawPtr<BeforeTextInsertedEvent> event = BeforeTextInsertedEvent: :create(String("\n"));
81 element->dispatchEvent(event, IGNORE_EXCEPTION); 81 element->dispatchEvent(event, IGNORE_EXCEPTION);
82 return event->text().length(); 82 return event->text().length();
83 } 83 }
84 84
85 } 85 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698