| Index: third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.h
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.h b/third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.h
|
| index 9ee6640ae281ec7c87024a73cae1b4cdd6f0d155..d8eed991cd0bbade4dddce69905e79ad57a61adf 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.h
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_physical_constraint_space.h
|
| @@ -27,33 +27,6 @@ enum NGFragmentationType {
|
| FragmentRegion
|
| };
|
|
|
| -struct NGExclusion : public GarbageCollected<NGExclusion> {
|
| - NGExclusion(LayoutUnit top,
|
| - LayoutUnit right,
|
| - LayoutUnit bottom,
|
| - LayoutUnit left) {
|
| - rect.offset.left = left;
|
| - rect.offset.top = top;
|
| - rect.size.width = right - left;
|
| - rect.size.height = bottom - top;
|
| - }
|
| - LayoutUnit Top() const { return rect.offset.top; }
|
| - LayoutUnit Right() const { return rect.size.width + rect.offset.left; }
|
| - LayoutUnit Bottom() const { return rect.size.height + rect.offset.top; }
|
| - LayoutUnit Left() const { return rect.offset.left; }
|
| -
|
| - String ToString() const {
|
| - return String::format("%s,%s %sx%s",
|
| - rect.offset.left.toString().ascii().data(),
|
| - rect.offset.top.toString().ascii().data(),
|
| - rect.size.width.toString().ascii().data(),
|
| - rect.size.height.toString().ascii().data());
|
| - }
|
| - NGPhysicalRect rect;
|
| -
|
| - DEFINE_INLINE_TRACE() {}
|
| -};
|
| -
|
| // The NGPhysicalConstraintSpace contains the underlying data for the
|
| // NGConstraintSpace. It is not meant to be used directly as all members are in
|
| // the physical coordinate space. Instead NGConstraintSpace should be used.
|
| @@ -75,11 +48,11 @@ class CORE_EXPORT NGPhysicalConstraintSpace final
|
|
|
| NGPhysicalSize ContainerSize() const { return container_size_; }
|
|
|
| - void AddExclusion(const NGExclusion*, unsigned options = 0);
|
| - const HeapVector<Member<const NGExclusion>>& Exclusions(
|
| + void AddExclusion(const NGLogicalRect&, unsigned options = 0);
|
| + const Vector<std::unique_ptr<const NGLogicalRect>>& Exclusions(
|
| unsigned options = 0) const;
|
|
|
| - DEFINE_INLINE_TRACE() { visitor->trace(exclusions_); }
|
| + DEFINE_INLINE_TRACE() {}
|
|
|
| private:
|
| friend class NGConstraintSpace;
|
| @@ -97,7 +70,7 @@ class CORE_EXPORT NGPhysicalConstraintSpace final
|
| // formatting Context
|
| unsigned is_new_fc_ : 1;
|
|
|
| - HeapVector<Member<const NGExclusion>> exclusions_;
|
| + Vector<std::unique_ptr<const NGLogicalRect>> exclusions_;
|
| };
|
|
|
| } // namespace blink
|
|
|