| 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 c1571cbdf8195fff29c4c6def26801d7cb8284e6..6f9dac6712d3592836b663bea590e22b5362b6a2 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| @@ -422,8 +422,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 Element*) const final;
|
| int pixelSnappedOffsetHeight(const Element*) const final;
|
| @@ -840,8 +840,8 @@ public:
|
| LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
| int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
|
|
| - LayoutUnit offsetLeft(const Element*) const final;
|
| - LayoutUnit offsetTop(const Element*) const final;
|
| + LayoutUnit offsetLeft(const Element*) const override;
|
| + LayoutUnit offsetTop(const Element*) const override;
|
|
|
| LayoutPoint flipForWritingModeForChild(const LayoutBox* child, const LayoutPoint&) const;
|
| LayoutUnit flipForWritingMode(LayoutUnit position) const WARN_UNUSED_RETURN {
|
|
|