| Index: third_party/WebKit/Source/core/layout/ng/ng_length_utils.h
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_length_utils.h b/third_party/WebKit/Source/core/layout/ng/ng_length_utils.h
|
| index a42f1dae0656b6ccf159c8a52784dbffc78d4087..cf5615bed5b4f778d597fbad738a81ee15d868a7 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_length_utils.h
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_length_utils.h
|
| @@ -12,8 +12,9 @@ class ComputedStyle;
|
| class LayoutUnit;
|
| class Length;
|
| class NGConstraintSpace;
|
| +struct NGBoxMargins;
|
|
|
| -enum class LengthResolveType { MinSize, MaxSize, ContentSize };
|
| +enum class LengthResolveType { MinSize, MaxSize, ContentSize, MarginSize };
|
|
|
| // Convert an inline-axis length to a layout unit using the given constraint
|
| // space.
|
| @@ -38,9 +39,12 @@ CORE_EXPORT LayoutUnit computeInlineSizeForFragment(const NGConstraintSpace&,
|
| // logical height and max logical height properties from the ComputedStyle
|
| // object.
|
| CORE_EXPORT LayoutUnit computeBlockSizeForFragment(const NGConstraintSpace&,
|
| - const ComputedStyle& style,
|
| + const ComputedStyle&,
|
| LayoutUnit contentSize);
|
|
|
| +CORE_EXPORT NGBoxMargins computeMargins(const NGConstraintSpace&,
|
| + const ComputedStyle&);
|
| +
|
| } // namespace blink
|
|
|
| #endif // NGLengthUtils_h
|
|
|