| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007 Apple, Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007 Apple, Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Google, Inc. All rights reserved. | 3 * Copyright (C) 2012 Google, Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 } | 84 } |
| 85 | 85 |
| 86 void UndoStack::redo() | 86 void UndoStack::redo() |
| 87 { | 87 { |
| 88 if (canRedo()) { | 88 if (canRedo()) { |
| 89 UndoStepStack::iterator back = --m_redoStack.end(); | 89 UndoStepStack::iterator back = --m_redoStack.end(); |
| 90 UndoStep* step(back->get()); | 90 UndoStep* step(back->get()); |
| 91 m_redoStack.remove(back); | 91 m_redoStack.remove(back); |
| 92 | 92 |
| 93 DCHECK(!m_inRedo); | 93 DCHECK(!m_inRedo); |
| 94 TemporaryChange<bool> redoScope(m_inRedo, true); | 94 TemporaryChange<bool> redoScope(&m_inRedo, true); |
| 95 step->reapply(); | 95 step->reapply(); |
| 96 // reapply will call us back to push this command onto the undo stack. | 96 // reapply will call us back to push this command onto the undo stack. |
| 97 } | 97 } |
| 98 } | 98 } |
| 99 | 99 |
| 100 void UndoStack::clear() | 100 void UndoStack::clear() |
| 101 { | 101 { |
| 102 m_undoStack.clear(); | 102 m_undoStack.clear(); |
| 103 m_redoStack.clear(); | 103 m_redoStack.clear(); |
| 104 } | 104 } |
| 105 | 105 |
| 106 DEFINE_TRACE(UndoStack) | 106 DEFINE_TRACE(UndoStack) |
| 107 { | 107 { |
| 108 visitor->trace(m_undoStack); | 108 visitor->trace(m_undoStack); |
| 109 visitor->trace(m_redoStack); | 109 visitor->trace(m_redoStack); |
| 110 } | 110 } |
| 111 | 111 |
| 112 } // namespace blink | 112 } // namespace blink |
| OLD | NEW |