Index: Source/core/rendering/RenderBox.h |
diff --git a/Source/core/rendering/RenderBox.h b/Source/core/rendering/RenderBox.h |
index 265ea14cdb91f0cc3fa14b1fd17f7a9c707466d9..65f1445e4dd2bbb2daa845e249528422196838eb 100644 |
--- a/Source/core/rendering/RenderBox.h |
+++ b/Source/core/rendering/RenderBox.h |
@@ -225,8 +225,8 @@ public: |
// IE extensions. Used to calculate offsetWidth/Height. Overridden by inlines (RenderFlow) |
// to return the remaining width on a given line (and the height of a single line). |
- virtual LayoutUnit offsetWidth() const { return width(); } |
- virtual LayoutUnit offsetHeight() const { return height(); } |
+ virtual LayoutUnit offsetWidth() const OVERRIDE { return width(); } |
+ virtual LayoutUnit offsetHeight() const OVERRIDE { return height(); } |
virtual int pixelSnappedOffsetWidth() const OVERRIDE FINAL; |
virtual int pixelSnappedOffsetHeight() const OVERRIDE FINAL; |
@@ -312,20 +312,20 @@ public: |
virtual LayoutUnit collapsedMarginBefore() const { return marginBefore(); } |
virtual LayoutUnit collapsedMarginAfter() const { return marginAfter(); } |
- virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const; |
- virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; |
+ virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE; |
+ virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE; |
LayoutRect reflectionBox() const; |
int reflectionOffset() const; |
// Given a rect in the object's coordinate space, returns the corresponding rect in the reflection. |
LayoutRect reflectedRect(const LayoutRect&) const; |
- virtual void layout(); |
- virtual void paint(PaintInfo&, const LayoutPoint&); |
+ virtual void layout() OVERRIDE; |
+ virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; |
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; |
- virtual LayoutUnit minPreferredLogicalWidth() const; |
- virtual LayoutUnit maxPreferredLogicalWidth() const; |
+ virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE; |
+ virtual LayoutUnit maxPreferredLogicalWidth() const OVERRIDE; |
// FIXME: We should rename these back to overrideLogicalHeight/Width and have them store |
// the border-box height/width like the regular height/width accessors on RenderBox. |
@@ -350,7 +350,7 @@ public: |
void clearContainingBlockOverrideSize(); |
void clearOverrideContainingBlockContentLogicalHeight(); |
- virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const; |
+ virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const OVERRIDE; |
LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const; |
LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const; |
@@ -488,7 +488,7 @@ public: |
bool hasUnsplittableScrollingOverflow() const; |
bool isUnsplittableForPagination() const; |
- virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0); |
+ virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) OVERRIDE; |
virtual LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize); |
LayoutRect clipRect(const LayoutPoint& location, RenderRegion*); |
@@ -501,7 +501,7 @@ public: |
virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&); |
virtual void paintMask(PaintInfo&, const LayoutPoint&); |
virtual void paintClippingMask(PaintInfo&, const LayoutPoint&); |
- virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); |
+ virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE; |
// Called when a positioned object moves but doesn't necessarily change size. A simplified layout is attempted |
// that just updates the object's position. If the size does change, the object remains dirty. |
@@ -613,17 +613,17 @@ public: |
} |
protected: |
- virtual void willBeDestroyed(); |
+ virtual void willBeDestroyed() OVERRIDE; |
- virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); |
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); |
+ virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) OVERRIDE; |
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE; |
virtual void updateFromStyle() OVERRIDE; |
LayoutRect backgroundPaintedExtent() const; |
virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const; |
virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE; |
- virtual void paintBackgroundWithBorderAndBoxShadow(PaintInfo&, const LayoutRect&, BackgroundBleedAvoidance); |
+ void paintBackgroundWithBorderAndBoxShadow(PaintInfo&, const LayoutRect&, BackgroundBleedAvoidance); |
void paintBackground(const PaintInfo&, const LayoutRect&, BackgroundBleedAvoidance = BackgroundBleedNone); |
void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, BackgroundBleedAvoidance, CompositeOperator, RenderObject* backgroundObject); |
@@ -643,7 +643,7 @@ protected: |
virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); } |
virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE; |
- virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const; |
+ virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const OVERRIDE; |
void paintRootBoxFillLayers(const PaintInfo&); |