--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -95,18 +95,18 @@ typedef mozilla::EnumSet<mozilla::gfx::C
*
* Display item's coordinates are relative to their nearest reference frame ancestor.
* Both the display root and any frame with a transform act as a reference frame
* for their frame subtrees.
*/
// All types are defined in nsDisplayItemTypes.h
#define NS_DISPLAY_DECL_NAME(n, e) \
- virtual const char* Name() { return n; } \
- virtual Type GetType() { return e; }
+ virtual const char* Name() MOZ_OVERRIDE { return n; } \
+ virtual Type GetType() MOZ_OVERRIDE { return e; }
/**
* This manages a display list and is passed as a parameter to
* nsIFrame::BuildDisplayList.
* It contains the parameters that don't change from frame to frame and manages
* the display list memory using a PLArena. It also establishes the reference
* coordinate system for all display list items. Some of the parameters are
* available from the prescontext/presshell, but we copy them into the builder
@@ -2705,17 +2705,17 @@ public:
nsRegion* aVisibleRegion) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE {
return false;
}
virtual void GetMergedFrames(nsTArray<nsIFrame*>* aFrames) MOZ_OVERRIDE
{
aFrames->AppendElements(mMergedFrames);
}
- virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) {
+ virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE {
return true;
}
virtual bool IsInvalid(nsRect& aRect) MOZ_OVERRIDE
{
if (mFrame->IsInvalid(aRect) && aRect.IsEmpty()) {
return true;
}
nsRect temp;
--- a/layout/base/nsIDocumentViewerPrint.h
+++ b/layout/base/nsIDocumentViewerPrint.h
@@ -63,23 +63,23 @@ public:
nsIPresShell* aPresShell) = 0;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentViewerPrint,
NS_IDOCUMENT_VIEWER_PRINT_IID)
/* Use this macro when declaring classes that implement this interface. */
#define NS_DECL_NSIDOCUMENTVIEWERPRINT \
- virtual void SetIsPrinting(bool aIsPrinting); \
- virtual bool GetIsPrinting(); \
- virtual void SetIsPrintPreview(bool aIsPrintPreview); \
- virtual bool GetIsPrintPreview(); \
- virtual nsresult CreateStyleSet(nsIDocument* aDocument, nsStyleSet** aStyleSet); \
- virtual void IncrementDestroyRefCount(); \
- virtual void ReturnToGalleyPresentation(); \
- virtual void OnDonePrinting(); \
- virtual bool IsInitializedForPrintPreview(); \
- virtual void InitializeForPrintPreview(); \
+ virtual void SetIsPrinting(bool aIsPrinting) MOZ_OVERRIDE; \
+ virtual bool GetIsPrinting() MOZ_OVERRIDE; \
+ virtual void SetIsPrintPreview(bool aIsPrintPreview) MOZ_OVERRIDE; \
+ virtual bool GetIsPrintPreview() MOZ_OVERRIDE; \
+ virtual nsresult CreateStyleSet(nsIDocument* aDocument, nsStyleSet** aStyleSet) MOZ_OVERRIDE; \
+ virtual void IncrementDestroyRefCount() MOZ_OVERRIDE; \
+ virtual void ReturnToGalleyPresentation() MOZ_OVERRIDE; \
+ virtual void OnDonePrinting() MOZ_OVERRIDE; \
+ virtual bool IsInitializedForPrintPreview() MOZ_OVERRIDE; \
+ virtual void InitializeForPrintPreview() MOZ_OVERRIDE; \
virtual void SetPrintPreviewPresentation(nsViewManager* aViewManager, \
nsPresContext* aPresContext, \
- nsIPresShell* aPresShell);
+ nsIPresShell* aPresShell) MOZ_OVERRIDE;
#endif /* nsIDocumentViewerPrint_h___ */
--- a/layout/base/nsPresShell.h
+++ b/layout/base/nsPresShell.h
@@ -82,17 +82,17 @@ public:
void Init(nsIDocument* aDocument, nsPresContext* aPresContext,
nsViewManager* aViewManager, nsStyleSet* aStyleSet,
nsCompatibility aCompatMode);
virtual void Destroy() MOZ_OVERRIDE;
virtual void MakeZombie() MOZ_OVERRIDE;
virtual nsresult SetPreferenceStyleRules(bool aForceReflow) MOZ_OVERRIDE;
- NS_IMETHOD GetSelection(SelectionType aType, nsISelection** aSelection);
+ NS_IMETHOD GetSelection(SelectionType aType, nsISelection** aSelection) MOZ_OVERRIDE;
virtual mozilla::dom::Selection* GetCurrentSelection(SelectionType aType) MOZ_OVERRIDE;
NS_IMETHOD SetDisplaySelection(int16_t aToggle) MOZ_OVERRIDE;
NS_IMETHOD GetDisplaySelection(int16_t *aToggle) MOZ_OVERRIDE;
NS_IMETHOD ScrollSelectionIntoView(SelectionType aType, SelectionRegion aRegion,
int16_t aFlags) MOZ_OVERRIDE;
NS_IMETHOD RepaintSelection(SelectionType aType) MOZ_OVERRIDE;
@@ -124,17 +124,17 @@ public:
/**
* Post a callback that should be handled after reflow has finished.
*/
virtual nsresult PostReflowCallback(nsIReflowCallback* aCallback) MOZ_OVERRIDE;
virtual void CancelReflowCallback(nsIReflowCallback* aCallback) MOZ_OVERRIDE;
virtual void ClearFrameRefs(nsIFrame* aFrame) MOZ_OVERRIDE;
- virtual already_AddRefed<gfxContext> CreateReferenceRenderingContext();
+ virtual already_AddRefed<gfxContext> CreateReferenceRenderingContext() MOZ_OVERRIDE;
virtual nsresult GoToAnchor(const nsAString& aAnchorName, bool aScroll,
uint32_t aAdditionalScrollFlags = 0) MOZ_OVERRIDE;
virtual nsresult ScrollToAnchor() MOZ_OVERRIDE;
virtual nsresult ScrollContentIntoView(nsIContent* aContent,
ScrollAxis aVertical,
ScrollAxis aHorizontal,
uint32_t aFlags) MOZ_OVERRIDE;
@@ -164,17 +164,17 @@ public:
mozilla::WidgetEvent* aEvent,
nsIFrame* aFrame,
nsIContent* aContent,
nsEventStatus* aStatus) MOZ_OVERRIDE;
virtual nsIFrame* GetEventTargetFrame() MOZ_OVERRIDE;
virtual already_AddRefed<nsIContent> GetEventTargetContent(
mozilla::WidgetEvent* aEvent) MOZ_OVERRIDE;
- virtual void NotifyCounterStylesAreDirty();
+ virtual void NotifyCounterStylesAreDirty() MOZ_OVERRIDE;
virtual nsresult ReconstructFrames(void) MOZ_OVERRIDE;
virtual void Freeze() MOZ_OVERRIDE;
virtual void Thaw() MOZ_OVERRIDE;
virtual void FireOrClearDelayedEvents(bool aFireEvents) MOZ_OVERRIDE;
virtual nsresult RenderDocument(const nsRect& aRect, uint32_t aFlags,
nscolor aBackgroundColor,
@@ -371,17 +371,17 @@ public:
virtual void RebuildImageVisibility(nsRect* aRect = nullptr) MOZ_OVERRIDE;
virtual void EnsureImageInVisibleList(nsIImageLoadingContent* aImage) MOZ_OVERRIDE;
virtual void RemoveImageFromVisibleList(nsIImageLoadingContent* aImage) MOZ_OVERRIDE;
virtual bool AssumeAllImagesVisible() MOZ_OVERRIDE;
- virtual void RecordShadowStyleChange(mozilla::dom::ShadowRoot* aShadowRoot);
+ virtual void RecordShadowStyleChange(mozilla::dom::ShadowRoot* aShadowRoot) MOZ_OVERRIDE;
virtual void DispatchAfterKeyboardEvent(nsINode* aTarget,
const mozilla::WidgetKeyboardEvent& aEvent,
bool aEmbeddedCancelled) MOZ_OVERRIDE;
void SetNextPaintCompressed() { mNextPaintCompressed = true; }
protected:
@@ -617,17 +617,17 @@ protected:
private:
// Private destructor, to discourage deletion outside of Release():
~nsSynthMouseMoveEvent() {
Revoke();
}
public:
- NS_INLINE_DECL_REFCOUNTING(nsSynthMouseMoveEvent)
+ NS_INLINE_DECL_REFCOUNTING(nsSynthMouseMoveEvent, MOZ_OVERRIDE)
void Revoke() {
if (mPresShell) {
mPresShell->GetPresContext()->RefreshDriver()->
RemoveRefreshObserver(this, Flush_Display);
mPresShell = nullptr;
}
}
--- a/layout/base/nsRefreshDriver.h
+++ b/layout/base/nsRefreshDriver.h
@@ -275,19 +275,19 @@ public:
virtual uint64_t GetTransactionId() MOZ_OVERRIDE;
void NotifyTransactionCompleted(uint64_t aTransactionId) MOZ_OVERRIDE;
void RevokeTransactionId(uint64_t aTransactionId) MOZ_OVERRIDE;
mozilla::TimeStamp GetTransactionStart() MOZ_OVERRIDE;
bool IsWaitingForPaint(mozilla::TimeStamp aTime);
// nsARefreshObserver
- NS_IMETHOD_(MozExternalRefCountType) AddRef(void) { return TransactionIdAllocator::AddRef(); }
- NS_IMETHOD_(MozExternalRefCountType) Release(void) { return TransactionIdAllocator::Release(); }
- virtual void WillRefresh(mozilla::TimeStamp aTime);
+ NS_IMETHOD_(MozExternalRefCountType) AddRef(void) MOZ_OVERRIDE { return TransactionIdAllocator::AddRef(); }
+ NS_IMETHOD_(MozExternalRefCountType) Release(void) MOZ_OVERRIDE { return TransactionIdAllocator::Release(); }
+ virtual void WillRefresh(mozilla::TimeStamp aTime) MOZ_OVERRIDE;
private:
typedef nsTObserverArray<nsARefreshObserver*> ObserverArray;
typedef nsTHashtable<nsISupportsHashKey> RequestTable;
struct ImageStartData {
ImageStartData()
{
}
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -391,17 +391,17 @@ public:
return false;
}
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE
{
NS_RELEASE_THIS();
}
- NS_IMETHODIMP Run()
+ NS_IMETHODIMP Run() MOZ_OVERRIDE
{
if (mFrame.IsAlive()) {
static_cast<nsComboboxControlFrame*>(mFrame.GetFrame())->
AbsolutelyPositionDropDown();
}
return NS_OK;
}
--- a/layout/forms/nsSelectsAreaFrame.cpp
+++ b/layout/forms/nsSelectsAreaFrame.cpp
@@ -31,17 +31,17 @@ class nsDisplayOptionEventGrabber : publ
public:
nsDisplayOptionEventGrabber(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame, nsDisplayItem* aItem)
: nsDisplayWrapList(aBuilder, aFrame, aItem) {}
nsDisplayOptionEventGrabber(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame, nsDisplayList* aList)
: nsDisplayWrapList(aBuilder, aFrame, aList) {}
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
- HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
+ HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE {
return false;
}
NS_DISPLAY_DECL_NAME("OptionEventGrabber", TYPE_OPTION_EVENT_GRABBER)
};
void nsDisplayOptionEventGrabber::HitTest(nsDisplayListBuilder* aBuilder,
const nsRect& aRect, HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames)
@@ -98,26 +98,26 @@ public:
MOZ_COUNT_CTOR(nsDisplayListFocus);
}
#ifdef NS_BUILD_REFCNT_LOGGING
virtual ~nsDisplayListFocus() {
MOZ_COUNT_DTOR(nsDisplayListFocus);
}
#endif
- virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) {
+ virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
// override bounds because the list item focus ring may extend outside
// the nsSelectsAreaFrame
nsListControlFrame* listFrame = GetEnclosingListFrame(Frame());
return listFrame->GetVisualOverflowRectRelativeToSelf() +
listFrame->GetOffsetToCrossDoc(ReferenceFrame());
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
- nsRenderingContext* aCtx) {
+ nsRenderingContext* aCtx) MOZ_OVERRIDE {
nsListControlFrame* listFrame = GetEnclosingListFrame(Frame());
// listFrame must be non-null or we wouldn't get called.
listFrame->PaintFocus(*aCtx, aBuilder->ToReferenceFrame(listFrame));
}
NS_DISPLAY_DECL_NAME("ListFocus", TYPE_LIST_FOCUS)
};
void
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -81,17 +81,17 @@
// Frame allocation boilerplate macros. Every subclass of nsFrame
// must define its own operator new and GetAllocatedSize. If they do
// not, the per-frame recycler lists in nsPresArena will not work
// correctly, with potentially catastrophic consequences (not enough
// memory is allocated for a frame object).
#define NS_DECL_FRAMEARENA_HELPERS \
void* operator new(size_t, nsIPresShell*) MOZ_MUST_OVERRIDE; \
- virtual nsQueryFrame::FrameIID GetFrameId() MOZ_MUST_OVERRIDE;
+ virtual nsQueryFrame::FrameIID GetFrameId() MOZ_OVERRIDE MOZ_MUST_OVERRIDE;
#define NS_IMPL_FRAMEARENA_HELPERS(class) \
void* class::operator new(size_t sz, nsIPresShell* aShell) \
{ return aShell->AllocateFrame(nsQueryFrame::class##_id, sz); } \
nsQueryFrame::FrameIID class::GetFrameId() \
{ return nsQueryFrame::class##_id; }
//----------------------------------------------------------------------
@@ -133,17 +133,18 @@ protected:
// from the "deleting destructors" that they emit in case of
// delete-expressions, so it can't even be undefined.
void operator delete(void* aPtr, size_t sz);
public:
// nsQueryFrame
NS_DECL_QUERYFRAME
- NS_DECL_FRAMEARENA_HELPERS
+ void* operator new(size_t, nsIPresShell*) MOZ_MUST_OVERRIDE;
+ virtual nsQueryFrame::FrameIID GetFrameId() MOZ_MUST_OVERRIDE;
// nsIFrame
virtual void Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual nsStyleContext* GetAdditionalStyleContext(int32_t aIndex) const MOZ_OVERRIDE;
virtual void SetAdditionalStyleContext(int32_t aIndex,
--- a/layout/generic/nsFrameUtil.cpp
+++ b/layout/generic/nsFrameUtil.cpp
@@ -18,18 +18,18 @@ class nsFrameUtil : public nsIFrameUtil
protected:
virtual ~nsFrameUtil();
public:
nsFrameUtil();
NS_DECL_ISUPPORTS
- NS_IMETHOD CompareRegressionData(FILE* aFile1, FILE* aFile2,int32_t aRegressionOutput=0);
- NS_IMETHOD DumpRegressionData(FILE* aInputFile, FILE* aOutputFile);
+ NS_IMETHOD CompareRegressionData(FILE* aFile1, FILE* aFile2,int32_t aRegressionOutput=0) MOZ_OVERRIDE;
+ NS_IMETHOD DumpRegressionData(FILE* aInputFile, FILE* aOutputFile) MOZ_OVERRIDE;
struct Node;
struct Tag;
struct NodeList {
NodeList();
~NodeList();
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1423,17 +1423,17 @@ public:
gfxPrefs::ScrollBehaviorSpringConstant(),
gfxPrefs::ScrollBehaviorDampingRatio())
, mRange(aRange)
, mLastRefreshTime(aStartTime)
, mCallee(nullptr)
{
}
- NS_INLINE_DECL_REFCOUNTING(AsyncSmoothMSDScroll)
+ NS_INLINE_DECL_REFCOUNTING(AsyncSmoothMSDScroll, MOZ_OVERRIDE)
nsSize GetVelocity() {
// In nscoords per second
return nsSize(mXAxisModel.GetVelocity(), mYAxisModel.GetVelocity());
}
nsPoint GetPosition() {
// In nscoords
@@ -1615,17 +1615,17 @@ protected:
nscoord aCurrentPos, nscoord aCurrentVelocity,
nscoord aDestination);
TimeDuration CalcDurationForEventTime(TimeStamp aTime, nsIAtom *aOrigin);
// The next section is observer/callback management
// Bodies of WillRefresh and RefreshDriver contain ScrollFrameHelper specific code.
public:
- NS_INLINE_DECL_REFCOUNTING(AsyncScroll)
+ NS_INLINE_DECL_REFCOUNTING(AsyncScroll, MOZ_OVERRIDE)
/*
* Set a refresh observer for smooth scroll iterations (and start observing).
* Should be used at most once during the lifetime of this object.
* Return value: true on success, false otherwise.
*/
bool SetRefreshObserver(ScrollFrameHelper *aCallee) {
NS_ASSERTION(aCallee && !mCallee, "AsyncScroll::SetRefreshObserver - Invalid usage.");
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -792,17 +792,17 @@ public:
virtual void RepeatButtonScroll(nsScrollbarFrame* aScrollbar) MOZ_OVERRIDE {
mHelper.RepeatButtonScroll(aScrollbar);
}
virtual void ThumbMoved(nsScrollbarFrame* aScrollbar,
nscoord aOldPos,
nscoord aNewPos) MOZ_OVERRIDE {
mHelper.ThumbMoved(aScrollbar, aOldPos, aNewPos);
}
- virtual void VisibilityChanged(bool aVisible) {}
+ virtual void VisibilityChanged(bool aVisible) MOZ_OVERRIDE {}
virtual nsIFrame* GetScrollbarBox(bool aVertical) MOZ_OVERRIDE {
return mHelper.GetScrollbarBox(aVertical);
}
virtual void ScrollbarActivityStarted() const MOZ_OVERRIDE;
virtual void ScrollbarActivityStopped() const MOZ_OVERRIDE;
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
@@ -1157,17 +1157,17 @@ public:
virtual void RepeatButtonScroll(nsScrollbarFrame* aScrollbar) MOZ_OVERRIDE {
mHelper.RepeatButtonScroll(aScrollbar);
}
virtual void ThumbMoved(nsScrollbarFrame* aScrollbar,
nscoord aOldPos,
nscoord aNewPos) MOZ_OVERRIDE {
mHelper.ThumbMoved(aScrollbar, aOldPos, aNewPos);
}
- virtual void VisibilityChanged(bool aVisible) {}
+ virtual void VisibilityChanged(bool aVisible) MOZ_OVERRIDE {}
virtual nsIFrame* GetScrollbarBox(bool aVertical) MOZ_OVERRIDE {
return mHelper.GetScrollbarBox(aVertical);
}
virtual void ScrollbarActivityStarted() const MOZ_OVERRIDE;
virtual void ScrollbarActivityStopped() const MOZ_OVERRIDE;
#ifdef DEBUG_FRAME_DUMP
--- a/layout/generic/nsQueryFrame.h
+++ b/layout/generic/nsQueryFrame.h
@@ -12,17 +12,17 @@
// NOTE: the long lines in this file are intentional to make compiler error
// messages more readable.
#define NS_DECL_QUERYFRAME_TARGET(classname) \
static const nsQueryFrame::FrameIID kFrameIID = nsQueryFrame::classname##_id; \
typedef classname Has_NS_DECL_QUERYFRAME_TARGET;
#define NS_DECL_QUERYFRAME \
- virtual void* QueryFrame(FrameIID id);
+ virtual void* QueryFrame(FrameIID id) MOZ_OVERRIDE;
#define NS_QUERYFRAME_HEAD(class) \
void* class::QueryFrame(FrameIID id) { switch (id) {
#define NS_QUERYFRAME_ENTRY(class) \
case class::kFrameIID: { \
static_assert(mozilla::IsSame<class, class::Has_NS_DECL_QUERYFRAME_TARGET>::value, \
#class " must declare itself as a queryframe target"); \
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -212,36 +212,36 @@ public:
}
}
virtual void PostDelayedTask(Task* aTask, int aDelayMs) MOZ_OVERRIDE
{
MessageLoop::current()->PostDelayedTask(FROM_HERE, aTask, aDelayMs);
}
- virtual bool GetRootZoomConstraints(ZoomConstraints* aOutConstraints)
+ virtual bool GetRootZoomConstraints(ZoomConstraints* aOutConstraints) MOZ_OVERRIDE
{
if (mHaveZoomConstraints && aOutConstraints) {
*aOutConstraints = mZoomConstraints;
}
return mHaveZoomConstraints;
}
- virtual bool GetTouchSensitiveRegion(CSSRect* aOutRegion)
+ virtual bool GetTouchSensitiveRegion(CSSRect* aOutRegion) MOZ_OVERRIDE
{
if (mTouchSensitiveRegion.IsEmpty())
return false;
*aOutRegion = CSSRect::FromAppUnits(mTouchSensitiveRegion.GetBounds());
return true;
}
virtual void NotifyAPZStateChange(const ScrollableLayerGuid& aGuid,
APZStateChange aChange,
- int aArg)
+ int aArg) MOZ_OVERRIDE
{
if (MessageLoop::current() != mUILoop) {
mUILoop->PostTask(
FROM_HERE,
NewRunnableMethod(this, &RemoteContentController::NotifyAPZStateChange,
aGuid, aChange, aArg));
return;
}
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -1845,17 +1845,17 @@ public:
}
#ifdef NS_BUILD_REFCNT_LOGGING
virtual ~nsDisplayMathMLSelectionRect() {
MOZ_COUNT_DTOR(nsDisplayMathMLSelectionRect);
}
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
- nsRenderingContext* aCtx);
+ nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("MathMLSelectionRect", TYPE_MATHML_SELECTION_RECT)
private:
nsRect mRect;
};
void nsDisplayMathMLSelectionRect::Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx)
{
@@ -1884,17 +1884,17 @@ public:
MOZ_COUNT_DTOR(nsDisplayMathMLCharBackground);
}
#endif
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder,
- nsRenderingContext* aCtx);
+ nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("MathMLCharBackground", TYPE_MATHML_CHAR_BACKGROUND)
private:
nsStyleContext* mStyleContext;
nsRect mRect;
};
void
nsDisplayMathMLCharBackground::ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
@@ -1927,46 +1927,46 @@ public:
MOZ_COUNT_CTOR(nsDisplayMathMLCharForeground);
}
#ifdef NS_BUILD_REFCNT_LOGGING
virtual ~nsDisplayMathMLCharForeground() {
MOZ_COUNT_DTOR(nsDisplayMathMLCharForeground);
}
#endif
- virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) {
+ virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
nsRect rect;
mChar->GetRect(rect);
nsPoint offset = ToReferenceFrame() + rect.TopLeft();
nsBoundingMetrics bm;
mChar->GetBoundingMetrics(bm);
nsRect temp(offset.x + bm.leftBearing, offset.y,
bm.rightBearing - bm.leftBearing, bm.ascent + bm.descent);
// Bug 748220
temp.Inflate(mFrame->PresContext()->AppUnitsPerDevPixel());
return temp;
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
- nsRenderingContext* aCtx)
+ nsRenderingContext* aCtx) MOZ_OVERRIDE
{
mChar->PaintForeground(mFrame->PresContext(), *aCtx,
ToReferenceFrame(), mIsSelected);
}
NS_DISPLAY_DECL_NAME("MathMLCharForeground", TYPE_MATHML_CHAR_FOREGROUND)
- virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder)
+ virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE
{
bool snap;
return GetBounds(aBuilder, &snap);
}
- virtual uint32_t GetPerFrameKey() {
+ virtual uint32_t GetPerFrameKey() MOZ_OVERRIDE {
return (mIndex << nsDisplayItem::TYPE_BITS)
| nsDisplayItem::GetPerFrameKey();
}
private:
nsMathMLChar* mChar;
uint32_t mIndex;
bool mIsSelected;
@@ -1982,17 +1982,17 @@ public:
}
#ifdef NS_BUILD_REFCNT_LOGGING
virtual ~nsDisplayMathMLCharDebug() {
MOZ_COUNT_DTOR(nsDisplayMathMLCharDebug);
}
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
- nsRenderingContext* aCtx);
+ nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("MathMLCharDebug", TYPE_MATHML_CHAR_DEBUG)
private:
nsRect mRect;
};
void nsDisplayMathMLCharDebug::Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx)
--- a/layout/mathml/nsMathMLSelectedFrame.h
+++ b/layout/mathml/nsMathMLSelectedFrame.h
@@ -35,17 +35,17 @@ public:
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
virtual void
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus) MOZ_OVERRIDE;
- virtual nsQueryFrame::FrameIID GetFrameId() = 0;
+ virtual nsQueryFrame::FrameIID GetFrameId() MOZ_OVERRIDE = 0;
protected:
explicit nsMathMLSelectedFrame(nsStyleContext* aContext) :
nsMathMLContainerFrame(aContext) {}
virtual ~nsMathMLSelectedFrame();
virtual nsIFrame* GetSelectedFrame() = 0;
nsIFrame* mSelectedFrame;
--- a/layout/svg/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/nsSVGPathGeometryFrame.cpp
@@ -68,19 +68,19 @@ public:
virtual ~nsDisplaySVGPathGeometry() {
MOZ_COUNT_DTOR(nsDisplaySVGPathGeometry);
}
#endif
NS_DISPLAY_DECL_NAME("nsDisplaySVGPathGeometry", TYPE_SVG_PATH_GEOMETRY)
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
- HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
+ HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder,
- nsRenderingContext* aCtx);
+ nsRenderingContext* aCtx) MOZ_OVERRIDE;
};
void
nsDisplaySVGPathGeometry::HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames)
{
nsSVGPathGeometryFrame *frame = static_cast<nsSVGPathGeometryFrame*>(mFrame);
nsPoint pointRelativeToReferenceFrame = aRect.Center();
--- a/layout/xul/nsGroupBoxFrame.cpp
+++ b/layout/xul/nsGroupBoxFrame.cpp
@@ -19,40 +19,40 @@ using namespace mozilla::gfx;
class nsGroupBoxFrame : public nsBoxFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
explicit nsGroupBoxFrame(nsStyleContext* aContext):
nsBoxFrame(aContext) {}
- virtual nsresult GetBorderAndPadding(nsMargin& aBorderAndPadding);
+ virtual nsresult GetBorderAndPadding(nsMargin& aBorderAndPadding) MOZ_OVERRIDE;
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
#ifdef DEBUG_FRAME_DUMP
- virtual nsresult GetFrameName(nsAString& aResult) const {
+ virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
return MakeFrameName(NS_LITERAL_STRING("GroupBoxFrame"), aResult);
}
#endif
- virtual bool HonorPrintBackgroundSettings() { return false; }
+ virtual bool HonorPrintBackgroundSettings() MOZ_OVERRIDE { return false; }
void PaintBorderBackground(nsRenderingContext& aRenderingContext,
nsPoint aPt, const nsRect& aDirtyRect);
// make sure we our kids get our orient and align instead of us.
// our child box has no content node so it will search for a parent with one.
// that will be us.
- virtual void GetInitialOrientation(bool& aHorizontal) { aHorizontal = false; }
- virtual bool GetInitialHAlignment(Halignment& aHalign) { aHalign = hAlign_Left; return true; }
- virtual bool GetInitialVAlignment(Valignment& aValign) { aValign = vAlign_Top; return true; }
- virtual bool GetInitialAutoStretch(bool& aStretch) { aStretch = true; return true; }
+ virtual void GetInitialOrientation(bool& aHorizontal) MOZ_OVERRIDE { aHorizontal = false; }
+ virtual bool GetInitialHAlignment(Halignment& aHalign) MOZ_OVERRIDE { aHalign = hAlign_Left; return true; }
+ virtual bool GetInitialVAlignment(Valignment& aValign) MOZ_OVERRIDE { aValign = vAlign_Top; return true; }
+ virtual bool GetInitialAutoStretch(bool& aStretch) MOZ_OVERRIDE { aStretch = true; return true; }
nsIFrame* GetCaptionBox(nsPresContext* aPresContext, nsRect& aCaptionRect);
};
/*
class nsGroupBoxInnerFrame : public nsBoxFrame {
public:
@@ -89,21 +89,21 @@ public:
}
#ifdef NS_BUILD_REFCNT_LOGGING
virtual ~nsDisplayXULGroupBackground() {
MOZ_COUNT_DTOR(nsDisplayXULGroupBackground);
}
#endif
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
- HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) {
+ HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE {
aOutFrames->AppendElement(mFrame);
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
- nsRenderingContext* aCtx);
+ nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("XULGroupBackground", TYPE_XUL_GROUP_BACKGROUND)
};
void
nsDisplayXULGroupBackground::Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx)
{
static_cast<nsGroupBoxFrame*>(mFrame)->