| 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 9e1e9ebb755523fc61b29dd2d20f46fde8f7beaa..2b2c7a0b4a952f0f6d71f610a0a8f3082deb4947 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| @@ -388,8 +388,8 @@ public:
|
|
|
| // IE extensions. Used to calculate offsetWidth/Height. Overridden by inlines (LayoutFlow)
|
| // to return the remaining width on a given line (and the height of a single line).
|
| - LayoutUnit offsetWidth() const final { return m_frameRect.width(); }
|
| - LayoutUnit offsetHeight() const final { return m_frameRect.height(); }
|
| + LayoutUnit offsetWidth() const override { return m_frameRect.width(); }
|
| + LayoutUnit offsetHeight() const override { return m_frameRect.height(); }
|
|
|
| int pixelSnappedOffsetWidth() const final;
|
| int pixelSnappedOffsetHeight() const final;
|
| @@ -729,8 +729,8 @@ public:
|
| LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
| int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
|
|
| - LayoutUnit offsetLeft() const final;
|
| - LayoutUnit offsetTop() const final;
|
| + LayoutUnit offsetLeft() const override;
|
| + LayoutUnit offsetTop() const override;
|
|
|
| LayoutPoint flipForWritingModeForChild(const LayoutBox* child, const LayoutPoint&) const;
|
| LayoutUnit flipForWritingMode(LayoutUnit position) const WARN_UNUSED_RETURN {
|
|
|