| Index: third_party/WebKit/Source/core/layout/LayoutBox.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| index 05df8d3b96193fc69183ffab4b6a5b4d2fcc338b..1b8db27cf6e759dd26f7a900860536e9849a6346 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| @@ -532,10 +532,10 @@ public:
|
|
|
| LayoutSize offsetFromContainer(const LayoutObject*, const LayoutPoint&, bool* offsetDependsOnPoint = nullptr) const override;
|
|
|
| - LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
|
| - LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const;
|
| - LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
|
| - LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(LayoutUnit height) const;
|
| + LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(float width) const;
|
| + LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(float height) const;
|
| + LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(float width) const;
|
| + LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(float height) const;
|
|
|
| // ComputedMarginValues holds the actual values for margins. It ignores
|
| // margin collapsing as they are handled in LayoutBlockFlow.
|
|
|