| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 bool InspectorHistory::Action::isUndoableStateMark() | 70 bool InspectorHistory::Action::isUndoableStateMark() |
| 71 { | 71 { |
| 72 return false; | 72 return false; |
| 73 } | 73 } |
| 74 | 74 |
| 75 String InspectorHistory::Action::mergeId() | 75 String InspectorHistory::Action::mergeId() |
| 76 { | 76 { |
| 77 return ""; | 77 return ""; |
| 78 } | 78 } |
| 79 | 79 |
| 80 void InspectorHistory::Action::merge(PassOwnPtr<Action>) | 80 void InspectorHistory::Action::merge(PassRefPtr<Action>) |
| 81 { | 81 { |
| 82 } | 82 } |
| 83 | 83 |
| 84 InspectorHistory::InspectorHistory() : m_afterLastActionIndex(0) { } | 84 InspectorHistory::InspectorHistory() : m_afterLastActionIndex(0) { } |
| 85 | 85 |
| 86 bool InspectorHistory::perform(PassOwnPtr<Action> action, ExceptionState& except
ionState) | 86 bool InspectorHistory::perform(PassRefPtr<Action> action, ExceptionState& except
ionState) |
| 87 { | 87 { |
| 88 if (!action->perform(exceptionState)) | 88 if (!action->perform(exceptionState)) |
| 89 return false; | 89 return false; |
| 90 | 90 |
| 91 if (!action->mergeId().isEmpty() && m_afterLastActionIndex > 0 && action->me
rgeId() == m_history[m_afterLastActionIndex - 1]->mergeId()) | 91 if (!action->mergeId().isEmpty() && m_afterLastActionIndex > 0 && action->me
rgeId() == m_history[m_afterLastActionIndex - 1]->mergeId()) |
| 92 m_history[m_afterLastActionIndex - 1]->merge(action); | 92 m_history[m_afterLastActionIndex - 1]->merge(action); |
| 93 else { | 93 else { |
| 94 m_history.resize(m_afterLastActionIndex); | 94 m_history.resize(m_afterLastActionIndex); |
| 95 m_history.append(action); | 95 m_history.append(action); |
| 96 ++m_afterLastActionIndex; | 96 ++m_afterLastActionIndex; |
| 97 } | 97 } |
| 98 return true; | 98 return true; |
| 99 } | 99 } |
| 100 | 100 |
| 101 void InspectorHistory::markUndoableState() | 101 void InspectorHistory::markUndoableState() |
| 102 { | 102 { |
| 103 perform(adoptPtr(new UndoableStateMark()), IGNORE_EXCEPTION); | 103 perform(adoptRef(new UndoableStateMark()), IGNORE_EXCEPTION); |
| 104 } | 104 } |
| 105 | 105 |
| 106 bool InspectorHistory::undo(ExceptionState& exceptionState) | 106 bool InspectorHistory::undo(ExceptionState& exceptionState) |
| 107 { | 107 { |
| 108 while (m_afterLastActionIndex > 0 && m_history[m_afterLastActionIndex - 1]->
isUndoableStateMark()) | 108 while (m_afterLastActionIndex > 0 && m_history[m_afterLastActionIndex - 1]->
isUndoableStateMark()) |
| 109 --m_afterLastActionIndex; | 109 --m_afterLastActionIndex; |
| 110 | 110 |
| 111 while (m_afterLastActionIndex > 0) { | 111 while (m_afterLastActionIndex > 0) { |
| 112 Action* action = m_history[m_afterLastActionIndex - 1].get(); | 112 Action* action = m_history[m_afterLastActionIndex - 1].get(); |
| 113 if (!action->undo(exceptionState)) { | 113 if (!action->undo(exceptionState)) { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 141 } | 141 } |
| 142 | 142 |
| 143 void InspectorHistory::reset() | 143 void InspectorHistory::reset() |
| 144 { | 144 { |
| 145 m_afterLastActionIndex = 0; | 145 m_afterLastActionIndex = 0; |
| 146 m_history.clear(); | 146 m_history.clear(); |
| 147 } | 147 } |
| 148 | 148 |
| 149 } // namespace WebCore | 149 } // namespace WebCore |
| 150 | 150 |
| OLD | NEW |