mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 974687 - Part 1: Add about 300 MOZ_OVERRIDE in layout/. r=dholbert

This commit is contained in:
Arnaud Sourioux 2014-02-24 09:41:56 -05:00
Родитель 40d90dfa23
Коммит a127266e74
73 изменённых файлов: 317 добавлений и 314 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
layout/base/nsBidiPresUtils.cpp
Просмотреть файл

@ -2031,20 +2031,20 @@ public:
virtual void SetText(const char16_t* aText,
int32_t aLength,
nsBidiDirection aDirection)
nsBidiDirection aDirection) MOZ_OVERRIDE
{
mTextRunConstructionContext->SetTextRunRTL(aDirection==NSBIDI_RTL);
mText = aText;
mLength = aLength;
}
virtual nscoord GetWidth()
virtual nscoord GetWidth() MOZ_OVERRIDE
{
return mTextRunConstructionContext->GetWidth(mText, mLength);
}
virtual void DrawText(nscoord aXOffset,
nscoord)
nscoord) MOZ_OVERRIDE
{
mCtx->FontMetrics()->DrawString(mText, mLength, mPt.x + aXOffset, mPt.y,
mCtx, mTextRunConstructionContext);

18
layout/base/nsDisplayList.h
Просмотреть файл

@ -1736,7 +1736,7 @@ public:
}
NS_DISPLAY_DECL_NAME(mName, mType)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) {
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE {
if (mType == nsDisplayItem::TYPE_HEADER_FOOTER) {
bool snap;
return GetBounds(aBuilder, &snap);
@ -1908,7 +1908,7 @@ public:
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Border", TYPE_BORDER)
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder);
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
@ -2227,9 +2227,9 @@ public:
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion* aInvalidRegion);
nsRegion* aInvalidRegion) MOZ_OVERRIDE;
virtual bool ApplyOpacity(float aOpacity)
virtual bool ApplyOpacity(float aOpacity) MOZ_OVERRIDE
{
mOpacity = aOpacity;
return true;
@ -2264,7 +2264,7 @@ public:
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("BoxShadowInner", TYPE_BOX_SHADOW_INNER)
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder)
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE
{
return new nsDisplayBoxShadowInnerGeometry(this, aBuilder);
}
@ -2465,7 +2465,7 @@ public:
}
NS_DISPLAY_DECL_NAME("WrapList", TYPE_WRAP_LIST)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder);
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
virtual nsDisplayList* GetSameCoordinateSystemChildren() MOZ_OVERRIDE
{
@ -2596,7 +2596,7 @@ public:
virtual ~nsDisplayMixBlendMode();
#endif
nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder, bool* aSnap);
nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
@ -2936,7 +2936,7 @@ public:
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aParameters);
const ContainerLayerParameters& aParameters) MOZ_OVERRIDE;
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
@ -3004,7 +3004,7 @@ public:
NS_DISPLAY_DECL_NAME("nsDisplayTransform", TYPE_TRANSFORM)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE
{
if (mStoredList.GetComponentAlphaBounds(aBuilder).IsEmpty())
return nsRect();

2
layout/base/nsDocumentViewer.cpp
Просмотреть файл

@ -447,7 +447,7 @@ public:
nsDocumentShownDispatcher(nsCOMPtr<nsIDocument> aDocument)
: mDocument(aDocument) {}
NS_IMETHOD Run();
NS_IMETHOD Run() MOZ_OVERRIDE;
private:
nsCOMPtr<nsIDocument> mDocument;

20
layout/base/nsFrameTraversal.cpp
Просмотреть файл

@ -19,13 +19,13 @@ public:
virtual ~nsFrameIterator() {}
virtual void First();
virtual void Next();
virtual nsIFrame* CurrentItem();
virtual bool IsDone();
virtual void First() MOZ_OVERRIDE;
virtual void Next() MOZ_OVERRIDE;
virtual nsIFrame* CurrentItem() MOZ_OVERRIDE;
virtual bool IsDone() MOZ_OVERRIDE;
virtual void Last();
virtual void Prev();
virtual void Last() MOZ_OVERRIDE;
virtual void Prev() MOZ_OVERRIDE;
nsFrameIterator(nsPresContext* aPresContext, nsIFrame *aStart,
nsIteratorType aType, bool aLockScroll, bool aFollowOOFs);
@ -106,11 +106,11 @@ public:
nsFrameIterator(aPresContext, aStart, aType, aLockScroll, aFollowOOFs) {}
protected:
nsIFrame* GetFirstChildInner(nsIFrame* aFrame);
nsIFrame* GetLastChildInner(nsIFrame* aFrame);
nsIFrame* GetFirstChildInner(nsIFrame* aFrame) MOZ_OVERRIDE;
nsIFrame* GetLastChildInner(nsIFrame* aFrame) MOZ_OVERRIDE;
nsIFrame* GetNextSiblingInner(nsIFrame* aFrame);
nsIFrame* GetPrevSiblingInner(nsIFrame* aFrame);
nsIFrame* GetNextSiblingInner(nsIFrame* aFrame) MOZ_OVERRIDE;
nsIFrame* GetPrevSiblingInner(nsIFrame* aFrame) MOZ_OVERRIDE;
};
/************IMPLEMENTATIONS**************/

14
layout/base/nsLayoutDebugger.cpp
Просмотреть файл

@ -27,22 +27,22 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD SetShowFrameBorders(bool aEnable);
NS_IMETHOD SetShowFrameBorders(bool aEnable) MOZ_OVERRIDE;
NS_IMETHOD GetShowFrameBorders(bool* aResult);
NS_IMETHOD GetShowFrameBorders(bool* aResult) MOZ_OVERRIDE;
NS_IMETHOD SetShowEventTargetFrameBorder(bool aEnable);
NS_IMETHOD SetShowEventTargetFrameBorder(bool aEnable) MOZ_OVERRIDE;
NS_IMETHOD GetShowEventTargetFrameBorder(bool* aResult);
NS_IMETHOD GetShowEventTargetFrameBorder(bool* aResult) MOZ_OVERRIDE;
NS_IMETHOD GetContentSize(nsIDocument* aDocument,
int32_t* aSizeInBytesResult);
int32_t* aSizeInBytesResult) MOZ_OVERRIDE;
NS_IMETHOD GetFrameSize(nsIPresShell* aPresentation,
int32_t* aSizeInBytesResult);
int32_t* aSizeInBytesResult) MOZ_OVERRIDE;
NS_IMETHOD GetStyleSize(nsIPresShell* aPresentation,
int32_t* aSizeInBytesResult);
int32_t* aSizeInBytesResult) MOZ_OVERRIDE;
};

2
layout/base/nsLayoutUtils.cpp
Просмотреть файл

@ -2562,7 +2562,7 @@ struct BoxToRect : public nsLayoutUtils::BoxCallback {
uint32_t aFlags)
: mRelativeTo(aRelativeTo), mCallback(aCallback), mFlags(aFlags) {}
virtual void AddBox(nsIFrame* aFrame) {
virtual void AddBox(nsIFrame* aFrame) MOZ_OVERRIDE {
nsRect r;
nsIFrame* outer = nsSVGUtils::GetOuterSVGFrameAndCoveredRegion(aFrame, &r);
if (!outer) {

2
layout/base/nsPresContext.cpp
Просмотреть файл

@ -2462,7 +2462,7 @@ public:
"DOMPaintEvent requested for a detached pres context");
mList.TakeFrom(aList);
}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
// The pres context might have been detached during the delay -
// that's fine, just don't fire the event.

4
layout/base/nsPresShell.cpp
Просмотреть файл

@ -448,7 +448,7 @@ class MOZ_STACK_CLASS nsPresShellEventCB : public nsDispatchingCallback
public:
nsPresShellEventCB(PresShell* aPresShell) : mPresShell(aPresShell) {}
virtual void HandleEvent(nsEventChainPostVisitor& aVisitor)
virtual void HandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE
{
if (aVisitor.mPresContext && aVisitor.mEvent->eventStructType != NS_EVENT) {
if (aVisitor.mEvent->message == NS_MOUSE_BUTTON_DOWN ||
@ -501,7 +501,7 @@ public:
// Fires the "before-first-paint" event so that interested parties (right now, the
// mobile browser) are aware of it.
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
nsCOMPtr<nsIObserverService> observerService =
mozilla::services::GetObserverService();

12
layout/forms/nsButtonFrameRenderer.cpp
Просмотреть файл

@ -73,8 +73,8 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("ButtonBoxShadowOuter", TYPE_BUTTON_BOX_SHADOW_OUTER)
private:
nsButtonFrameRenderer* mBFR;
@ -112,12 +112,12 @@ public:
#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);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE;
@ -147,7 +147,7 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("ButtonForeground", TYPE_BUTTON_FOREGROUND)
private:
nsButtonFrameRenderer* mBFR;

14
layout/forms/nsComboboxControlFrame.cpp
Просмотреть файл

@ -75,7 +75,7 @@ class nsComboButtonListener : public nsIDOMEventListener
public:
NS_DECL_ISUPPORTS
NS_IMETHOD HandleEvent(nsIDOMEvent*)
NS_IMETHOD HandleEvent(nsIDOMEvent*) MOZ_OVERRIDE
{
mComboBox->ShowDropDown(!mComboBox->IsDroppedDown());
return NS_OK;
@ -371,14 +371,14 @@ public:
MOZ_COUNT_DTOR(nsResizeDropdownAtFinalPosition);
}
virtual bool ReflowFinished()
virtual bool ReflowFinished() MOZ_OVERRIDE
{
Run();
NS_RELEASE_THIS();
return false;
}
virtual void ReflowCallbackCanceled()
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE
{
NS_RELEASE_THIS();
}
@ -1218,9 +1218,9 @@ public:
// Need this so that line layout knows that this block's width
// depends on the available width.
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return nsBlockFrame::IsFrameOfType(aFlags &
~(nsIFrame::eReplacedContainsBlock));
@ -1229,7 +1229,7 @@ public:
virtual nsresult Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -1449,7 +1449,7 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("ComboboxFocus", TYPE_COMBOBOX_FOCUS)
};

6
layout/forms/nsComboboxControlFrame.h
Просмотреть файл

@ -76,7 +76,7 @@ public:
virtual nsresult HandleEvent(nsPresContext* aPresContext,
mozilla::WidgetGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -95,7 +95,7 @@ public:
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
}
virtual nsIScrollableFrame* GetScrollTargetFrame() {
virtual nsIScrollableFrame* GetScrollTargetFrame() MOZ_OVERRIDE {
return do_QueryFrame(mDropdownFrame);
}
@ -108,7 +108,7 @@ public:
virtual const nsFrameList& GetChildList(ChildListID aListID) const MOZ_OVERRIDE;
virtual void GetChildLists(nsTArray<ChildList>* aLists) const MOZ_OVERRIDE;
virtual nsIFrame* GetContentInsertionFrame();
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE;
// nsIFormControlFrame
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;

4
layout/forms/nsFieldSetFrame.cpp
Просмотреть файл

@ -106,9 +106,9 @@ public:
#endif
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;
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE;

23
layout/forms/nsFieldSetFrame.h
Просмотреть файл

@ -6,6 +6,7 @@
#ifndef nsFieldSetFrame_h___
#define nsFieldSetFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
class nsFieldSetFrame MOZ_FINAL : public nsContainerFrame
@ -18,13 +19,13 @@ public:
NS_HIDDEN_(nscoord)
GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicWidthType);
virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext* aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
nsSize aMargin, nsSize aBorder, nsSize aPadding,
uint32_t aFlags) MOZ_OVERRIDE;
virtual nscoord GetBaseline() const;
virtual nscoord GetBaseline() const MOZ_OVERRIDE;
/**
* The area to paint box-shadows around. It's the border rect except
@ -35,7 +36,7 @@ public:
virtual nsresult Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -45,15 +46,15 @@ public:
nsPoint aPt, const nsRect& aDirtyRect, uint32_t aBGFlags);
virtual nsresult AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
virtual nsresult InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
virtual nsresult RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nsIAtom* GetType() const;
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return nsContainerFrame::IsFrameOfType(aFlags &
~nsIFrame::eCanContainOverflowContainers);
@ -69,11 +70,11 @@ public:
#ifdef DEBUG
virtual nsresult SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
#endif
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const {
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
return MakeFrameName(NS_LITERAL_STRING("FieldSet"), aResult);
}
#endif

4
layout/forms/nsFileControlFrame.h
Просмотреть файл

@ -49,8 +49,8 @@ public:
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType) MOZ_OVERRIDE;
virtual void ContentStatesChanged(nsEventStates aStates);
virtual bool IsLeaf() const
virtual void ContentStatesChanged(nsEventStates aStates) MOZ_OVERRIDE;
virtual bool IsLeaf() const MOZ_OVERRIDE
{
return true;
}

3
layout/forms/nsNumberControlFrame.h
Просмотреть файл

@ -6,6 +6,7 @@
#ifndef nsNumberControlFrame_h__
#define nsNumberControlFrame_h__
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsIFormControlFrame.h"
#include "nsIAnonymousContentCreator.h"
@ -43,7 +44,7 @@ public:
NS_DECL_FRAMEARENA_HELPERS
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual void ContentStatesChanged(nsEventStates aStates);
virtual void ContentStatesChanged(nsEventStates aStates) MOZ_OVERRIDE;
virtual bool IsLeaf() const MOZ_OVERRIDE { return true; }
#ifdef ACCESSIBILITY

6
layout/generic/TextOverflow.cpp
Просмотреть файл

@ -167,16 +167,16 @@ public:
MOZ_COUNT_DTOR(nsDisplayTextOverflowMarker);
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) {
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
nsRect shadowRect =
nsLayoutUtils::GetTextShadowRectsUnion(mRect, mFrame);
return mRect.Union(shadowRect);
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual uint32_t GetPerFrameKey() {
virtual uint32_t GetPerFrameKey() MOZ_OVERRIDE {
return (mIndex << nsDisplayItem::TYPE_BITS) | nsDisplayItem::GetPerFrameKey();
}
void PaintTextToContext(nsRenderingContext* aCtx,

24
layout/generic/nsBRFrame.cpp
Просмотреть файл

@ -26,28 +26,28 @@ public:
friend nsIFrame* NS_NewBRFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
virtual ContentOffsets CalcContentOffsetsFromFramePoint(nsPoint aPoint);
virtual ContentOffsets CalcContentOffsetsFromFramePoint(nsPoint aPoint) MOZ_OVERRIDE;
virtual bool PeekOffsetNoAmount(bool aForward, int32_t* aOffset);
virtual bool PeekOffsetNoAmount(bool aForward, int32_t* aOffset) MOZ_OVERRIDE;
virtual bool PeekOffsetCharacter(bool aForward, int32_t* aOffset,
bool aRespectClusters = true);
bool aRespectClusters = true) MOZ_OVERRIDE;
virtual bool PeekOffsetWord(bool aForward, bool aWordSelectEatSpace, bool aIsKeyboardSelect,
int32_t* aOffset, PeekWordState* aState);
int32_t* aOffset, PeekWordState* aState) MOZ_OVERRIDE;
virtual nsresult Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
InlineMinWidthData *aData);
InlineMinWidthData *aData) MOZ_OVERRIDE;
virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
InlinePrefWidthData *aData);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual nsIAtom* GetType() const;
virtual nscoord GetBaseline() const;
InlinePrefWidthData *aData) MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual nscoord GetBaseline() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced |
nsIFrame::eLineParticipant));

12
layout/generic/nsBulletFrame.cpp
Просмотреть файл

@ -206,33 +206,33 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
{
*aSnap = false;
return mFrame->GetVisualOverflowRectRelativeToSelf() + ToReferenceFrame();
}
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("Bullet", TYPE_BULLET)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE
{
bool snap;
return GetBounds(aBuilder, &snap);
}
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder)
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE
{
return new nsDisplayBulletGeometry(this, aBuilder);
}
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion)
nsRegion *aInvalidRegion) MOZ_OVERRIDE
{
const nsDisplayBulletGeometry* geometry = static_cast<const nsDisplayBulletGeometry*>(aGeometry);
nsBulletFrame* f = static_cast<nsBulletFrame*>(mFrame);

4
layout/generic/nsCanvasFrame.cpp
Просмотреть файл

@ -301,7 +301,7 @@ public:
MOZ_COUNT_DTOR(nsDisplayCanvasFocus);
}
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
{
*aSnap = false;
// This is an overestimate, but that's not a problem.
@ -310,7 +310,7 @@ public:
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx)
nsRenderingContext* aCtx) MOZ_OVERRIDE
{
nsCanvasFrame* frame = static_cast<nsCanvasFrame*>(mFrame);
frame->PaintFocus(*aCtx, ToReferenceFrame());

2
layout/generic/nsFrame.cpp
Просмотреть файл

@ -1351,7 +1351,7 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("SelectionOverlay", TYPE_SELECTION_OVERLAY)
private:
int16_t mSelectionValue;

26
layout/generic/nsFrameSetFrame.cpp
Просмотреть файл

@ -83,15 +83,15 @@ public:
NS_DECL_FRAMEARENA_HELPERS
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const;
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual nsresult HandleEvent(nsPresContext* aPresContext,
WidgetGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
virtual nsresult GetCursor(const nsPoint& aPoint,
nsIFrame::Cursor& aCursor);
nsIFrame::Cursor& aCursor) MOZ_OVERRIDE;
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -100,7 +100,7 @@ public:
virtual nsresult Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
bool GetVisibility() { return mVisibility || mVisibilityOverride; }
void SetVisibility(bool aVisibility);
@ -111,8 +111,8 @@ public:
protected:
nsHTMLFramesetBorderFrame(nsStyleContext* aContext, int32_t aWidth, bool aVertical, bool aVisible);
virtual ~nsHTMLFramesetBorderFrame();
virtual nscoord GetIntrinsicWidth();
virtual nscoord GetIntrinsicHeight();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
// the prev and next neighbors are indexes into the row (for a horizontal border) or col (for
// a vertical border) of nsHTMLFramesetFrames or nsHTMLFrames
@ -137,7 +137,7 @@ public:
NS_DECL_FRAMEARENA_HELPERS
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("FramesetBlank"), aResult);
}
@ -150,13 +150,13 @@ public:
virtual nsresult Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
protected:
nsHTMLFramesetBlankFrame(nsStyleContext* aContext) : nsLeafFrame(aContext) {}
virtual ~nsHTMLFramesetBlankFrame();
virtual nscoord GetIntrinsicWidth();
virtual nscoord GetIntrinsicHeight();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
friend class nsHTMLFramesetFrame;
friend class nsHTMLFrameset;
@ -1470,11 +1470,11 @@ public:
// REVIEW: see old GetFrameForPoint
// Receives events in its bounds
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("FramesetBorder", TYPE_FRAMESET_BORDER)
};
@ -1673,7 +1673,7 @@ public:
}
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("FramesetBlank", TYPE_FRAMESET_BLANK)
};

6
layout/generic/nsGfxScrollFrame.cpp
Просмотреть файл

@ -1335,7 +1335,7 @@ public:
return true;
}
virtual void WillRefresh(mozilla::TimeStamp aTime) {
virtual void WillRefresh(mozilla::TimeStamp aTime) MOZ_OVERRIDE {
// The callback may release "this".
// We don't access members after returning, so no need for KungFuDeathGrip.
ScrollFrameHelper::AsyncScrollCallback(mCallee, aTime);
@ -2196,13 +2196,13 @@ public:
virtual nsDisplayItem* WrapList(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame,
nsDisplayList* aList) {
nsDisplayList* aList) MOZ_OVERRIDE {
SetCount(++mCount);
return new (aBuilder) nsDisplayScrollLayer(aBuilder, aList, mScrolledFrame, mScrolledFrame, mScrollFrame);
}
virtual nsDisplayItem* WrapItem(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem) {
nsDisplayItem* aItem) MOZ_OVERRIDE {
SetCount(++mCount);
return new (aBuilder) nsDisplayScrollLayer(aBuilder, aItem, aItem->Frame(), mScrolledFrame, mScrollFrame);

4
layout/generic/nsGfxScrollFrame.h
Просмотреть файл

@ -536,7 +536,7 @@ public:
virtual nsIFrame* GetScrolledFrame() const MOZ_OVERRIDE {
return mHelper.GetScrolledFrame();
}
virtual mozilla::ScrollbarStyles GetScrollbarStyles() const {
virtual mozilla::ScrollbarStyles GetScrollbarStyles() const MOZ_OVERRIDE {
return mHelper.GetScrollbarStylesFromFrame();
}
virtual uint32_t GetScrollbarVisibility() const MOZ_OVERRIDE {
@ -843,7 +843,7 @@ public:
virtual nsIFrame* GetScrolledFrame() const MOZ_OVERRIDE {
return mHelper.GetScrolledFrame();
}
virtual mozilla::ScrollbarStyles GetScrollbarStyles() const {
virtual mozilla::ScrollbarStyles GetScrollbarStyles() const MOZ_OVERRIDE {
return mHelper.GetScrollbarStylesFromFrame();
}
virtual uint32_t GetScrollbarVisibility() const MOZ_OVERRIDE {

8
layout/generic/nsHTMLCanvasFrame.cpp
Просмотреть файл

@ -36,7 +36,7 @@ public:
NS_DISPLAY_DECL_NAME("nsDisplayCanvas", TYPE_CANVAS)
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap) {
bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
nsIFrame* f = Frame();
HTMLCanvasElement *canvas =
@ -48,7 +48,7 @@ public:
return result;
}
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) {
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE {
*aSnap = true;
nsHTMLCanvasFrame* f = static_cast<nsHTMLCanvasFrame*>(Frame());
return f->GetInnerArea() + ToReferenceFrame();
@ -56,14 +56,14 @@ public:
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aContainerParameters)
const ContainerLayerParameters& aContainerParameters) MOZ_OVERRIDE
{
return static_cast<nsHTMLCanvasFrame*>(mFrame)->
BuildLayer(aBuilder, aManager, this, aContainerParameters);
}
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aParameters)
const ContainerLayerParameters& aParameters) MOZ_OVERRIDE
{
if (HTMLCanvasElement::FromContent(mFrame->GetContent())->ShouldForceInactiveLayer(aManager))
return LAYER_INACTIVE;

4
layout/generic/nsImageFrame.cpp
Просмотреть файл

@ -1072,13 +1072,13 @@ public:
nsDisplayAltFeedback(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)
: nsDisplayItem(aBuilder, aFrame) {}
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
{
*aSnap = false;
return mFrame->GetVisualOverflowRectRelativeToSelf() + ToReferenceFrame();
}
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx)
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE
{
nsImageFrame* f = static_cast<nsImageFrame*>(mFrame);
nsEventStates state = f->GetContent()->AsElement()->State();

30
layout/generic/nsImageMap.cpp
Просмотреть файл

@ -266,9 +266,9 @@ class DefaultArea : public Area {
public:
DefaultArea(nsIContent* aArea);
virtual bool IsInside(nscoord x, nscoord y) const;
virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
virtual void GetRect(nsIFrame* aFrame, nsRect& aRect);
virtual bool IsInside(nscoord x, nscoord y) const MOZ_OVERRIDE;
virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC) MOZ_OVERRIDE;
virtual void GetRect(nsIFrame* aFrame, nsRect& aRect) MOZ_OVERRIDE;
};
DefaultArea::DefaultArea(nsIContent* aArea)
@ -311,10 +311,10 @@ class RectArea : public Area {
public:
RectArea(nsIContent* aArea);
virtual void ParseCoords(const nsAString& aSpec);
virtual bool IsInside(nscoord x, nscoord y) const;
virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
virtual void GetRect(nsIFrame* aFrame, nsRect& aRect);
virtual void ParseCoords(const nsAString& aSpec) MOZ_OVERRIDE;
virtual bool IsInside(nscoord x, nscoord y) const MOZ_OVERRIDE;
virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC) MOZ_OVERRIDE;
virtual void GetRect(nsIFrame* aFrame, nsRect& aRect) MOZ_OVERRIDE;
};
RectArea::RectArea(nsIContent* aArea)
@ -413,10 +413,10 @@ class PolyArea : public Area {
public:
PolyArea(nsIContent* aArea);
virtual void ParseCoords(const nsAString& aSpec);
virtual bool IsInside(nscoord x, nscoord y) const;
virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
virtual void GetRect(nsIFrame* aFrame, nsRect& aRect);
virtual void ParseCoords(const nsAString& aSpec) MOZ_OVERRIDE;
virtual bool IsInside(nscoord x, nscoord y) const MOZ_OVERRIDE;
virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC) MOZ_OVERRIDE;
virtual void GetRect(nsIFrame* aFrame, nsRect& aRect) MOZ_OVERRIDE;
};
PolyArea::PolyArea(nsIContent* aArea)
@ -553,10 +553,10 @@ class CircleArea : public Area {
public:
CircleArea(nsIContent* aArea);
virtual void ParseCoords(const nsAString& aSpec);
virtual bool IsInside(nscoord x, nscoord y) const;
virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC);
virtual void GetRect(nsIFrame* aFrame, nsRect& aRect);
virtual void ParseCoords(const nsAString& aSpec) MOZ_OVERRIDE;
virtual bool IsInside(nscoord x, nscoord y) const MOZ_OVERRIDE;
virtual void Draw(nsIFrame* aFrame, nsRenderingContext& aRC) MOZ_OVERRIDE;
virtual void GetRect(nsIFrame* aFrame, nsRect& aRect) MOZ_OVERRIDE;
};
CircleArea::CircleArea(nsIContent* aArea)

16
layout/generic/nsObjectFrame.cpp
Просмотреть файл

@ -855,23 +855,23 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("PluginReadback", TYPE_PLUGIN_READBACK)
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aContainerParameters)
const ContainerLayerParameters& aContainerParameters) MOZ_OVERRIDE
{
return static_cast<nsObjectFrame*>(mFrame)->BuildLayer(aBuilder, aManager, this, aContainerParameters);
}
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aParameters)
const ContainerLayerParameters& aParameters) MOZ_OVERRIDE
{
return LAYER_ACTIVE;
}
@ -925,23 +925,23 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("PluginVideo", TYPE_PLUGIN_VIDEO)
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aContainerParameters)
const ContainerLayerParameters& aContainerParameters) MOZ_OVERRIDE
{
return static_cast<nsObjectFrame*>(mFrame)->BuildLayer(aBuilder, aManager, this, aContainerParameters);
}
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aParameters)
const ContainerLayerParameters& aParameters) MOZ_OVERRIDE
{
return LAYER_ACTIVE;
}

2
layout/generic/nsSelection.cpp
Просмотреть файл

@ -200,7 +200,7 @@ public:
return NS_OK;
}
NS_IMETHOD Notify(nsITimer *timer)
NS_IMETHOD Notify(nsITimer *timer) MOZ_OVERRIDE
{
if (mSelection && mPresContext)
{

2
layout/generic/nsSplittableFrame.h
Просмотреть файл

@ -96,7 +96,7 @@ protected:
* @see nsIFrame::GetSkipSides()
* @see nsIFrame::ApplySkipSides()
*/
virtual int GetSkipSides(const nsHTMLReflowState* aReflowState = nullptr) const;
virtual int GetSkipSides(const nsHTMLReflowState* aReflowState = nullptr) const MOZ_OVERRIDE;
#ifdef DEBUG
virtual void DumpBaseRegressionData(nsPresContext* aPresContext, FILE* out, int32_t aIndent) MOZ_OVERRIDE;

32
layout/generic/nsTextFrame.cpp
Просмотреть файл

@ -977,7 +977,7 @@ public:
mChangedBreaks(false), mExistingTextRun(aExistingTextRun) {}
virtual void SetBreaks(uint32_t aOffset, uint32_t aLength,
uint8_t* aBreakBefore) {
uint8_t* aBreakBefore) MOZ_OVERRIDE {
if (mTextRun->SetPotentialLineBreaks(aOffset + mOffsetIntoTextRun, aLength,
aBreakBefore, mContext)) {
mChangedBreaks = true;
@ -987,7 +987,7 @@ public:
}
virtual void SetCapitalization(uint32_t aOffset, uint32_t aLength,
bool* aCapitalize) {
bool* aCapitalize) MOZ_OVERRIDE {
NS_ASSERTION(mTextRun->GetFlags() & nsTextFrameUtils::TEXT_IS_TRANSFORMED,
"Text run should be transformed!");
nsTransformedTextRun* transformedTextRun =
@ -3925,12 +3925,12 @@ public:
nsIFrame* aParent,
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual nsIFrame* GetPrevContinuation() const {
virtual nsIFrame* GetPrevContinuation() const MOZ_OVERRIDE {
return mPrevContinuation;
}
virtual void SetPrevContinuation(nsIFrame* aPrevContinuation) {
virtual void SetPrevContinuation(nsIFrame* aPrevContinuation) MOZ_OVERRIDE {
NS_ASSERTION (!aPrevContinuation || GetType() == aPrevContinuation->GetType(),
"setting a prev continuation with incorrect type!");
NS_ASSERTION (!nsSplittableFrame::IsInPrevContinuationChain(aPrevContinuation, this),
@ -3938,7 +3938,7 @@ public:
mPrevContinuation = aPrevContinuation;
RemoveStateBits(NS_FRAME_IS_FLUID_CONTINUATION);
}
virtual nsIFrame* GetPrevInFlowVirtual() const { return GetPrevInFlow(); }
virtual nsIFrame* GetPrevInFlowVirtual() const MOZ_OVERRIDE { return GetPrevInFlow(); }
nsIFrame* GetPrevInFlow() const {
return (GetStateBits() & NS_FRAME_IS_FLUID_CONTINUATION) ? mPrevContinuation : nullptr;
}
@ -3954,15 +3954,15 @@ public:
virtual nsIFrame* FirstContinuation() const MOZ_OVERRIDE;
virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
InlineMinWidthData *aData);
InlineMinWidthData *aData) MOZ_OVERRIDE;
virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
InlinePrefWidthData *aData);
InlinePrefWidthData *aData) MOZ_OVERRIDE;
virtual nsresult GetRenderedText(nsAString* aString = nullptr,
gfxSkipChars* aSkipChars = nullptr,
gfxSkipCharsIterator* aSkipIter = nullptr,
uint32_t aSkippedStartOffset = 0,
uint32_t aSkippedMaxLength = UINT32_MAX)
uint32_t aSkippedMaxLength = UINT32_MAX) MOZ_OVERRIDE
{ return NS_ERROR_NOT_IMPLEMENTED; } // Call on a primary text frame only
protected:
@ -4478,7 +4478,7 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) {
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
nsRect temp = mFrame->GetVisualOverflowRectRelativeToSelf() + ToReferenceFrame();
// Bug 748228
@ -4486,29 +4486,29 @@ public:
return temp;
}
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) {
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE {
if (nsRect(ToReferenceFrame(), mFrame->GetSize()).Intersects(aRect)) {
aOutFrames->AppendElement(mFrame);
}
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Text", TYPE_TEXT)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE
{
bool snap;
return GetBounds(aBuilder, &snap);
}
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder)
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE
{
return new nsDisplayTextGeometry(this, aBuilder);
}
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion)
nsRegion *aInvalidRegion) MOZ_OVERRIDE
{
const nsDisplayTextGeometry* geometry = static_cast<const nsDisplayTextGeometry*>(aGeometry);
nsTextFrame* f = static_cast<nsTextFrame*>(mFrame);
@ -4526,7 +4526,7 @@ public:
}
}
virtual void DisableComponentAlpha() { mDisableSubpixelAA = true; }
virtual void DisableComponentAlpha() MOZ_OVERRIDE { mDisableSubpixelAA = true; }
bool mDisableSubpixelAA;
};

8
layout/generic/nsVideoFrame.cpp
Просмотреть файл

@ -230,7 +230,7 @@ class DispatchResizeToControls : public nsRunnable
public:
DispatchResizeToControls(nsIContent* aContent)
: mContent(aContent) {}
NS_IMETHOD Run() {
NS_IMETHOD Run() MOZ_OVERRIDE {
nsContentUtils::DispatchTrustedEvent(mContent->OwnerDoc(), mContent,
NS_LITERAL_STRING("resizevideocontrols"),
false, false);
@ -383,7 +383,7 @@ public:
// away completely (e.g. because of a decoder error). The problem would
// be especially acute if we have off-main-thread rendering.
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
{
*aSnap = true;
nsIFrame* f = Frame();
@ -392,14 +392,14 @@ public:
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aContainerParameters)
const ContainerLayerParameters& aContainerParameters) MOZ_OVERRIDE
{
return static_cast<nsVideoFrame*>(mFrame)->BuildLayer(aBuilder, aManager, this, aContainerParameters);
}
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aParameters)
const ContainerLayerParameters& aParameters) MOZ_OVERRIDE
{
if (aManager->IsCompositingCheap()) {
// Since ImageLayers don't require additional memory of the

6
layout/mathml/nsMathMLContainerFrame.cpp
Просмотреть файл

@ -80,7 +80,7 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("MathMLError", TYPE_MATHML_ERROR)
};
@ -1319,10 +1319,10 @@ nsMathMLContainerFrame::PositionRowChildFrames(nscoord aOffsetX,
class ForceReflow : public nsIReflowCallback {
public:
virtual bool ReflowFinished() {
virtual bool ReflowFinished() MOZ_OVERRIDE {
return true;
}
virtual void ReflowCallbackCanceled() {}
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE {}
};
// We only need one of these so we just make it a static global, no need

4
layout/mathml/nsMathMLFrame.cpp
Просмотреть файл

@ -284,7 +284,7 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("MathMLBoundingMetrics", TYPE_MATHML_BOUNDING_METRICS)
private:
nsRect mRect;
@ -329,7 +329,7 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("MathMLBar", TYPE_MATHML_BAR)
private:
nsRect mRect;

2
layout/mathml/nsMathMLmencloseFrame.cpp
Просмотреть файл

@ -724,7 +724,7 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("MathMLMencloseNotation", TYPE_MATHML_MENCLOSE_NOTATION)
private:

2
layout/mathml/nsMathMLmfracFrame.cpp
Просмотреть файл

@ -519,7 +519,7 @@ public:
}
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("MathMLSlash", TYPE_MATHML_SLASH)
private:

6
layout/mathml/nsMathMLmtableFrame.h
Просмотреть файл

@ -194,10 +194,10 @@ public:
nsIAtom* aAttribute,
int32_t aModType) MOZ_OVERRIDE;
virtual uint8_t GetVerticalAlign() const;
virtual uint8_t GetVerticalAlign() const MOZ_OVERRIDE;
virtual nsresult ProcessBorders(nsTableFrame* aFrame,
nsDisplayListBuilder* aBuilder,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
virtual int32_t GetRowSpan() MOZ_OVERRIDE;
virtual int32_t GetColSpan() MOZ_OVERRIDE;
@ -246,7 +246,7 @@ public:
~(nsIFrame::eMathML | nsIFrame::eExcludesIgnorableWhitespace));
}
virtual const nsStyleText* StyleTextForLineLayout();
virtual const nsStyleText* StyleTextForLineLayout() MOZ_OVERRIDE;
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
protected:

2
layout/printing/nsPrintEngine.cpp
Просмотреть файл

@ -3605,7 +3605,7 @@ public:
NS_ASSERTION(mDocViewerPrint, "mDocViewerPrint is null.");
}
NS_IMETHOD Run() {
NS_IMETHOD Run() MOZ_OVERRIDE {
if (mDocViewerPrint)
mDocViewerPrint->OnDonePrinting();
return NS_OK;

12
layout/style/StyleRule.cpp
Просмотреть файл

@ -970,19 +970,19 @@ public:
DOMCSSDeclarationImpl(css::StyleRule *aRule);
virtual ~DOMCSSDeclarationImpl(void);
NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent);
NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent) MOZ_OVERRIDE;
void DropReference(void);
virtual css::Declaration* GetCSSDeclaration(bool aAllocate);
virtual nsresult SetCSSDeclaration(css::Declaration* aDecl);
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv);
virtual nsIDocument* DocToUpdate();
virtual css::Declaration* GetCSSDeclaration(bool aAllocate) MOZ_OVERRIDE;
virtual nsresult SetCSSDeclaration(css::Declaration* aDecl) MOZ_OVERRIDE;
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv) MOZ_OVERRIDE;
virtual nsIDocument* DocToUpdate() MOZ_OVERRIDE;
// Override |AddRef| and |Release| for being a member of
// |DOMCSSStyleRule|. Also, we need to forward QI for cycle
// collection things to DOMCSSStyleRule.
NS_DECL_ISUPPORTS_INHERITED
virtual nsINode *GetParentObject()
virtual nsINode *GetParentObject() MOZ_OVERRIDE
{
return mRule ? mRule->GetDocument() : nullptr;
}

2
layout/style/nsDOMCSSAttrDeclaration.h
Просмотреть файл

@ -39,7 +39,7 @@ public:
virtual nsINode* GetParentObject() MOZ_OVERRIDE;
NS_IMETHOD SetPropertyValue(const nsCSSProperty aPropID,
const nsAString& aValue);
const nsAString& aValue) MOZ_OVERRIDE;
protected:
virtual nsresult SetCSSDeclaration(mozilla::css::Declaration* aDecl) MOZ_OVERRIDE;

11
layout/style/nsFontFaceLoader.h
Просмотреть файл

@ -9,6 +9,7 @@
#ifndef nsFontFaceLoader_h_
#define nsFontFaceLoader_h_
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIStreamLoader.h"
#include "nsIChannel.h"
@ -36,7 +37,7 @@ public:
// returns whether load process successfully started or not
nsresult StartLoad(gfxMixedFontFamily* aFamily,
gfxProxyFontEntry* aFontToLoad,
const gfxFontFaceSrc* aFontFaceSrc);
const gfxFontFaceSrc* aFontFaceSrc) MOZ_OVERRIDE;
// Called by nsFontFaceLoader when the loader has completed normally.
// It's removed from the mLoaders set.
@ -48,7 +49,7 @@ public:
virtual void ReplaceFontEntry(gfxMixedFontFamily* aFamily,
gfxProxyFontEntry* aProxy,
gfxFontEntry* aFontEntry);
gfxFontEntry* aFontEntry) MOZ_OVERRIDE;
nsCSSFontFaceRule* FindRuleForEntry(gfxFontEntry* aFontEntry);
@ -70,16 +71,16 @@ protected:
gfxProxyFontEntry* aProxy,
const char* aMessage,
uint32_t aFlags = nsIScriptError::errorFlag,
nsresult aStatus = NS_OK);
nsresult aStatus = NS_OK) MOZ_OVERRIDE;
virtual nsresult CheckFontLoad(const gfxFontFaceSrc* aFontFaceSrc,
nsIPrincipal** aPrincipal,
bool* aBypassCache);
bool* aBypassCache) MOZ_OVERRIDE;
virtual nsresult SyncLoadFontData(gfxProxyFontEntry* aFontToLoad,
const gfxFontFaceSrc* aFontFaceSrc,
uint8_t*& aBuffer,
uint32_t& aBufferLength);
uint32_t& aBufferLength) MOZ_OVERRIDE;
virtual bool GetPrivateBrowsing() MOZ_OVERRIDE;

10
layout/svg/SVGFEContainerFrame.cpp
Просмотреть файл

@ -31,14 +31,14 @@ protected:
public:
NS_DECL_FRAMEARENA_HELPERS
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return SVGFEContainerFrameBase::IsFrameOfType(
aFlags & ~(nsIFrame::eSVG | nsIFrame::eSVGContainer));
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("SVGFEContainer"), aResult);
}
@ -54,13 +54,13 @@ public:
*
* @see nsGkAtoms::svgFEContainerFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual bool UpdateOverflow() {
virtual bool UpdateOverflow() MOZ_OVERRIDE {
// We don't maintain a visual overflow rect
return false;
}

12
layout/svg/SVGFEImageFrame.cpp
Просмотреть файл

@ -34,15 +34,15 @@ public:
virtual void Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return SVGFEImageFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG));
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("SVGFEImage"), aResult);
}
@ -53,13 +53,13 @@ public:
*
* @see nsGkAtoms::svgFEImageFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual bool UpdateOverflow() {
virtual bool UpdateOverflow() MOZ_OVERRIDE {
// We don't maintain a visual overflow rect
return false;
}

10
layout/svg/SVGFELeafFrame.cpp
Просмотреть файл

@ -35,13 +35,13 @@ public:
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
#endif
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return SVGFELeafFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG));
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("SVGFELeaf"), aResult);
}
@ -52,13 +52,13 @@ public:
*
* @see nsGkAtoms::svgFELeafFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual bool UpdateOverflow() {
virtual bool UpdateOverflow() MOZ_OVERRIDE {
// We don't maintain a visual overflow rect
return false;
}

10
layout/svg/SVGFEUnstyledLeafFrame.cpp
Просмотреть файл

@ -29,13 +29,13 @@ public:
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists) MOZ_OVERRIDE {}
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return SVGFEUnstyledLeafFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG));
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("SVGFEUnstyledLeaf"), aResult);
}
@ -46,13 +46,13 @@ public:
*
* @see nsGkAtoms::svgFEUnstyledLeafFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual bool UpdateOverflow() {
virtual bool UpdateOverflow() MOZ_OVERRIDE {
// We don't maintain a visual overflow rect
return false;
}

26
layout/svg/SVGTextFrame.cpp
Просмотреть файл

@ -2707,17 +2707,17 @@ public:
{
}
void NotifyBeforeText(nscolor aColor);
void NotifyGlyphPathEmitted();
void NotifyBeforeSVGGlyphPainted();
void NotifyAfterSVGGlyphPainted();
void NotifyAfterText();
void NotifyBeforeSelectionBackground(nscolor aColor);
void NotifySelectionBackgroundPathEmitted();
void NotifyBeforeDecorationLine(nscolor aColor);
void NotifyDecorationLinePathEmitted();
void NotifyBeforeSelectionDecorationLine(nscolor aColor);
void NotifySelectionDecorationLinePathEmitted();
void NotifyBeforeText(nscolor aColor) MOZ_OVERRIDE;
void NotifyGlyphPathEmitted() MOZ_OVERRIDE;
void NotifyBeforeSVGGlyphPainted() MOZ_OVERRIDE;
void NotifyAfterSVGGlyphPainted() MOZ_OVERRIDE;
void NotifyAfterText() MOZ_OVERRIDE;
void NotifyBeforeSelectionBackground(nscolor aColor) MOZ_OVERRIDE;
void NotifySelectionBackgroundPathEmitted() MOZ_OVERRIDE;
void NotifyBeforeDecorationLine(nscolor aColor) MOZ_OVERRIDE;
void NotifyDecorationLinePathEmitted() MOZ_OVERRIDE;
void NotifyBeforeSelectionDecorationLine(nscolor aColor) MOZ_OVERRIDE;
void NotifySelectionDecorationLinePathEmitted() MOZ_OVERRIDE;
private:
void FillWithOpacity();
@ -3086,9 +3086,9 @@ public:
mDisableSubpixelAA = true;
}
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;
private:
bool mDisableSubpixelAA;
};

10
layout/svg/SVGViewFrame.cpp
Просмотреть файл

@ -40,13 +40,13 @@ public:
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
#endif
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return SVGViewFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG));
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("SVGView"), aResult);
}
@ -57,13 +57,13 @@ public:
*
* @see nsGkAtoms::svgFELeafFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual bool UpdateOverflow() {
virtual bool UpdateOverflow() MOZ_OVERRIDE {
// We don't maintain a visual overflow rect
return false;
}

8
layout/svg/nsSVGAFrame.cpp
Просмотреть файл

@ -35,23 +35,23 @@ public:
// nsIFrame:
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::svgAFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const 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("SVGA"), aResult);
}
#endif
// nsISVGChildFrame interface:
virtual void NotifySVGChanged(uint32_t aFlags);
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
// nsSVGContainerFrame methods:
virtual gfxMatrix GetCanvasTM(uint32_t aFor,

12
layout/svg/nsSVGImageFrame.cpp
Просмотреть файл

@ -60,8 +60,8 @@ public:
virtual nsresult PaintSVG(nsRenderingContext *aContext,
const nsIntRect *aDirtyRect,
nsIFrame* aTransformRoot) MOZ_OVERRIDE;
virtual nsIFrame* GetFrameForPoint(const nsPoint &aPoint);
virtual void ReflowSVG();
virtual nsIFrame* GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
virtual void ReflowSVG() MOZ_OVERRIDE;
// nsSVGPathGeometryFrame methods:
virtual uint16_t GetHitTestFlags() MOZ_OVERRIDE;
@ -69,21 +69,21 @@ public:
// nsIFrame interface:
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual void Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::svgImageFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const 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("SVGImage"), aResult);
}

6
layout/svg/nsSVGIntegrationUtils.cpp
Просмотреть файл

@ -58,7 +58,7 @@ public:
"We want the first continuation here");
}
virtual void AddBox(nsIFrame* aFrame) {
virtual void AddBox(nsIFrame* aFrame) MOZ_OVERRIDE {
nsRect overflow = (aFrame == mCurrentFrame) ?
mCurrentFrameOverflowArea : GetPreEffectsVisualOverflowRect(aFrame);
mResult.UnionRect(mResult, overflow + aFrame->GetOffsetTo(mFirstContinuation));
@ -384,7 +384,7 @@ public:
mOffset(aOffset) {}
virtual void Paint(nsRenderingContext *aContext, nsIFrame *aTarget,
const nsIntRect* aDirtyRect, nsIFrame* aTransformRoot)
const nsIntRect* aDirtyRect, nsIFrame* aTransformRoot) MOZ_OVERRIDE
{
BasicLayerManager* basic = static_cast<BasicLayerManager*>(mLayerManager);
basic->SetTarget(aContext->ThebesContext());
@ -595,7 +595,7 @@ public:
virtual bool operator()(gfxContext* aContext,
const gfxRect& aFillRect,
const GraphicsFilter& aFilter,
const gfxMatrix& aTransform);
const gfxMatrix& aTransform) MOZ_OVERRIDE;
private:
nsIFrame* mFrame;
nsSize mPaintServerSize;

6
layout/svg/nsSVGOuterSVGFrame.cpp
Просмотреть файл

@ -507,13 +507,13 @@ public:
#endif
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;
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion* aInvalidRegion);
nsRegion* aInvalidRegion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("SVGOuterSVG", TYPE_SVG_OUTER_SVG)
};

2
layout/svg/nsSVGPathGeometryFrame.h
Просмотреть файл

@ -65,7 +65,7 @@ public:
nsIAtom* aAttribute,
int32_t aModType) MOZ_OVERRIDE;
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
/**
* Get the "type" of the frame

8
layout/svg/nsSVGStopFrame.cpp
Просмотреть файл

@ -42,22 +42,22 @@ public:
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::svgStopFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return nsSVGStopFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG));
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("SVGStop"), aResult);
}

12
layout/svg/nsSVGSwitchFrame.cpp
Просмотреть файл

@ -38,10 +38,10 @@ public:
*
* @see nsGkAtoms::svgSwitchFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const 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("SVGSwitch"), aResult);
}
@ -55,11 +55,11 @@ public:
virtual nsresult PaintSVG(nsRenderingContext* aContext,
const nsIntRect *aDirtyRect,
nsIFrame* aTransformRoot) MOZ_OVERRIDE;
nsIFrame* GetFrameForPoint(const nsPoint &aPoint);
nsRect GetCoveredRegion();
virtual void ReflowSVG();
nsIFrame* GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
nsRect GetCoveredRegion() MOZ_OVERRIDE;
virtual void ReflowSVG() MOZ_OVERRIDE;
virtual SVGBBox GetBBoxContribution(const Matrix &aToBBoxUserspace,
uint32_t aFlags);
uint32_t aFlags) MOZ_OVERRIDE;
private:
nsIFrame *GetActiveChildFrame();

18
layout/svg/nsSVGUseFrame.cpp
Просмотреть файл

@ -38,34 +38,34 @@ public:
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::svgUseFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsLeaf() const;
virtual bool IsLeaf() const 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("SVGUse"), aResult);
}
#endif
// nsISVGChildFrame interface:
virtual void ReflowSVG();
virtual void NotifySVGChanged(uint32_t aFlags);
virtual void ReflowSVG() MOZ_OVERRIDE;
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
// nsIAnonymousContentCreator
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
uint32_t aFilter);
uint32_t aFilter) MOZ_OVERRIDE;
private:
bool mHasValidDimensions;

2
layout/svg/nsSVGUtils.cpp
Просмотреть файл

@ -438,7 +438,7 @@ class SVGPaintCallback : public nsSVGFilterPaintCallback
{
public:
virtual void Paint(nsRenderingContext *aContext, nsIFrame *aTarget,
const nsIntRect* aDirtyRect, nsIFrame* aTransformRoot)
const nsIntRect* aDirtyRect, nsIFrame* aTransformRoot) MOZ_OVERRIDE
{
nsISVGChildFrame *svgChildFrame = do_QueryFrame(aTarget);
NS_ASSERTION(svgChildFrame, "Expected SVG frame here");

6
layout/tables/nsTableCellFrame.cpp
Просмотреть файл

@ -385,12 +385,12 @@ public:
#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);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE;

4
layout/tables/nsTableFrame.cpp
Просмотреть файл

@ -1062,7 +1062,7 @@ public:
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("TableBorderBackground", TYPE_TABLE_BORDER_BACKGROUND)
};
@ -4523,7 +4523,7 @@ public:
nsDelayedCalcBCBorders(nsIFrame* aFrame) :
mFrame(aFrame) {}
NS_IMETHOD Run() {
NS_IMETHOD Run() MOZ_OVERRIDE {
if (mFrame) {
nsTableFrame* tableFrame = static_cast <nsTableFrame*>(mFrame.GetFrame());
if (tableFrame->NeedToCalcBCBorders()) {

4
layout/tables/nsTableOuterFrame.h
Просмотреть файл

@ -24,9 +24,9 @@ public:
virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
nsSize aMargin, nsSize aBorder,
nsSize aPadding, bool aShrinkWrap);
nsSize aPadding, bool aShrinkWrap) MOZ_OVERRIDE;
virtual nsIFrame* GetParentStyleContextFrame() const;
virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
#ifdef ACCESSIBILITY
virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;

2
layout/tables/nsTableRowFrame.cpp
Просмотреть файл

@ -538,7 +538,7 @@ public:
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("TableRowBackground", TYPE_TABLE_ROW_BACKGROUND)
};

2
layout/tables/nsTableRowGroupFrame.cpp
Просмотреть файл

@ -141,7 +141,7 @@ public:
const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("TableRowGroupBackground", TYPE_TABLE_ROW_GROUP_BACKGROUND)
};

6
layout/xul/nsBoxFrame.cpp
Просмотреть файл

@ -2010,7 +2010,7 @@ public:
nsIFrame* aTargetFrame)
: nsDisplayWrapList(aBuilder, aFrame, aList), mTargetFrame(aTargetFrame) {}
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("XULEventRedirector", TYPE_XUL_EVENT_REDIRECTOR)
private:
nsIFrame* mTargetFrame;
@ -2053,12 +2053,12 @@ public:
nsXULEventRedirectorWrapper(nsIFrame* aTargetFrame)
: mTargetFrame(aTargetFrame) {}
virtual nsDisplayItem* WrapList(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame, nsDisplayList* aList) {
nsIFrame* aFrame, nsDisplayList* aList) MOZ_OVERRIDE {
return new (aBuilder)
nsDisplayXULEventRedirector(aBuilder, aFrame, aList, mTargetFrame);
}
virtual nsDisplayItem* WrapItem(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem) {
nsDisplayItem* aItem) MOZ_OVERRIDE {
return new (aBuilder)
nsDisplayXULEventRedirector(aBuilder, aItem->Frame(), aItem,
mTargetFrame);

10
layout/xul/nsDocElementBoxFrame.cpp
Просмотреть файл

@ -30,7 +30,7 @@ class nsDocElementBoxFrame : public nsBoxFrame,
public nsIAnonymousContentCreator
{
public:
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
friend nsIFrame* NS_NewBoxFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);
@ -42,11 +42,11 @@ public:
NS_DECL_FRAMEARENA_HELPERS
// nsIAnonymousContentCreator
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
uint32_t aFilter);
uint32_t aFilter) MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
// Override nsBoxFrame.
if (aFlags & (nsIFrame::eReplacedContainsBlock | nsIFrame::eReplaced))
@ -55,7 +55,7 @@ public:
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const;
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
private:
nsCOMPtr<Element> mPopupgroupContent;

2
layout/xul/nsImageBoxFrame.cpp
Просмотреть файл

@ -61,7 +61,7 @@ public:
nsImageBoxFrameEvent(nsIContent *content, uint32_t message)
: mContent(content), mMessage(message) {}
NS_IMETHOD Run();
NS_IMETHOD Run() MOZ_OVERRIDE;
private:
nsCOMPtr<nsIContent> mContent;

6
layout/xul/nsListBoxObject.cpp
Просмотреть файл

@ -22,13 +22,13 @@ public:
NS_DECL_NSILISTBOXOBJECT
// nsPIListBoxObject
virtual nsListBoxBodyFrame* GetListBoxBody(bool aFlush);
virtual nsListBoxBodyFrame* GetListBoxBody(bool aFlush) MOZ_OVERRIDE;
nsListBoxObject();
// nsPIBoxObject
virtual void Clear();
virtual void ClearCachedValues();
virtual void Clear() MOZ_OVERRIDE;
virtual void ClearCachedValues() MOZ_OVERRIDE;
protected:
nsListBoxBodyFrame *mListBoxBody;

2
layout/xul/nsMenuBarFrame.cpp
Просмотреть файл

@ -291,7 +291,7 @@ public:
{
}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
if (!pm)

8
layout/xul/nsMenuFrame.cpp
Просмотреть файл

@ -76,7 +76,7 @@ public:
{
}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
nsAutoString domEventToFire;
@ -123,7 +123,7 @@ public:
{
}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
nsMenuFrame* frame = static_cast<nsMenuFrame*>(mFrame.GetFrame());
NS_ENSURE_STATE(frame);
@ -220,7 +220,7 @@ public:
{
}
virtual bool ReflowFinished()
virtual bool ReflowFinished() MOZ_OVERRIDE
{
bool shouldFlush = false;
nsMenuFrame* menu = do_QueryFrame(mWeakFrame.GetFrame());
@ -232,7 +232,7 @@ public:
return shouldFlush;
}
virtual void ReflowCallbackCanceled()
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE
{
delete this;
}

2
layout/xul/nsMenuPopupFrame.cpp
Просмотреть файл

@ -341,7 +341,7 @@ public:
{
}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
WidgetMouseEvent event(true, NS_XUL_POPUP_SHOWN, nullptr,
WidgetMouseEvent::eReal);

4
layout/xul/nsProgressMeterFrame.cpp
Просмотреть файл

@ -82,7 +82,7 @@ class nsAsyncProgressMeterInit MOZ_FINAL : public nsIReflowCallback
public:
nsAsyncProgressMeterInit(nsIFrame* aFrame) : mWeakFrame(aFrame) {}
virtual bool ReflowFinished()
virtual bool ReflowFinished() MOZ_OVERRIDE
{
bool shouldFlush = false;
nsIFrame* frame = mWeakFrame.GetFrame();
@ -95,7 +95,7 @@ public:
return shouldFlush;
}
virtual void ReflowCallbackCanceled()
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE
{
delete this;
}

28
layout/xul/nsRootBoxFrame.cpp
Просмотреть файл

@ -51,28 +51,28 @@ public:
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
virtual nsPopupSetFrame* GetPopupSetFrame();
virtual void SetPopupSetFrame(nsPopupSetFrame* aPopupSet);
virtual nsIContent* GetDefaultTooltip();
virtual void SetDefaultTooltip(nsIContent* aTooltip);
virtual nsresult AddTooltipSupport(nsIContent* aNode);
virtual nsresult RemoveTooltipSupport(nsIContent* aNode);
virtual nsPopupSetFrame* GetPopupSetFrame() MOZ_OVERRIDE;
virtual void SetPopupSetFrame(nsPopupSetFrame* aPopupSet) MOZ_OVERRIDE;
virtual nsIContent* GetDefaultTooltip() MOZ_OVERRIDE;
virtual void SetDefaultTooltip(nsIContent* aTooltip) MOZ_OVERRIDE;
virtual nsresult AddTooltipSupport(nsIContent* aNode) MOZ_OVERRIDE;
virtual nsresult RemoveTooltipSupport(nsIContent* aNode) MOZ_OVERRIDE;
virtual nsresult AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
virtual nsresult InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
virtual nsresult RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nsresult Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nsresult HandleEvent(nsPresContext* aPresContext,
WidgetGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -83,9 +83,9 @@ public:
*
* @see nsGkAtoms::rootFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
// Override bogus IsFrameOfType in nsBoxFrame.
if (aFlags & (nsIFrame::eReplacedContainsBlock | nsIFrame::eReplaced))
@ -94,7 +94,7 @@ public:
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const;
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
nsPopupSetFrame* mPopupSetFrame;

10
layout/xul/nsScrollBoxFrame.cpp
Просмотреть файл

@ -22,23 +22,23 @@ public:
friend nsIFrame* NS_NewAutoRepeatBoxFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual nsresult HandleEvent(nsPresContext* aPresContext,
WidgetGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
NS_IMETHOD HandlePress(nsPresContext* aPresContext,
WidgetGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
NS_IMETHOD HandleRelease(nsPresContext* aPresContext,
WidgetGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
protected:
nsAutoRepeatBoxFrame(nsIPresShell* aPresShell, nsStyleContext* aContext):

12
layout/xul/nsTextBoxFrame.cpp
Просмотреть файл

@ -166,7 +166,7 @@ public:
{
}
virtual bool ReflowFinished()
virtual bool ReflowFinished() MOZ_OVERRIDE
{
bool shouldFlush = false;
nsTextBoxFrame* frame =
@ -178,7 +178,7 @@ public:
return shouldFlush;
}
virtual void ReflowCallbackCanceled()
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE
{
delete this;
}
@ -293,13 +293,13 @@ public:
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("XULTextBox", TYPE_XUL_TEXT_BOX)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder);
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
virtual void DisableComponentAlpha() { mDisableSubpixelAA = true; }
virtual void DisableComponentAlpha() MOZ_OVERRIDE { mDisableSubpixelAA = true; }
void PaintTextToContext(nsRenderingContext* aCtx,
nsPoint aOffset,

2
layout/xul/tree/nsTreeBodyFrame.cpp
Просмотреть файл

@ -4654,7 +4654,7 @@ class nsOverflowChecker : public nsRunnable
{
public:
nsOverflowChecker(nsTreeBodyFrame* aFrame) : mFrame(aFrame) {}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
if (mFrame.IsAlive()) {
nsTreeBodyFrame* tree = static_cast<nsTreeBodyFrame*>(mFrame.GetFrame());

2
layout/xul/tree/nsTreeColFrame.cpp
Просмотреть файл

@ -66,7 +66,7 @@ public:
#endif
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("XULTreeColSplitterTarget", TYPE_XUL_TREE_COL_SPLITTER_TARGET)
};