Refactor LayoutCurrentChild

third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h

 // Copyright 2016 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.
 
 #ifndef NGBlockLayoutAlgorithm_h
 #define NGBlockLayoutAlgorithm_h
 
 #include "core/CoreExport.h"
 #include "core/layout/ng/ng_box.h"
 #include "core/layout/ng/ng_fragment_builder.h"
@@ skipping 19 matching lines @@
   // Actual layout implementation. Lays out the children in sequence within the
   // constraints given by the NGConstraintSpace. Returns a fragment with the
   // resulting layout information.
   // This function can not be const because for interruptible layout, we have
   // to be able to store state information.
   // Returns true when done; when this function returns false, it has to be
   // called again. The out parameter will only be set when this function
   // returns true. The same constraint space has to be passed each time.
   bool Layout(const NGConstraintSpace*, NGPhysicalFragment**) override;
 
-  DEFINE_INLINE_VIRTUAL_TRACE() {
-    NGLayoutAlgorithm::trace(visitor);
-    visitor->trace(first_child_);
-    visitor->trace(builder_);
-    visitor->trace(constraint_space_for_children_);
-    visitor->trace(current_child_);
-  }
+  DECLARE_VIRTUAL_TRACE();
 
  private:
   // Computes collapsed margins for 2 adjoining blocks and updates the resultant
   // fragment's MarginStrut if needed.
   // See https://www.w3.org/TR/CSS2/box.html#collapsing-margins
   //
   // @param space Constraint space for the block.
   // @param child_margins Margins information for the current child.
   // @param fragment Current child's fragment.
   // @return NGBoxStrut with margins block start/end.
@@ skipping 21 matching lines @@
   NGLogicalOffset PositionFloatFragment(const NGFragment& fragment,
                                         const NGBoxStrut& margins);
 
   // Updates block-{start|end} of the currently constructed fragment.
   //
   // This method is supposed to be called on every child but it only updates
   // the block-start once (on the first non-zero height child fragment) and
   // keeps updating block-end (on every non-zero height child).
   void UpdateMarginStrut(const NGMarginStrut& from);
 
+  bool LayoutCurrentChild(const NGConstraintSpace*);
+
   // Read-only Getters.
   const ComputedStyle& Style() const { return *style_; }
 
   RefPtr<const ComputedStyle> style_;
   Member<NGBox> first_child_;
 
   enum State { kStateInit, kStateChildLayout, kStateFinalize };
   State state_;
   Member<NGFragmentBuilder> builder_;
   Member<NGConstraintSpace> constraint_space_for_children_;
   Member<NGBox> current_child_;
   NGBoxStrut border_and_padding_;
   LayoutUnit content_size_;
   LayoutUnit max_inline_size_;
   // MarginStrut for the previous child.
   NGMarginStrut prev_child_margin_strut_;
   // Whether the block-start was set for the currently built
   // fragment's margin strut.
   bool is_fragment_margin_strut_block_start_updated_ : 1;
 };
 
 }  // namespace blink
 
 #endif  // NGBlockLayoutAlgorithm_h