diff --git a/layout/forms/nsFormControlFrame.h b/layout/forms/nsFormControlFrame.h index bc4adc51afff..182a53f9bbfd 100644 --- a/layout/forms/nsFormControlFrame.h +++ b/layout/forms/nsFormControlFrame.h @@ -45,7 +45,7 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus) MOZ_OVERRIDE; - virtual nscoord GetBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; /** * Respond to the request to resize and/or reflow diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h index 645ddef963ed..e81d79c31b55 100644 --- a/layout/generic/nsBlockFrame.h +++ b/layout/generic/nsBlockFrame.h @@ -149,8 +149,8 @@ public: nsIFrame* aOldFrame); virtual const nsFrameList& GetChildList(ChildListID aListID) const; virtual void GetChildLists(nsTArray* aLists) const; - virtual nscoord GetBaseline() const; - virtual nscoord GetCaretBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; + virtual nscoord GetCaretBaseline() const MOZ_OVERRIDE; virtual void DestroyFrom(nsIFrame* aDestructRoot); virtual nsSplittableType GetSplittableType() const; virtual bool IsFloatContainingBlock() const; diff --git a/layout/generic/nsBulletFrame.h b/layout/generic/nsBulletFrame.h index 89b67386ed67..f5a722e9f926 100644 --- a/layout/generic/nsBulletFrame.h +++ b/layout/generic/nsBulletFrame.h @@ -91,7 +91,7 @@ public: virtual bool IsEmpty() MOZ_OVERRIDE; virtual bool IsSelfEmpty() MOZ_OVERRIDE; - virtual nscoord GetBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; float GetFontSizeInflation() const; bool HasFontSizeInflation() const { diff --git a/layout/generic/nsFirstLetterFrame.h b/layout/generic/nsFirstLetterFrame.h index df7170803dc3..05b80fcbecdf 100644 --- a/layout/generic/nsFirstLetterFrame.h +++ b/layout/generic/nsFirstLetterFrame.h @@ -59,7 +59,7 @@ public: nsReflowStatus& aStatus) MOZ_OVERRIDE; virtual bool CanContinueTextRun() const MOZ_OVERRIDE; - virtual nscoord GetBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; //override of nsFrame method NS_IMETHOD GetChildFrameContainingOffset(int32_t inContentOffset, diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index c7ff4f5d30dc..c55f9988ea7e 100644 --- a/layout/generic/nsFrame.h +++ b/layout/generic/nsFrame.h @@ -159,7 +159,7 @@ public: virtual void SetAdditionalStyleContext(int32_t aIndex, nsStyleContext* aStyleContext); virtual void SetParent(nsIFrame* aParent); - virtual nscoord GetBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; virtual const nsFrameList& GetChildList(ChildListID aListID) const; virtual void GetChildLists(nsTArray* aLists) const; diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h index 51e1675f4a1d..95cddc7b62c4 100644 --- a/layout/generic/nsInlineFrame.h +++ b/layout/generic/nsInlineFrame.h @@ -91,7 +91,7 @@ public: virtual bool CanContinueTextRun() const MOZ_OVERRIDE; virtual void PullOverflowsFromPrevInFlow(); - virtual nscoord GetBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; /** * Return true if the frame is leftmost frame or continuation. diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h index 906719a563e2..21df713afb28 100644 --- a/layout/generic/nsTextFrame.h +++ b/layout/generic/nsTextFrame.h @@ -173,7 +173,7 @@ public: virtual bool IsEmpty(); virtual bool IsSelfEmpty() { return IsEmpty(); } - virtual nscoord GetBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; /** * @return true if this text frame ends with a newline character. It diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h index 85eb2e02bdf4..950a32c68e47 100644 --- a/layout/tables/nsTableFrame.h +++ b/layout/tables/nsTableFrame.h @@ -357,7 +357,7 @@ public: /** helper to get the cell spacing Y style value */ nscoord GetCellSpacingY(); - virtual nscoord GetBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; /** return the row span of a cell, taking into account row span magic at the bottom * of a table. The row span equals the number of rows spanned by aCell starting at * aStartRowIndex, and can be smaller if aStartRowIndex is greater than the row diff --git a/layout/tables/nsTableOuterFrame.h b/layout/tables/nsTableOuterFrame.h index 4b1109d50626..d35df0ddb4d5 100644 --- a/layout/tables/nsTableOuterFrame.h +++ b/layout/tables/nsTableOuterFrame.h @@ -102,7 +102,7 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists); - virtual nscoord GetBaseline() const; + virtual nscoord GetBaseline() const MOZ_OVERRIDE; virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;