Make NGFragment to own NGPhysicalFragment

third_party/WebKit/Source/core/layout/ng/ng_constraint_space.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 NGConstraintSpace_h
 #define NGConstraintSpace_h
 
 #include "core/CoreExport.h"
 #include "core/layout/ng/ng_physical_constraint_space.h"
 #include "core/layout/ng/ng_writing_mode.h"
 #include "platform/heap/Handle.h"
 #include "wtf/text/WTFString.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class LayoutBox;
 class NGFragment;
 class NGLayoutOpportunityIterator;
 
 // The NGConstraintSpace represents a set of constraints and available space
 // which a layout algorithm may produce a NGFragment within. It is a view on
 // top of a NGPhysicalConstraintSpace and provides accessor methods in the
 // logical coordinate system defined by the writing mode given.
 class CORE_EXPORT NGConstraintSpace final
-    : public GarbageCollected<NGConstraintSpace> {
+    : public GarbageCollectedFinalized<NGConstraintSpace> {
  public:
   // Constructs a constraint space with a new backing NGPhysicalConstraintSpace.
   // The size will be used for both for the physical constraint space's
   // container size and this constraint space's Size().
   NGConstraintSpace(NGWritingMode, NGDirection, NGLogicalSize);
 
   // Constructs a constraint space based on an existing backing
   // NGPhysicalConstraintSpace. Sets this constraint space's size to the
   // physical constraint space's container size, converted to logical
   // coordinates.
@@ skipping 17 matching lines @@
   // to use as the basis to find layout opportunities for children.
   NGConstraintSpace(NGWritingMode,
                     NGDirection,
                     const NGConstraintSpace& other,
                     NGLogicalSize);
 
   // This should live on NGBox or another layout bridge and probably take a root
   // NGConstraintSpace or a NGPhysicalConstraintSpace.
   static NGConstraintSpace* CreateFromLayoutObject(const LayoutBox&);
 
-  NGPhysicalConstraintSpace* PhysicalSpace() const { return physical_space_; }
+  NGPhysicalConstraintSpace const& PhysicalSpace() const {
+    return physical_space_;
+  }
 
   NGDirection Direction() const { return static_cast<NGDirection>(direction_); }
 
   NGWritingMode WritingMode() const {
     return static_cast<NGWritingMode>(writing_mode_);
   }
 
   // Size of the container. Used for the following three cases:
   // 1) Percentage resolution.
   // 2) Resolving absolute positions of children.
@@ skipping 30 matching lines @@
 
   // Modifies constraint space to account for a placed fragment. Depending on
   // the shape of the fragment this will either modify the inline or block
   // size, or add an exclusion.
   void Subtract(const NGFragment*);
 
   NGLayoutOpportunityIterator* LayoutOpportunities(
       unsigned clear = NGClearNone,
       bool for_inline_or_bfc = false);
 
-  DEFINE_INLINE_VIRTUAL_TRACE() { visitor->trace(physical_space_); }
-
   // The setters for the NGConstraintSpace should only be used when constructing
   // a derived NGConstraintSpace.
   void SetOverflowTriggersScrollbar(bool inlineTriggers, bool blockTriggers);
   void SetFixedSize(bool inlineFixed, bool blockFixed);
   void SetFragmentationType(NGFragmentationType);
 
   String ToString() const;
 
+  DEFINE_INLINE_TRACE(){};

[cbiesinger, 2016/09/26 17:17:55]

no semicolon here. shouldn't there be a space before {} ?

+
  private:
-  Member<NGPhysicalConstraintSpace> physical_space_;
+  NGPhysicalConstraintSpace physical_space_;
   NGLogicalOffset offset_;
   NGLogicalSize size_;
   unsigned writing_mode_ : 3;
   unsigned direction_ : 1;
 };
 
 inline std::ostream& operator<<(std::ostream& stream,
                                 const NGConstraintSpace& value) {
   return stream << value.ToString();
 }
 
 }  // namespace blink
 
 #endif  // NGConstraintSpace_h