| Index: Source/core/rendering/RenderBox.h
|
| diff --git a/Source/core/rendering/RenderBox.h b/Source/core/rendering/RenderBox.h
|
| index 65f1445e4dd2bbb2daa845e249528422196838eb..01d892fd573280d35bbc9b521fa977c4015eace1 100644
|
| --- a/Source/core/rendering/RenderBox.h
|
| +++ b/Source/core/rendering/RenderBox.h
|
| @@ -402,7 +402,7 @@ public:
|
| void repaintDuringLayoutIfMoved(const LayoutRect&);
|
| virtual void repaintOverhangingFloats(bool paintAllDescendants);
|
|
|
| - virtual LayoutUnit containingBlockLogicalWidthForContent() const;
|
| + virtual LayoutUnit containingBlockLogicalWidthForContent() const OVERRIDE;
|
| LayoutUnit containingBlockLogicalHeightForContent(AvailableLogicalHeightType) const;
|
|
|
| LayoutUnit containingBlockLogicalWidthForContentInRegion(RenderRegion*) const;
|
| @@ -537,7 +537,7 @@ public:
|
| bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrOutOfFlowPositioned() && parent() && parent()->isDeprecatedFlexibleBox(); }
|
| bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloatingOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBoxIncludingDeprecated(); }
|
|
|
| - virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
|
| + virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
|
| virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
|
|
|
| virtual LayoutUnit offsetLeft() const OVERRIDE;
|
|
|