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

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

Issue 2413633002: Prune createVisiblePositionDeprecated from EditingUtilities (Closed)
Patch Set: Address comments Created 4 years, 2 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, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 createVisiblePosition(start), 109 createVisiblePosition(start),
110 VisiblePosition::afterNode(selectedListItem->lastChild()), newList, 110 VisiblePosition::afterNode(selectedListItem->lastChild()), newList,
111 selectedListItem, editingState); 111 selectedListItem, editingState);
112 if (editingState->isAborted()) 112 if (editingState->isAborted())
113 return false; 113 return false;
114 removeNode(selectedListItem, editingState); 114 removeNode(selectedListItem, editingState);
115 } 115 }
116 if (editingState->isAborted()) 116 if (editingState->isAborted())
117 return false; 117 return false;
118 118
119 document().updateStyleAndLayoutIgnorePendingStylesheets();
119 if (canMergeLists(previousList, newList)) { 120 if (canMergeLists(previousList, newList)) {
120 mergeIdenticalElements(previousList, newList, editingState); 121 mergeIdenticalElements(previousList, newList, editingState);
121 if (editingState->isAborted()) 122 if (editingState->isAborted())
122 return false; 123 return false;
123 } 124 }
125
126 document().updateStyleAndLayoutIgnorePendingStylesheets();
124 if (canMergeLists(newList, nextList)) { 127 if (canMergeLists(newList, nextList)) {
125 mergeIdenticalElements(newList, nextList, editingState); 128 mergeIdenticalElements(newList, nextList, editingState);
126 if (editingState->isAborted()) 129 if (editingState->isAborted())
127 return false; 130 return false;
128 } 131 }
129 132
130 return true; 133 return true;
131 } 134 }
132 135
133 void IndentOutdentCommand::indentIntoBlockquote(const Position& start, 136 void IndentOutdentCommand::indentIntoBlockquote(const Position& start,
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 else 397 else
395 indentIntoBlockquote(start, end, blockquoteForNextIndent, editingState); 398 indentIntoBlockquote(start, end, blockquoteForNextIndent, editingState);
396 } 399 }
397 400
398 InputEvent::InputType IndentOutdentCommand::inputType() const { 401 InputEvent::InputType IndentOutdentCommand::inputType() const {
399 return m_typeOfAction == Indent ? InputEvent::InputType::Indent 402 return m_typeOfAction == Indent ? InputEvent::InputType::Indent
400 : InputEvent::InputType::Outdent; 403 : InputEvent::InputType::Outdent;
401 } 404 }
402 405
403 } // namespace blink 406 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698