| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 break; | 176 break; |
| 177 case InCompositingUpdate: | 177 case InCompositingUpdate: |
| 178 return nextState == CompositingClean; | 178 return nextState == CompositingClean; |
| 179 case CompositingClean: | 179 case CompositingClean: |
| 180 if (nextState == InStyleRecalc) | 180 if (nextState == InStyleRecalc) |
| 181 return true; | 181 return true; |
| 182 if (nextState == InPreLayout) | 182 if (nextState == InPreLayout) |
| 183 return true; | 183 return true; |
| 184 if (nextState == InCompositingUpdate) | 184 if (nextState == InCompositingUpdate) |
| 185 return true; | 185 return true; |
| 186 if (nextState == InPaintInvalidation) | 186 if (nextState == InPaintInvalidation && !RuntimeEnabledFeatures::slimmin
gPaintV2Enabled()) |
| 187 return true; |
| 188 if (nextState == InPaintForSlimmingPaintV2 && RuntimeEnabledFeatures::sl
immingPaintV2Enabled()) |
| 187 return true; | 189 return true; |
| 188 break; | 190 break; |
| 189 case InPaintInvalidation: | 191 case InPaintInvalidation: |
| 192 ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled()); |
| 190 return nextState == PaintInvalidationClean; | 193 return nextState == PaintInvalidationClean; |
| 191 case PaintInvalidationClean: | 194 case PaintInvalidationClean: |
| 195 ASSERT(!RuntimeEnabledFeatures::slimmingPaintV2Enabled()); |
| 192 if (nextState == InStyleRecalc) | 196 if (nextState == InStyleRecalc) |
| 193 return true; | 197 return true; |
| 194 if (nextState == InPreLayout) | 198 if (nextState == InPreLayout) |
| 195 return true; | 199 return true; |
| 196 if (nextState == InCompositingUpdate) | 200 if (nextState == InCompositingUpdate) |
| 197 return true; | 201 return true; |
| 198 if (nextState == InPaintForSlimmingPaintV2 && RuntimeEnabledFeatures::sl
immingPaintV2Enabled()) | 202 if (nextState == InPaintForSlimmingPaintV2 && RuntimeEnabledFeatures::sl
immingPaintV2Enabled()) |
| 199 return true; | 203 return true; |
| 200 break; | 204 break; |
| 201 case InPaintForSlimmingPaintV2: | 205 case InPaintForSlimmingPaintV2: |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 void DocumentLifecycle::ensureStateAtMost(State state) | 264 void DocumentLifecycle::ensureStateAtMost(State state) |
| 261 { | 265 { |
| 262 ASSERT(state == VisualUpdatePending || state == StyleClean || state == Layou
tClean); | 266 ASSERT(state == VisualUpdatePending || state == StyleClean || state == Layou
tClean); |
| 263 if (m_state <= state) | 267 if (m_state <= state) |
| 264 return; | 268 return; |
| 265 ASSERT(canRewindTo(state)); | 269 ASSERT(canRewindTo(state)); |
| 266 m_state = state; | 270 m_state = state; |
| 267 } | 271 } |
| 268 | 272 |
| 269 } | 273 } |
| OLD | NEW |