Cleanup: remove state variables from inline_algorithm

third_party/WebKit/Source/core/layout/ng/ng_inline_layout_algorithm.cc

 // 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.
 
 #include "core/layout/ng/ng_inline_layout_algorithm.h"
 
 #include "core/layout/ng/ng_break_token.h"
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/layout/ng/ng_constraint_space_builder.h"
 #include "core/layout/ng/ng_fragment.h"
@@ skipping 18 matching lines @@
       break_token_(break_token) {
   DCHECK(style_);
 }
 
 NGPhysicalFragment* NGInlineLayoutAlgorithm::Layout() {
   // TODO(kojii): Implement sizing and child constraint spaces. Share common
   // logic with NGBlockLayoutAlgorithm using composition.
   builder_ = new NGFragmentBuilder(NGPhysicalFragment::kFragmentBox);
   builder_->SetWritingMode(constraint_space_->WritingMode());
   builder_->SetDirection(constraint_space_->Direction());
-  current_child_ = first_child_;
-

[ikilpatrick, 2017/01/23 23:21:36]

my newlines /o\!

[atotic, 2017/01/23 23:31:21]

done. newline is back.

+  NGInlineNode* current_child = first_child_;
+  Member<NGLineBuilder> line_builder;
   // TODO(kojii): Since line_builder_ is bound to NGLayoutInlineItem
-  // in current_child_, changing the current_child_ needs more work.
-  if (current_child_) {
-    space_for_current_child_ = CreateConstraintSpaceForCurrentChild();
-    line_builder_ = new NGLineBuilder(current_child_, space_for_current_child_);
-    current_child_->LayoutInline(space_for_current_child_, line_builder_);
+  // in current_child, changing the current_child needs more work.
+  if (current_child) {
+    Member<NGConstraintSpace> space_for_current_child =
+        CreateConstraintSpaceForCurrentChild(*current_child);
+    line_builder = new NGLineBuilder(current_child, space_for_current_child);
+    current_child->LayoutInline(space_for_current_child, line_builder);
   }
-
-  line_builder_->CreateFragments(builder_);
+  line_builder->CreateFragments(builder_);
   NGPhysicalFragment* fragment = builder_->ToBoxFragment();
-  line_builder_->CopyFragmentDataToLayoutBlockFlow();
+  line_builder->CopyFragmentDataToLayoutBlockFlow();
   return fragment;
 }
 
 NGConstraintSpace*
-NGInlineLayoutAlgorithm::CreateConstraintSpaceForCurrentChild() const {
-  DCHECK(current_child_);
+NGInlineLayoutAlgorithm::CreateConstraintSpaceForCurrentChild(
+    const NGInlineNode& current_child) const {
   // TODO(kojii): Implement child constraint space.
   NGConstraintSpace* child_space =
       NGConstraintSpaceBuilder(constraint_space_->WritingMode())
           .SetTextDirection(constraint_space_->Direction())
           .ToConstraintSpace();
   return child_space;
 }
 
 DEFINE_TRACE(NGInlineLayoutAlgorithm) {
   NGLayoutAlgorithm::trace(visitor);
   visitor->trace(first_child_);
   visitor->trace(constraint_space_);
   visitor->trace(break_token_);
   visitor->trace(builder_);
-  visitor->trace(space_for_current_child_);
-  visitor->trace(current_child_);
-  visitor->trace(line_builder_);
 }
 
 }  // namespace blink