[layoutng] Split NGLayoutResult out of NGPhysicalFragment

third_party/WebKit/Source/core/layout/ng/ng_block_node.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 NGBlockNode_h
 #define NGBlockNode_h
 
 #include "core/CoreExport.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/ng/ng_layout_input_node.h"
+#include "core/layout/ng/ng_layout_result.h"
 #include "core/layout/ng/ng_physical_box_fragment.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class ComputedStyle;
 class LayoutObject;
 class NGBreakToken;
 class NGConstraintSpace;
+class NGLayoutResult;
 struct NGLogicalOffset;
-class NGPhysicalFragment;
 struct MinAndMaxContentSizes;
 
 // Represents a node to be laid out.
 class CORE_EXPORT NGBlockNode final : public NGLayoutInputNode {
   friend NGLayoutInputNode;
 
  public:
   explicit NGBlockNode(LayoutObject*);
 
   // TODO(layout-ng): make it private and declare a friend class to use in tests
   explicit NGBlockNode(ComputedStyle*);
 
   ~NGBlockNode() override;
 
-  RefPtr<NGPhysicalFragment> Layout(
-      NGConstraintSpace* constraint_space) override;
+  RefPtr<NGLayoutResult> Layout(NGConstraintSpace* constraint_space) override;
   NGBlockNode* NextSibling() override;
   LayoutObject* GetLayoutObject() override;
 
   // Computes the value of min-content and max-content for this box.
   // If the underlying layout algorithm's ComputeMinAndMaxContentSizes returns
   // no value, this function will synthesize these sizes using Layout with
   // special constraint spaces -- infinite available size for max content, zero
   // available size for min content, and percentage resolution size zero for
   // both.
   MinAndMaxContentSizes ComputeMinAndMaxContentSizes();
 
   const ComputedStyle& Style() const;
 
   NGLayoutInputNode* FirstChild();
 
   void SetNextSibling(NGBlockNode*);
   void SetFirstChild(NGLayoutInputNode*);
 
-  void SetFragment(NGPhysicalBoxFragment* fragment) { fragment_ = fragment; }
+  /// void SetFragment(NGPhysicalBoxFragment* fragment) { fragment_ = fragment;

[ikilpatrick, 2017/02/21 22:26:02]

remove or fix, or something :)

[cbiesinger, 2017/02/22 18:09:00]

Ah, you were too fast, I uploaded a second patchset a few minutes after the
first which had fixed this already :)

+  /// }
   NGBreakToken* CurrentBreakToken() const;
   bool IsLayoutFinished() const {
-    return fragment_ && !fragment_->BreakToken();
+    return layout_result_ && !layout_result_->PhysicalFragment()->BreakToken();
   }
 
   DECLARE_VIRTUAL_TRACE();
 
   // Runs layout on layout_box_ and creates a fragment for the resulting
   // geometry.
-  RefPtr<NGPhysicalBoxFragment> RunOldLayout(const NGConstraintSpace&);
+  RefPtr<NGLayoutResult> RunOldLayout(const NGConstraintSpace&);
 
   // Called if this is an out-of-flow block which needs to be
   // positioned with legacy layout.
   void UseOldOutOfFlowPositioning();
 
   // Save static position for legacy AbsPos layout.
   void SaveStaticOffsetForLegacy(const NGLogicalOffset&);
  private:
 
   bool CanUseNewLayout();
   bool HasInlineChildren();
 
   // After we run the layout algorithm, this function copies back the geometry
   // data to the layout box.
   void CopyFragmentDataToLayoutBox(const NGConstraintSpace&);
 
   // We can either wrap a layout_box_ or a style_/next_sibling_/first_child_
   // combination.
   LayoutBox* layout_box_;
   RefPtr<ComputedStyle> style_;
   Member<NGBlockNode> next_sibling_;
   Member<NGLayoutInputNode> first_child_;
   // TODO(mstensho): An input node may produce multiple fragments, so this
-  // should probably be renamed to last_fragment_ or something like that, since
+  // should probably be renamed to last_result_ or something like that, since
   // the last fragment is all we care about when resuming layout.
-  RefPtr<NGPhysicalBoxFragment> fragment_;
+  RefPtr<NGLayoutResult> layout_result_;
 };
 
 DEFINE_TYPE_CASTS(NGBlockNode,
                   NGLayoutInputNode,
                   node,
                   node->Type() == NGLayoutInputNode::kLegacyBlock,
                   node.Type() == NGLayoutInputNode::kLegacyBlock);
 
 }  // namespace blink
 
 #endif  // NGBlockNode