[SPv2] Refactor PaintInvalidator to be multicol-ready.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/PrePaintTreeWalk.h"
 
 #include "core/dom/DocumentLifecycle.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/paint/GeometryMapper.h"
 
 namespace blink {
 
 struct PrePaintTreeWalkContext {
   PrePaintTreeWalkContext()
       : tree_builder_context(
             WTF::WrapUnique(new PaintPropertyTreeBuilderContext)),
-        paint_invalidator_context(tree_builder_context.get()),
+        paint_invalidator_context(),

[Xianzhu, 2017/05/03 17:29:44]

Nit: Remove the above line?

[chrishtr, 2017/05/03 18:04:35]

Done.

         ancestor_overflow_paint_layer(nullptr),
         ancestor_transformed_or_root_paint_layer(nullptr) {}
 
   PrePaintTreeWalkContext(const PrePaintTreeWalkContext& parent_context,
                           bool needs_tree_builder_context)
       : tree_builder_context(
             WTF::WrapUnique(needs_tree_builder_context || DCHECK_IS_ON()
                                 ? new PaintPropertyTreeBuilderContext(
                                       *parent_context.tree_builder_context)
                                 : nullptr)),
-        paint_invalidator_context(tree_builder_context.get(),
-                                  parent_context.paint_invalidator_context),
+        paint_invalidator_context(parent_context.paint_invalidator_context),
         ancestor_overflow_paint_layer(
             parent_context.ancestor_overflow_paint_layer),
         ancestor_transformed_or_root_paint_layer(
             parent_context.ancestor_transformed_or_root_paint_layer) {
 #if DCHECK_IS_ON()
     if (needs_tree_builder_context)
       DCHECK(parent_context.tree_builder_context->is_actually_needed);
     tree_builder_context->is_actually_needed = needs_tree_builder_context;
 #endif
   }
@@ skipping 42 matching lines @@
       this->NeedsTreeBuilderContextUpdate(frame_view, parent_context);
   PrePaintTreeWalkContext context(parent_context,
                                   needs_tree_builder_context_update);
   // ancestorOverflowLayer does not cross frame boundaries.
   context.ancestor_overflow_paint_layer = nullptr;
   if (context.tree_builder_context) {
     property_tree_builder_.UpdateProperties(frame_view,
                                             *context.tree_builder_context);
   }
   paint_invalidator_.InvalidatePaint(frame_view,
+                                     context.tree_builder_context.get(),
                                      context.paint_invalidator_context);
 
   if (LayoutView* view = frame_view.GetLayoutView()) {
     Walk(*view, context);
 #if DCHECK_IS_ON()
     view->AssertSubtreeClearedPaintInvalidationFlags();
 #endif
   }
   frame_view.ClearNeedsPaintPropertyUpdate();
 }
@@ skipping 198 matching lines @@
   // This must happen before updatePropertiesForSelf, because the latter reads
   // some of the state computed here.
   UpdateAuxiliaryObjectProperties(object, context);
 
   if (context.tree_builder_context) {
     DCHECK(context.tree_builder_context);
     property_tree_builder_.UpdatePropertiesForSelf(
         object, *context.tree_builder_context);
   }
 
-  paint_invalidator_.InvalidatePaint(object, context.paint_invalidator_context);
+  paint_invalidator_.InvalidatePaint(object, context.tree_builder_context.get(),
+                                     context.paint_invalidator_context);
 
   if (context.tree_builder_context) {
     property_tree_builder_.UpdatePropertiesForChildren(
         object, *context.tree_builder_context);
     InvalidatePaintLayerOptimizationsIfNeeded(object, context);
   }
 
   for (const LayoutObject* child = object.SlowFirstChild(); child;
        child = child->NextSibling()) {
     if (child->IsLayoutMultiColumnSpannerPlaceholder()) {
@@ skipping 17 matching lines @@
       }
       Walk(*frame_view, context);
     }
     // TODO(pdr): Investigate RemoteFrameView (crbug.com/579281).
   }
 
   object.GetMutableForPainting().ClearPaintFlags();
 }
 
 }  // namespace blink