[LayoutNG] Remove style_ and layout_result_ members on NGBlockNode.

third_party/WebKit/Source/core/layout/ng/ng_block_node.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_block_node.h"
 
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/line/InlineIterator.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
@@ skipping 67 matching lines @@
 // Need an explicit destructor in the .cc file, or the MSWIN compiler will
 // produce an error when attempting to generate a default one, if the .h file is
 // included from a compilation unit that lacks the ComputedStyle definition.
 NGBlockNode::~NGBlockNode() {}
 
 RefPtr<NGLayoutResult> NGBlockNode::Layout(NGConstraintSpace* constraint_space,
                                            NGBreakToken* break_token) {
   // Use the old layout code and synthesize a fragment.
   if (!CanUseNewLayout()) {
     DCHECK(layout_box_);
-    layout_result_ = RunOldLayout(*constraint_space);
-    return layout_result_;
+    return RunOldLayout(*constraint_space);
   }
 
-  layout_result_ = NGBlockLayoutAlgorithm(this, constraint_space,
-                                          toNGBlockBreakToken(break_token))
-                       .Layout();
+  RefPtr<NGLayoutResult> layout_result =
+      NGBlockLayoutAlgorithm(this, constraint_space,
+                             toNGBlockBreakToken(break_token))
+          .Layout();
 
-  CopyFragmentDataToLayoutBox(*constraint_space);
-  return layout_result_;
+  CopyFragmentDataToLayoutBox(*constraint_space, layout_result.get());
+  return layout_result;
 }
 
 MinAndMaxContentSizes NGBlockNode::ComputeMinAndMaxContentSizes() {
   MinAndMaxContentSizes sizes;
   if (!CanUseNewLayout()) {
     DCHECK(layout_box_);
     // TODO(layout-ng): This could be somewhat optimized by directly calling
     // computeIntrinsicLogicalWidths, but that function is currently private.
     // Consider doing that if this becomes a performance issue.
     LayoutUnit borderAndPadding = layout_box_->borderAndPaddingLogicalWidth();
@@ skipping 40 matching lines @@
 
   layout_result = Layout(constraint_space.get());
   physical_fragment = layout_result->PhysicalFragment().get();
   NGBoxFragment max_fragment(FromPlatformWritingMode(Style().getWritingMode()),
                              toNGPhysicalBoxFragment(physical_fragment));
   sizes.max_content = max_fragment.InlineOverflow();
   return sizes;
 }
 
 const ComputedStyle& NGBlockNode::Style() const {
-  if (style_)
-    return *style_.get();
   DCHECK(layout_box_);
   return layout_box_->styleRef();
 }
 
 NGLayoutInputNode* NGBlockNode::NextSibling() {
   if (!next_sibling_) {
     LayoutObject* next_sibling =
         layout_box_ ? layout_box_->nextSibling() : nullptr;
     if (next_sibling) {
       if (next_sibling->isInline())
@@ skipping 49 matching lines @@
   while (child) {
     if (child->isInline())
       return true;
     child = child->nextSibling();
   }
 
   return false;
 }
 
 void NGBlockNode::CopyFragmentDataToLayoutBox(
-    const NGConstraintSpace& constraint_space) {
+    const NGConstraintSpace& constraint_space,
+    NGLayoutResult* layout_result) {
   // We may not have a layout_box_ during unit tests.
   if (!layout_box_)
     return;
 
   NGPhysicalBoxFragment* fragment =
-      toNGPhysicalBoxFragment(layout_result_->PhysicalFragment().get());
+      toNGPhysicalBoxFragment(layout_result->PhysicalFragment().get());
 
   layout_box_->setWidth(fragment->Width());
   layout_box_->setHeight(fragment->Height());
   NGBoxStrut border_and_padding = ComputeBorders(constraint_space, Style()) +
                                   ComputePadding(constraint_space, Style());
   LayoutUnit intrinsic_logical_height =
       layout_box_->style()->isHorizontalWritingMode()
           ? fragment->HeightOverflow()
           : fragment->WidthOverflow();
   intrinsic_logical_height -= border_and_padding.BlockSum();
@@ skipping 104 matching lines @@
 // Save static position for legacy AbsPos layout.
 void NGBlockNode::SaveStaticOffsetForLegacy(const NGLogicalOffset& offset) {
   DCHECK(layout_box_);
   DCHECK(layout_box_->isOutOfFlowPositioned());
   DCHECK(layout_box_->layer());
   layout_box_->layer()->setStaticBlockPosition(offset.block_offset);
   layout_box_->layer()->setStaticInlinePosition(offset.inline_offset);
 }
 
 }  // namespace blink