| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2005 Apple Computer, 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 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1093 if (brResult) { | 1093 if (brResult) { |
| 1094 calculateTypingStyleAfterDelete(); | 1094 calculateTypingStyleAfterDelete(); |
| 1095 document().updateStyleAndLayoutIgnorePendingStylesheets(); | 1095 document().updateStyleAndLayoutIgnorePendingStylesheets(); |
| 1096 setEndingSelection(createVisibleSelection( | 1096 setEndingSelection(createVisibleSelection( |
| 1097 m_endingPosition, affinity, endingSelection().isDirectional())); | 1097 m_endingPosition, affinity, endingSelection().isDirectional())); |
| 1098 clearTransientState(); | 1098 clearTransientState(); |
| 1099 rebalanceWhitespace(); | 1099 rebalanceWhitespace(); |
| 1100 return; | 1100 return; |
| 1101 } | 1101 } |
| 1102 | 1102 |
| 1103 document().updateStyleAndLayoutIgnorePendingStylesheets(); |
| 1104 |
| 1103 handleGeneralDelete(editingState); | 1105 handleGeneralDelete(editingState); |
| 1104 if (editingState->isAborted()) | 1106 if (editingState->isAborted()) |
| 1105 return; | 1107 return; |
| 1106 | 1108 |
| 1107 fixupWhitespace(); | 1109 fixupWhitespace(); |
| 1108 | 1110 |
| 1109 mergeParagraphs(editingState); | 1111 mergeParagraphs(editingState); |
| 1110 if (editingState->isAborted()) | 1112 if (editingState->isAborted()) |
| 1111 return; | 1113 return; |
| 1112 | 1114 |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1208 visitor->trace(m_deleteIntoBlockquoteStyle); | 1210 visitor->trace(m_deleteIntoBlockquoteStyle); |
| 1209 visitor->trace(m_startRoot); | 1211 visitor->trace(m_startRoot); |
| 1210 visitor->trace(m_endRoot); | 1212 visitor->trace(m_endRoot); |
| 1211 visitor->trace(m_startTableRow); | 1213 visitor->trace(m_startTableRow); |
| 1212 visitor->trace(m_endTableRow); | 1214 visitor->trace(m_endTableRow); |
| 1213 visitor->trace(m_temporaryPlaceholder); | 1215 visitor->trace(m_temporaryPlaceholder); |
| 1214 CompositeEditCommand::trace(visitor); | 1216 CompositeEditCommand::trace(visitor); |
| 1215 } | 1217 } |
| 1216 | 1218 |
| 1217 } // namespace blink | 1219 } // namespace blink |
| OLD | NEW |