Remove the PaintInvalidation DocumentLifeCycle states.

sky/engine/core/dom/DocumentLifecycle.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 109 matching lines @@
         if (state == InPerformLayout)
             return true;
         // We can redundant arrive in the layout clean state. This situation
         // can happen when we call layout recursively and we unwind the stack.
         if (state == LayoutClean)
             return true;
         if (state == StyleClean)
             return true;
         return false;
     }
-    if (m_state == InPaintInvalidation) {
-        if (state == PaintInvalidationClean)
-            return true;
-        return false;
-    }
-    if (m_state == PaintInvalidationClean) {
+    if (m_state == StyleAndLayoutClean) {
         if (state == InStyleRecalc)
             return true;
         if (state == InPreLayout)
             return true;
-        if (state == InPaintInvalidation)
+        if (state == LayoutClean)
+            return true;
+        // We can pump frames without style or layout needing updating.
+        if (state == StyleAndLayoutClean)
             return true;
         return false;
     }
     return false;
 }
 
 bool DocumentLifecycle::canRewindTo(State state) const
 {
     // This transition is bogus, but we've whitelisted it anyway.
     if (s_deprecatedTransitionStack && m_state == s_deprecatedTransitionStack->from() && state == s_deprecatedTransitionStack->to())
         return true;
-    return m_state == StyleClean || m_state == AfterPerformLayout || m_state == LayoutClean || m_state == PaintInvalidationClean;
+    return m_state == StyleClean || m_state == AfterPerformLayout || m_state == LayoutClean || m_state == StyleAndLayoutClean;
 }
 
 #endif
 
 void DocumentLifecycle::advanceTo(State state)
 {
     ASSERT(canAdvanceTo(state));
     m_state = state;
 }
 
 void DocumentLifecycle::ensureStateAtMost(State state)
 {
     ASSERT(state == VisualUpdatePending || state == StyleClean || state == LayoutClean);
     if (m_state <= state)
         return;
     ASSERT(canRewindTo(state));
     m_state = state;
 }
 
 }