Move clearPaintInvalidatinFlags after subtree walk

third_party/WebKit/Source/core/paint/PrePaintTreeWalk.cpp

Index: third_party/WebKit/Source/core/paint/PrePaintTreeWalk.cpp
diff --git a/third_party/WebKit/Source/core/paint/PrePaintTreeWalk.cpp b/third_party/WebKit/Source/core/paint/PrePaintTreeWalk.cpp
index b1c7d40bca52dff8e1d762cd6f57970fb4f640e9..3382c63e5c2a72820bd5f6084f692b6d19df0dc2 100644
--- a/third_party/WebKit/Source/core/paint/PrePaintTreeWalk.cpp
+++ b/third_party/WebKit/Source/core/paint/PrePaintTreeWalk.cpp
@@ -44,17 +44,14 @@ void PrePaintTreeWalk::walk(FrameView& frameView,
   m_propertyTreeBuilder.updateFramePropertiesAndContext(
       frameView, localContext.treeBuilderContext);
 
-  if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {

[wkorman, 2016/11/10 23:26:41]

Is this change also enabling SP invalidation for all cases? If so we should
update CL description.

[Xianzhu, 2016/11/10 23:35:47]

The check was just redundant. The whole code is executed only when
slimmingPaintInvalidationEnabled().

Updated CL description.

-    m_paintInvalidator.invalidatePaintIfNeeded(
-        frameView, localContext.paintInvalidatorContext);
-  }
+  m_paintInvalidator.invalidatePaintIfNeeded(
+      frameView, localContext.paintInvalidatorContext);
 
   if (LayoutView* layoutView = frameView.layoutView())
     walk(*layoutView, localContext);
 
 #if DCHECK_IS_ON()
-  if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
-    frameView.layoutView()->assertSubtreeClearedPaintInvalidationFlags();
+  frameView.layoutView()->assertSubtreeClearedPaintInvalidationFlags();
 #endif
 }
 
@@ -68,18 +65,17 @@ void PrePaintTreeWalk::walk(const LayoutObject& object,
     // positioned descendants if their containers are between the multi-column
     // container and the spanner. See PaintPropertyTreeBuilder for details.
     localContext.treeBuilderContext.isUnderMultiColumnSpanner = true;
-    object.getMutableForPainting().clearPaintInvalidationFlags();
     walk(*toLayoutMultiColumnSpannerPlaceholder(object)
               .layoutObjectInFlowThread(),
          localContext);
+    object.getMutableForPainting().clearPaintInvalidationFlags();
     return;
   }
 
   m_propertyTreeBuilder.updatePropertiesAndContextForSelf(
       object, localContext.treeBuilderContext);
-  if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
-    m_paintInvalidator.invalidatePaintIfNeeded(
-        object, localContext.paintInvalidatorContext);
+  m_paintInvalidator.invalidatePaintIfNeeded(
+      object, localContext.paintInvalidatorContext);
   m_propertyTreeBuilder.updatePropertiesAndContextForChildren(
       object, localContext.treeBuilderContext);
 
@@ -104,6 +100,7 @@ void PrePaintTreeWalk::walk(const LayoutObject& object,
     }
     // TODO(pdr): Investigate RemoteFrameView (crbug.com/579281).
   }
+  object.getMutableForPainting().clearPaintInvalidationFlags();
 }
 
 }  // namespace blink