| 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 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 if (nextState == InCompositingForSlimmingPaintV2 && RuntimeEnabledFeatur
es::slimmingPaintV2Enabled()) | 206 if (nextState == InCompositingForSlimmingPaintV2 && RuntimeEnabledFeatur
es::slimmingPaintV2Enabled()) |
| 207 return true; | 207 return true; |
| 208 break; | 208 break; |
| 209 case InCompositingForSlimmingPaintV2: | 209 case InCompositingForSlimmingPaintV2: |
| 210 if (nextState == CompositingForSlimmingPaintV2Clean && RuntimeEnabledFea
tures::slimmingPaintV2Enabled()) | 210 if (nextState == CompositingForSlimmingPaintV2Clean && RuntimeEnabledFea
tures::slimmingPaintV2Enabled()) |
| 211 return true; | 211 return true; |
| 212 break; | 212 break; |
| 213 case CompositingForSlimmingPaintV2Clean: | 213 case CompositingForSlimmingPaintV2Clean: |
| 214 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) | 214 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
| 215 return false; | 215 return false; |
| 216 if (nextState == InStyleRecalc) |
| 217 return true; |
| 218 if (nextState == InPreLayout) |
| 219 return true; |
| 216 if (nextState == InCompositingUpdate) | 220 if (nextState == InCompositingUpdate) |
| 217 return true; | 221 return true; |
| 218 if (nextState == CompositingForSlimmingPaintV2Clean) | 222 if (nextState == CompositingForSlimmingPaintV2Clean) |
| 219 return true; | 223 return true; |
| 220 break; | 224 break; |
| 221 case Stopping: | 225 case Stopping: |
| 222 return nextState == Stopped; | 226 return nextState == Stopped; |
| 223 case Stopped: | 227 case Stopped: |
| 224 return nextState == Disposed; | 228 return nextState == Disposed; |
| 225 case Disposed: | 229 case Disposed: |
| (...skipping 30 matching lines...) Expand all Loading... |
| 256 void DocumentLifecycle::ensureStateAtMost(State state) | 260 void DocumentLifecycle::ensureStateAtMost(State state) |
| 257 { | 261 { |
| 258 ASSERT(state == VisualUpdatePending || state == StyleClean || state == Layou
tClean); | 262 ASSERT(state == VisualUpdatePending || state == StyleClean || state == Layou
tClean); |
| 259 if (m_state <= state) | 263 if (m_state <= state) |
| 260 return; | 264 return; |
| 261 ASSERT(canRewindTo(state)); | 265 ASSERT(canRewindTo(state)); |
| 262 m_state = state; | 266 m_state = state; |
| 263 } | 267 } |
| 264 | 268 |
| 265 } | 269 } |
| OLD | NEW |