| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 // can happen when we call layout recursively and we unwind the stack. | 123 // can happen when we call layout recursively and we unwind the stack. |
| 124 if (state == LayoutClean) | 124 if (state == LayoutClean) |
| 125 return true; | 125 return true; |
| 126 if (state == StyleClean) | 126 if (state == StyleClean) |
| 127 return true; | 127 return true; |
| 128 return false; | 128 return false; |
| 129 } | 129 } |
| 130 if (m_state == CompositingClean) { | 130 if (m_state == CompositingClean) { |
| 131 if (state == InStyleRecalc) | 131 if (state == InStyleRecalc) |
| 132 return true; | 132 return true; |
| 133 if (state == InPreLayout) |
| 134 return true; |
| 133 if (state == InCompositingUpdate) | 135 if (state == InCompositingUpdate) |
| 134 return true; | 136 return true; |
| 135 if (state == InPaintInvalidation) | 137 if (state == InPaintInvalidation) |
| 136 return true; | 138 return true; |
| 137 return false; | 139 return false; |
| 138 } | 140 } |
| 139 if (m_state == InPaintInvalidation) { | 141 if (m_state == InPaintInvalidation) { |
| 140 if (state == PaintInvalidationClean) | 142 if (state == PaintInvalidationClean) |
| 141 return true; | 143 return true; |
| 142 return false; | 144 return false; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 172 void DocumentLifecycle::ensureStateAtMost(State state) | 174 void DocumentLifecycle::ensureStateAtMost(State state) |
| 173 { | 175 { |
| 174 ASSERT(state == VisualUpdatePending || state == StyleClean || state == Layou
tClean); | 176 ASSERT(state == VisualUpdatePending || state == StyleClean || state == Layou
tClean); |
| 175 if (m_state <= state) | 177 if (m_state <= state) |
| 176 return; | 178 return; |
| 177 ASSERT(canRewindTo(state)); | 179 ASSERT(canRewindTo(state)); |
| 178 m_state = state; | 180 m_state = state; |
| 179 } | 181 } |
| 180 | 182 |
| 181 } | 183 } |
| OLD | NEW |