| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2007, 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 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 644 bool mergeBlocksAfterDelete, | 644 bool mergeBlocksAfterDelete, |
| 645 bool expandForSpecialElements, | 645 bool expandForSpecialElements, |
| 646 bool sanitizeMarkup) { | 646 bool sanitizeMarkup) { |
| 647 if (endingSelection().isRange()) | 647 if (endingSelection().isRange()) |
| 648 applyCommandToComposite(DeleteSelectionCommand::create( | 648 applyCommandToComposite(DeleteSelectionCommand::create( |
| 649 document(), smartDelete, mergeBlocksAfterDelete, | 649 document(), smartDelete, mergeBlocksAfterDelete, |
| 650 expandForSpecialElements, sanitizeMarkup), | 650 expandForSpecialElements, sanitizeMarkup), |
| 651 editingState); | 651 editingState); |
| 652 } | 652 } |
| 653 | 653 |
| 654 void CompositeEditCommand::deleteSelection(const VisibleSelection& selection, | 654 void CompositeEditCommand::deleteSelectionIfRange( |
| 655 EditingState* editingState, | 655 const VisibleSelection& selection, |
| 656 bool smartDelete, | 656 EditingState* editingState, |
| 657 bool mergeBlocksAfterDelete, | 657 bool smartDelete, |
| 658 bool expandForSpecialElements, | 658 bool mergeBlocksAfterDelete, |
| 659 bool sanitizeMarkup) { | 659 bool expandForSpecialElements, |
| 660 bool sanitizeMarkup) { |
| 660 if (selection.isRange()) | 661 if (selection.isRange()) |
| 661 applyCommandToComposite(DeleteSelectionCommand::create( | 662 applyCommandToComposite(DeleteSelectionCommand::create( |
| 662 selection, smartDelete, mergeBlocksAfterDelete, | 663 selection, smartDelete, mergeBlocksAfterDelete, |
| 663 expandForSpecialElements, sanitizeMarkup), | 664 expandForSpecialElements, sanitizeMarkup), |
| 664 editingState); | 665 editingState); |
| 665 } | 666 } |
| 666 | 667 |
| 667 void CompositeEditCommand::removeCSSProperty(Element* element, | 668 void CompositeEditCommand::removeCSSProperty(Element* element, |
| 668 CSSPropertyID property) { | 669 CSSPropertyID property) { |
| 669 // RemoveCSSPropertyCommand is never aborted. | 670 // RemoveCSSPropertyCommand is never aborted. |
| (...skipping 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1974 | 1975 |
| 1975 DEFINE_TRACE(CompositeEditCommand) { | 1976 DEFINE_TRACE(CompositeEditCommand) { |
| 1976 visitor->trace(m_commands); | 1977 visitor->trace(m_commands); |
| 1977 visitor->trace(m_startingSelection); | 1978 visitor->trace(m_startingSelection); |
| 1978 visitor->trace(m_endingSelection); | 1979 visitor->trace(m_endingSelection); |
| 1979 visitor->trace(m_undoStep); | 1980 visitor->trace(m_undoStep); |
| 1980 EditCommand::trace(visitor); | 1981 EditCommand::trace(visitor); |
| 1981 } | 1982 } |
| 1982 | 1983 |
| 1983 } // namespace blink | 1984 } // namespace blink |
| OLD | NEW |