Index: third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h |
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h |
index 67bc21fa2adbaef016fcbaebcc1e4d8d042e7609..a838477e15a523cb6d12066fb7cc4a8345b061a3 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h |
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h |
@@ -23,7 +23,7 @@ class NGLayoutOpportunityIterator; |
// 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 |
@@ -61,7 +61,9 @@ class CORE_EXPORT NGConstraintSpace final |
// 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_); } |
@@ -112,8 +114,6 @@ class CORE_EXPORT NGConstraintSpace final |
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); |
@@ -122,8 +122,10 @@ class CORE_EXPORT NGConstraintSpace final |
String ToString() const; |
+ DEFINE_INLINE_TRACE(){}; |
cbiesinger
2016/09/26 17:17:55
no semicolon here. shouldn't there be a space befo
|
+ |
private: |
- Member<NGPhysicalConstraintSpace> physical_space_; |
+ NGPhysicalConstraintSpace physical_space_; |
NGLogicalOffset offset_; |
NGLogicalSize size_; |
unsigned writing_mode_ : 3; |