Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Side by Side Diff: third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp

Issue 1376143002: Add a document phase for calculating paint properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase (remove GLB check, as was done in synchronizedPaint) Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 break; 188 break;
189 case InPaintInvalidation: 189 case InPaintInvalidation:
190 return nextState == PaintInvalidationClean; 190 return nextState == PaintInvalidationClean;
191 case PaintInvalidationClean: 191 case PaintInvalidationClean:
192 if (nextState == InStyleRecalc) 192 if (nextState == InStyleRecalc)
193 return true; 193 return true;
194 if (nextState == InPreLayout) 194 if (nextState == InPreLayout)
195 return true; 195 return true;
196 if (nextState == InCompositingUpdate) 196 if (nextState == InCompositingUpdate)
197 return true; 197 return true;
198 if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintSynchro nizedPaintingEnabled()) 198 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
199 if (nextState == InCalcPaintProps)
200 return true;
201 } else {
202 if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintSyn chronizedPaintingEnabled())
203 return true;
204 }
205 break;
206 case InCalcPaintProps:
207 if (nextState == CalcPaintPropsClean && RuntimeEnabledFeatures::slimming PaintV2Enabled())
208 return true;
209 break;
210 case CalcPaintPropsClean:
211 if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintV2Enabl ed())
199 return true; 212 return true;
200 break; 213 break;
201 case InPaint: 214 case InPaint:
202 if (nextState == PaintClean && RuntimeEnabledFeatures::slimmingPaintSync hronizedPaintingEnabled()) 215 if (nextState == PaintClean && RuntimeEnabledFeatures::slimmingPaintSync hronizedPaintingEnabled())
203 return true; 216 return true;
204 break; 217 break;
205 case PaintClean: 218 case PaintClean:
206 if (!RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()) 219 if (!RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled())
207 break; 220 break;
208 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { 221 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 void DocumentLifecycle::ensureStateAtMost(State state) 283 void DocumentLifecycle::ensureStateAtMost(State state)
271 { 284 {
272 ASSERT(state == VisualUpdatePending || state == StyleClean || state == Layou tClean); 285 ASSERT(state == VisualUpdatePending || state == StyleClean || state == Layou tClean);
273 if (m_state <= state) 286 if (m_state <= state)
274 return; 287 return;
275 ASSERT(canRewindTo(state)); 288 ASSERT(canRewindTo(state));
276 m_state = state; 289 m_state = state;
277 } 290 }
278 291
279 } 292 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698