InPrePaint document state and PrePaintTreeWalk class

third_party/WebKit/Source/core/dom/DocumentLifecycle.h

Index: third_party/WebKit/Source/core/dom/DocumentLifecycle.h
diff --git a/third_party/WebKit/Source/core/dom/DocumentLifecycle.h b/third_party/WebKit/Source/core/dom/DocumentLifecycle.h
index 2580dd18f16babc483685e87b3fb03ab8d560c37..adcc7352f83e76ef7970ee4ae75fef3ffaa24239 100644
--- a/third_party/WebKit/Source/core/dom/DocumentLifecycle.h
+++ b/third_party/WebKit/Source/core/dom/DocumentLifecycle.h
@@ -68,11 +68,9 @@ public:
         PaintInvalidationClean,
 
         // When RuntimeEnabledFeatures::slimmingPaintV2Enabled.
-        InUpdatePaintProperties,
-        UpdatePaintPropertiesClean,
+        InPrePaintTreeWalk,

[pdr., 2016/03/12 04:04:24]

Nit: Can you update the comment in LayoutObject.h above objectPaintProperties
too?

[jbroman, 2016/03/14 15:05:15]

It becomes less obvious what this step is, now that it only describes when it
happens, rather than what it does.

Something like "If RuntimeEnabledFeatures::slimmingPaintV2Enabled, paint
property trees are build in this step. If (other condition), paint invalidation
happens during this step.".

[Xianzhu, 2016/03/14 18:56:04]

Changed the state name "InPrePaintTreeWalk" to "InPrePaint" and added comment:
        // In InPrePaint step, any data needed for painting are prepared.
        // When RuntimeEnabledFeatures::slimmingPaintV2Enabled, paint property
trees are built.
        // Otherwise these steps are not applicable.

Will add comment about paint invalidation when it is added in this step.

+        PrePaintTreeWalkClean,
 
-        // When RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled
-        // (implied by slimmingPaintV2Enabled).
         InPaint,
         PaintClean,
 
@@ -184,7 +182,7 @@ inline bool DocumentLifecycle::stateAllowsTreeMutations() const
     return m_state != InStyleRecalc
         && m_state != InPerformLayout
         && m_state != InCompositingUpdate
-        && m_state != InUpdatePaintProperties
+        && m_state != InPrePaintTreeWalk
         && m_state != InPaint;
 }
 
@@ -208,7 +206,7 @@ inline bool DocumentLifecycle::stateAllowsDetach() const
         || m_state == LayoutClean
         || m_state == CompositingClean
         || m_state == PaintInvalidationClean
-        || m_state == UpdatePaintPropertiesClean
+        || m_state == PrePaintTreeWalkClean
         || m_state == PaintClean
         || m_state == Stopping;
 }
@@ -218,7 +216,7 @@ inline bool DocumentLifecycle::stateAllowsLayoutInvalidation() const
     return m_state != InPerformLayout
         && m_state != InCompositingUpdate
         && m_state != InPaintInvalidation
-        && m_state != InUpdatePaintProperties
+        && m_state != InPrePaintTreeWalk
         && m_state != InPaint;
 }