Chromium Code Reviews| 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 203 case InPaintInvalidation: | 203 case InPaintInvalidation: |
| 204 return nextState == PaintInvalidationClean; | 204 return nextState == PaintInvalidationClean; |
| 205 case PaintInvalidationClean: | 205 case PaintInvalidationClean: |
| 206 if (nextState == InStyleRecalc) | 206 if (nextState == InStyleRecalc) |
| 207 return true; | 207 return true; |
| 208 if (nextState == InPreLayout) | 208 if (nextState == InPreLayout) |
| 209 return true; | 209 return true; |
| 210 if (nextState == InCompositingUpdate) | 210 if (nextState == InCompositingUpdate) |
| 211 return true; | 211 return true; |
| 212 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { | 212 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
| 213 if (nextState == InUpdatePaintProperties) | 213 if (nextState == InPrePaintTreeWalk) |
| 214 return true; | 214 return true; |
| 215 } else if (nextState == InPaint) { | 215 } else if (nextState == InPaint) { |
| 216 return true; | 216 return true; |
| 217 } | 217 } |
| 218 break; | 218 break; |
| 219 case InUpdatePaintProperties: | 219 case InPrePaintTreeWalk: |
| 220 if (nextState == UpdatePaintPropertiesClean && RuntimeEnabledFeatures::s limmingPaintV2Enabled()) | 220 if (nextState == PrePaintTreeWalkClean && RuntimeEnabledFeatures::slimmi ngPaintV2Enabled()) |
| 221 return true; | 221 return true; |
| 222 break; | 222 break; |
| 223 case UpdatePaintPropertiesClean: | 223 case PrePaintTreeWalkClean: |
|
pdr.
2016/03/12 04:04:24
Nit: PrePaintTreeWalkFinished or PrePaintTreeWalkC
Xianzhu
2016/03/14 18:56:04
I removed "TreeWalk" from the new state names. How
| |
| 224 if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintV2Enabl ed()) | 224 if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintV2Enabl ed()) |
| 225 return true; | 225 return true; |
| 226 break; | 226 break; |
| 227 case InPaint: | 227 case InPaint: |
| 228 if (nextState == PaintClean) | 228 if (nextState == PaintClean) |
| 229 return true; | 229 return true; |
| 230 break; | 230 break; |
| 231 case PaintClean: | 231 case PaintClean: |
| 232 if (nextState == InStyleRecalc) | 232 if (nextState == InStyleRecalc) |
| 233 return true; | 233 return true; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 301 DEBUG_STRING_CASE(InLayoutSubtreeChange); | 301 DEBUG_STRING_CASE(InLayoutSubtreeChange); |
| 302 DEBUG_STRING_CASE(LayoutSubtreeChangeClean); | 302 DEBUG_STRING_CASE(LayoutSubtreeChangeClean); |
| 303 DEBUG_STRING_CASE(InPreLayout); | 303 DEBUG_STRING_CASE(InPreLayout); |
| 304 DEBUG_STRING_CASE(InPerformLayout); | 304 DEBUG_STRING_CASE(InPerformLayout); |
| 305 DEBUG_STRING_CASE(AfterPerformLayout); | 305 DEBUG_STRING_CASE(AfterPerformLayout); |
| 306 DEBUG_STRING_CASE(LayoutClean); | 306 DEBUG_STRING_CASE(LayoutClean); |
| 307 DEBUG_STRING_CASE(InCompositingUpdate); | 307 DEBUG_STRING_CASE(InCompositingUpdate); |
| 308 DEBUG_STRING_CASE(CompositingClean); | 308 DEBUG_STRING_CASE(CompositingClean); |
| 309 DEBUG_STRING_CASE(InPaintInvalidation); | 309 DEBUG_STRING_CASE(InPaintInvalidation); |
| 310 DEBUG_STRING_CASE(PaintInvalidationClean); | 310 DEBUG_STRING_CASE(PaintInvalidationClean); |
| 311 DEBUG_STRING_CASE(InUpdatePaintProperties); | 311 DEBUG_STRING_CASE(InPrePaintTreeWalk); |
| 312 DEBUG_STRING_CASE(UpdatePaintPropertiesClean); | 312 DEBUG_STRING_CASE(PrePaintTreeWalkClean); |
| 313 DEBUG_STRING_CASE(InPaint); | 313 DEBUG_STRING_CASE(InPaint); |
| 314 DEBUG_STRING_CASE(PaintClean); | 314 DEBUG_STRING_CASE(PaintClean); |
| 315 DEBUG_STRING_CASE(Stopping); | 315 DEBUG_STRING_CASE(Stopping); |
| 316 DEBUG_STRING_CASE(Stopped); | 316 DEBUG_STRING_CASE(Stopped); |
| 317 DEBUG_STRING_CASE(Disposed); | 317 DEBUG_STRING_CASE(Disposed); |
| 318 } | 318 } |
| 319 | 319 |
| 320 ASSERT_NOT_REACHED(); | 320 ASSERT_NOT_REACHED(); |
| 321 return "Unknown"; | 321 return "Unknown"; |
| 322 } | 322 } |
| 323 #endif | 323 #endif |
| 324 | 324 |
| 325 } // namespace blink | 325 } // namespace blink |
| OLD | NEW |