Bug 733186: Annotate ~1000 methods with MOZ_OVERRIDE in /layout r=dholbert r=dbaron

This commit is contained in:
Arnaud Sourioux 2012-09-14 09:10:08 -07:00
parent d55a31c841
commit a84a1b22ad
117 changed files with 1136 additions and 1031 deletions

View File

@ -13,6 +13,7 @@
#ifndef NSDISPLAYLIST_H_
#define NSDISPLAYLIST_H_
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIFrame.h"
#include "nsPoint.h"
@ -1406,7 +1407,7 @@ public:
}
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) {
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE {
mPaint(mFrame, aCtx, mVisibleRect, ToReferenceFrame());
}
NS_DISPLAY_DECL_NAME(mName, mType)
@ -1457,7 +1458,7 @@ public:
}
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) {
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE {
mFrame->PresContext()->PresShell()->PaintCount(mFrameName, aCtx,
mFrame->PresContext(),
mFrame, ToReferenceFrame(),
@ -1523,12 +1524,12 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) {
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
// The caret returns a rect in the coordinates of mFrame.
return mCaret->GetCaretRect() + ToReferenceFrame();
}
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Caret", TYPE_CARET)
protected:
nsRefPtr<nsCaret> mCaret;
@ -1550,11 +1551,11 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Border", TYPE_BORDER)
};
@ -1584,10 +1585,10 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap) {
bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
nsRegion result;
if (NS_GET_A(mColor) == 255) {
@ -1596,13 +1597,13 @@ public:
return result;
}
virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor)
virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor) MOZ_OVERRIDE
{
*aColor = mColor;
return true;
}
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("SolidColor", TYPE_SOLID_COLOR)
@ -1634,26 +1635,26 @@ public:
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters);
const ContainerParameters& aParameters) MOZ_OVERRIDE;
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters);
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap);
bool* aSnap) MOZ_OVERRIDE;
virtual bool IsVaryingRelativeToMovingFrame(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame);
virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor);
virtual bool ShouldFixToViewport(nsDisplayListBuilder* aBuilder);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual uint32_t GetPerFrameKey();
nsIFrame* aFrame) MOZ_OVERRIDE;
virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor) MOZ_OVERRIDE;
virtual bool ShouldFixToViewport(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual uint32_t GetPerFrameKey() MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Background", TYPE_BACKGROUND)
// Returns the value of GetUnderlyingFrame()->IsThemed(), but cached
bool IsThemed() { return mIsThemed; }
@ -1699,11 +1700,11 @@ public:
}
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
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("BoxShadowOuter", TYPE_BOX_SHADOW_OUTER)
private:
@ -1725,10 +1726,10 @@ public:
}
#endif
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("BoxShadowInner", TYPE_BOX_SHADOW_INNER)
private:
@ -1750,11 +1751,11 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Outline", TYPE_OUTLINE)
};
@ -1774,7 +1775,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("EventReceiver", TYPE_EVENT_RECEIVER)
};
@ -1817,22 +1818,22 @@ public:
mBounds = mList.GetBounds(aBuilder);
}
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap);
virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor);
bool* aSnap) MOZ_OVERRIDE;
virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor) MOZ_OVERRIDE;
virtual bool IsVaryingRelativeToMovingFrame(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
nsIFrame* aFrame) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) {
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE {
NS_WARNING("This list should already have been flattened!!!");
return false;
}
virtual void GetMergedFrames(nsTArray<nsIFrame*>* aFrames)
virtual void GetMergedFrames(nsTArray<nsIFrame*>* aFrames) MOZ_OVERRIDE
{
aFrames->AppendElements(mMergedFrames);
}
@ -1840,7 +1841,7 @@ public:
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder);
virtual nsDisplayList* GetList() { return &mList; }
virtual nsDisplayList* GetList() MOZ_OVERRIDE { return &mList; }
/**
* This creates a copy of this item, but wrapping aItem instead of
@ -1926,17 +1927,17 @@ public:
#endif
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap);
bool* aSnap) MOZ_OVERRIDE;
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters);
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters);
const ContainerParameters& aParameters) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Opacity", TYPE_OPACITY)
bool CanUseAsyncAnimations(nsDisplayListBuilder* aBuilder);
@ -1956,14 +1957,14 @@ public:
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters);
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters)
const ContainerParameters& aParameters) MOZ_OVERRIDE
{
return mozilla::LAYER_ACTIVE_FORCE;
}
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem)
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE
{
// Don't allow merging, each sublist must have its own layer
return false;
@ -1986,14 +1987,14 @@ public:
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters);
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters)
const ContainerParameters& aParameters) MOZ_OVERRIDE
{
return mozilla::LAYER_ACTIVE;
}
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem);
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("FixedPosition", TYPE_FIXED_POSITION)
@ -2049,20 +2050,20 @@ public:
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters);
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters);
const ContainerParameters& aParameters) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem);
nsDisplayItem* aItem) MOZ_OVERRIDE;
virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder);
virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
// Get the number of nsDisplayScrollLayers for a scroll frame. Note that this
// number does not include nsDisplayScrollInfoLayers. If this number is not 1
@ -2101,12 +2102,12 @@ public:
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters);
const ContainerParameters& aParameters) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem);
nsDisplayItem* aItem) MOZ_OVERRIDE;
virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder);
virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
};
/**
@ -2129,12 +2130,12 @@ public:
virtual ~nsDisplayClip();
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Clip", TYPE_CLIP)
virtual uint32_t GetPerFrameKey() { return 0; }
@ -2142,7 +2143,7 @@ public:
void SetClipRect(const nsRect& aRect) { mClip = aRect; }
virtual nsDisplayWrapList* WrapWithClone(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem);
nsDisplayItem* aItem) MOZ_OVERRIDE;
protected:
nsRect mClip;
@ -2170,13 +2171,13 @@ public:
#endif
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap);
bool* aSnap) MOZ_OVERRIDE;
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("ClipRoundedRect", TYPE_CLIP_ROUNDED_RECT)
virtual nsDisplayWrapList* WrapWithClone(nsDisplayListBuilder* aBuilder,
@ -2210,16 +2211,16 @@ public:
virtual ~nsDisplayZoom();
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters)
const ContainerParameters& aParameters) MOZ_OVERRIDE
{
return mozilla::LAYER_ACTIVE;
}
@ -2247,17 +2248,17 @@ public:
#endif
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap);
bool* aSnap) MOZ_OVERRIDE;
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) {
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
return mEffectsBounds + ToReferenceFrame();
}
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("SVGEffects", TYPE_SVG_EFFECTS)
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
@ -2266,7 +2267,7 @@ public:
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters);
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
void PaintAsLayer(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx,
@ -2335,23 +2336,23 @@ public:
nsDisplayWrapList* GetStoredList() { return &mStoredList; }
virtual void HitTest(nsDisplayListBuilder *aBuilder, const nsRect& aRect,
HitTestState *aState, nsTArray<nsIFrame*> *aOutFrames);
virtual nsRect GetBounds(nsDisplayListBuilder *aBuilder, bool* aSnap);
HitTestState *aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder *aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder *aBuilder,
bool* aSnap);
virtual bool IsUniform(nsDisplayListBuilder *aBuilder, nscolor* aColor);
bool* aSnap) MOZ_OVERRIDE;
virtual bool IsUniform(nsDisplayListBuilder *aBuilder, nscolor* aColor) MOZ_OVERRIDE;
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters);
const ContainerParameters& aParameters) MOZ_OVERRIDE;
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters);
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder *aBuilder,
nsRegion *aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
virtual bool TryMerge(nsDisplayListBuilder *aBuilder, nsDisplayItem *aItem);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder *aBuilder, nsDisplayItem *aItem) MOZ_OVERRIDE;
virtual uint32_t GetPerFrameKey() { return (mIndex << nsDisplayItem::TYPE_BITS) | nsDisplayItem::GetPerFrameKey(); }
virtual uint32_t GetPerFrameKey() MOZ_OVERRIDE { return (mIndex << nsDisplayItem::TYPE_BITS) | nsDisplayItem::GetPerFrameKey(); }
enum {
INDEX_MAX = PR_UINT32_MAX >> nsDisplayItem::TYPE_BITS
@ -2454,7 +2455,7 @@ public:
static bool ShouldPrerenderTransformedContent(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame,
bool aLogAnimations = false);
bool CanUseAsyncAnimations(nsDisplayListBuilder* aBuilder);
bool CanUseAsyncAnimations(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
private:
nsDisplayWrapList mStoredList;

View File

@ -8,6 +8,7 @@
#ifndef nsPresContext_h___
#define nsPresContext_h___
#include "mozilla/Attributes.h"
#include "nsISupports.h"
#include "nsColor.h"
#include "nsCoord.h"
@ -1259,7 +1260,7 @@ public:
*/
void DidApplyPluginGeometryUpdates();
virtual bool IsRoot() { return true; }
virtual bool IsRoot() MOZ_OVERRIDE { return true; }
/**
* Call this after reflow and scrolling to ensure that the geometry

View File

@ -613,7 +613,7 @@ protected:
mPresShell = nullptr;
}
}
virtual void WillRefresh(mozilla::TimeStamp aTime) {
virtual void WillRefresh(mozilla::TimeStamp aTime) MOZ_OVERRIDE {
if (mPresShell)
mPresShell->ProcessSynthMouseMoveEvent(mFromScroll);
}

View File

@ -8,6 +8,7 @@
#ifndef nsQuoteList_h___
#define nsQuoteList_h___
#include "mozilla/Attributes.h"
#include "nsGenConList.h"
struct nsQuoteNode : public nsGenConNode {
@ -31,7 +32,7 @@ struct nsQuoteNode : public nsGenConNode {
}
virtual bool InitTextFrame(nsGenConList* aList,
nsIFrame* aPseudoFrame, nsIFrame* aTextFrame);
nsIFrame* aPseudoFrame, nsIFrame* aTextFrame) MOZ_OVERRIDE;
// is this 'open-quote' or 'no-open-quote'?
bool IsOpenQuote() {

View File

@ -21,6 +21,7 @@
//Mark used to indicate when onchange has been fired for current combobox item
#define NS_SKIP_NOTIFY_INDEX -2
#include "mozilla/Attributes.h"
#include "nsBlockFrame.h"
#include "nsIFormControlFrame.h"
#include "nsIComboboxControlFrame.h"
@ -60,21 +61,21 @@ public:
// nsIAnonymousContentCreator
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
uint32_t aFilter);
virtual nsIFrame* CreateFrameFor(nsIContent* aContent);
uint32_t aFilter) MOZ_OVERRIDE;
virtual nsIFrame* CreateFrameFor(nsIContent* aContent) MOZ_OVERRIDE;
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aCX,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
nsGUIEvent* aEvent,
@ -82,16 +83,16 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
void PaintFocus(nsRenderingContext& aRenderingContext, nsPoint aPt);
// XXXbz this is only needed to prevent the quirk percent height stuff from
// leaking out of the combobox. We may be able to get rid of this as more
// things move to IsFrameOfType.
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::eReplaced | nsIFrame::eReplacedContainsBlock));
@ -102,19 +103,19 @@ public:
}
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
virtual const nsFrameList& GetChildList(ChildListID aListID) const;
virtual void GetChildLists(nsTArray<ChildList>* aLists) const;
nsFrameList& aChildList) MOZ_OVERRIDE;
virtual const nsFrameList& GetChildList(ChildListID aListID) const MOZ_OVERRIDE;
virtual void GetChildLists(nsTArray<ChildList>* aLists) const MOZ_OVERRIDE;
virtual nsIFrame* GetContentInsertionFrame();
// nsIFormControlFrame
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue);
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const;
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const MOZ_OVERRIDE;
/**
* Inform the control that it got (or lost) focus.
* If it lost focus, the dropdown menu will be rolled up if needed,
@ -130,13 +131,13 @@ public:
/**
* @note This method might destroy |this|.
*/
virtual void ShowDropDown(bool aDoDropDown);
virtual nsIFrame* GetDropDown();
virtual void SetDropDown(nsIFrame* aDropDownFrame);
virtual void ShowDropDown(bool aDoDropDown) MOZ_OVERRIDE;
virtual nsIFrame* GetDropDown() MOZ_OVERRIDE;
virtual void SetDropDown(nsIFrame* aDropDownFrame) MOZ_OVERRIDE;
/**
* @note This method might destroy |this|.
*/
virtual void RollupFromList();
virtual void RollupFromList() MOZ_OVERRIDE;
/**
* Return the available space above and below this frame for
@ -147,20 +148,20 @@ public:
void GetAvailableDropdownSpace(nscoord* aAbove,
nscoord* aBelow,
nsPoint* aTranslation);
virtual int32_t GetIndexOfDisplayArea();
virtual int32_t GetIndexOfDisplayArea() MOZ_OVERRIDE;
/**
* @note This method might destroy |this|.
*/
NS_IMETHOD RedisplaySelectedText();
virtual int32_t UpdateRecentIndex(int32_t aIndex);
virtual void OnContentReset();
NS_IMETHOD RedisplaySelectedText() MOZ_OVERRIDE;
virtual int32_t UpdateRecentIndex(int32_t aIndex) MOZ_OVERRIDE;
virtual void OnContentReset() MOZ_OVERRIDE;
// nsISelectControlFrame
NS_IMETHOD AddOption(int32_t index);
NS_IMETHOD RemoveOption(int32_t index);
NS_IMETHOD DoneAddingChildren(bool aIsDone);
NS_IMETHOD OnOptionSelected(int32_t aIndex, bool aSelected);
NS_IMETHOD OnSetSelectedIndex(int32_t aOldIndex, int32_t aNewIndex);
NS_IMETHOD RemoveOption(int32_t index) MOZ_OVERRIDE;
NS_IMETHOD DoneAddingChildren(bool aIsDone) MOZ_OVERRIDE;
NS_IMETHOD OnOptionSelected(int32_t aIndex, bool aSelected) MOZ_OVERRIDE;
NS_IMETHOD OnSetSelectedIndex(int32_t aOldIndex, int32_t aNewIndex) MOZ_OVERRIDE;
//nsIRollupListener
/**
@ -188,8 +189,8 @@ public:
{ return 0; }
//nsIStatefulFrame
NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState);
NS_IMETHOD RestoreState(nsPresState* aState);
NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState) MOZ_OVERRIDE;
NS_IMETHOD RestoreState(nsPresState* aState) MOZ_OVERRIDE;
static bool ToolkitHasNativePopup();

View File

@ -6,6 +6,7 @@
#ifndef nsFileControlFrame_h___
#define nsFileControlFrame_h___
#include "mozilla/Attributes.h"
#include "nsBlockFrame.h"
#include "nsIFormControlFrame.h"
#include "nsIDOMEventListener.h"
@ -36,32 +37,32 @@ public:
// nsIFormControlFrame
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue);
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const;
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const MOZ_OVERRIDE;
virtual void SetFocus(bool aOn, bool aRepaint);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual void ContentStatesChanged(nsEventStates aStates);
virtual bool IsLeaf() const;
// 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;
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
typedef bool (*AcceptAttrCallback)(const nsAString&, void*);
@ -137,13 +138,13 @@ protected:
static bool IsValidDropData(nsIDOMDragEvent* aEvent);
};
virtual bool IsFrameOfType(uint32_t aFlags) const
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
{
return nsBlockFrame::IsFrameOfType(aFlags &
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
}
virtual int GetSkipSides() const;
virtual int GetSkipSides() const MOZ_OVERRIDE;
/**
* The text box input.

View File

@ -6,6 +6,7 @@
#ifndef nsFormControlFrame_h___
#define nsFormControlFrame_h___
#include "mozilla/Attributes.h"
#include "nsIFormControlFrame.h"
#include "nsLeafFrame.h"
@ -42,7 +43,7 @@ public:
*/
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
nsGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
virtual nscoord GetBaseline() const;
@ -53,7 +54,7 @@ public:
NS_IMETHOD Reflow(nsPresContext* aCX,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
@ -62,9 +63,9 @@ public:
virtual void SetFocus(bool aOn = true, bool aRepaint = false);
// nsIFormControlFrame
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue);
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const;
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const MOZ_OVERRIDE;
// AccessKey Helper function
static nsresult RegUnRegAccessKey(nsIFrame * aFrame, bool aDoReg);
@ -79,8 +80,8 @@ protected:
virtual ~nsFormControlFrame();
virtual nscoord GetIntrinsicWidth();
virtual nscoord GetIntrinsicHeight();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
//
//-------------------------------------------------------------------------------------

View File

@ -6,6 +6,7 @@
#ifndef nsGfxButtonControlFrame_h___
#define nsGfxButtonControlFrame_h___
#include "mozilla/Attributes.h"
#include "nsFormControlFrame.h"
#include "nsHTMLButtonControlFrame.h"
#include "nsCOMPtr.h"
@ -28,16 +29,16 @@ public:
nsGfxButtonControlFrame(nsStyleContext* aContext);
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
nsGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
virtual nsIAtom* GetType() const;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
NS_DECL_QUERYFRAME
@ -45,11 +46,11 @@ public:
// nsIAnonymousContentCreator
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
uint32_t aFilter);
virtual nsIFrame* CreateFrameFor(nsIContent* aContent);
uint32_t aFilter) MOZ_OVERRIDE;
virtual nsIFrame* CreateFrameFor(nsIContent* aContent) MOZ_OVERRIDE;
// nsIFormControlFrame
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const;
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const MOZ_OVERRIDE;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
@ -58,7 +59,7 @@ public:
virtual bool IsLeaf() const;
virtual nsIFrame* GetContentInsertionFrame();
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE;
protected:
nsresult GetDefaultLabel(nsXPIDLString& aLabel) const;
@ -67,7 +68,7 @@ protected:
bool IsFileBrowseButton(int32_t type) const; // Browse button of file input
virtual bool IsInput() { return true; }
virtual bool IsInput() MOZ_OVERRIDE { return true; }
private:
nsCOMPtr<nsIContent> mTextContent;
};

View File

@ -5,6 +5,7 @@
#ifndef nsGfxCheckboxControlFrame_h___
#define nsGfxCheckboxControlFrame_h___
#include "mozilla/Attributes.h"
#include "nsFormControlFrame.h"
#ifdef ACCESSIBILITY
@ -20,17 +21,17 @@ public:
virtual ~nsGfxCheckboxControlFrame();
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const {
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
return MakeFrameName(NS_LITERAL_STRING("CheckboxControl"), aResult);
}
#endif
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
protected:

View File

@ -6,6 +6,7 @@
#ifndef nsGfxRadioControlFrame_h___
#define nsGfxRadioControlFrame_h___
#include "mozilla/Attributes.h"
#include "nsFormControlFrame.h"
#ifdef ACCESSIBILITY
@ -28,7 +29,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
};
#endif

View File

@ -6,6 +6,7 @@
#ifndef nsHTMLButtonControlFrame_h___
#define nsHTMLButtonControlFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsContainerFrame.h"
#include "nsIFormControlFrame.h"
@ -29,54 +30,54 @@ public:
nsHTMLButtonControlFrame(nsStyleContext* aContext);
~nsHTMLButtonControlFrame();
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
nsGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* asPrevInFlow);
nsIFrame* asPrevInFlow) MOZ_OVERRIDE;
virtual nsStyleContext* GetAdditionalStyleContext(int32_t aIndex) const;
virtual void SetAdditionalStyleContext(int32_t aIndex,
nsStyleContext* aStyleContext);
nsStyleContext* aStyleContext) MOZ_OVERRIDE;
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const {
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
return MakeFrameName(NS_LITERAL_STRING("HTMLButtonControl"), aResult);
}
#endif
@ -85,8 +86,8 @@ public:
// nsIFormControlFrame
void SetFocus(bool aOn, bool aRepaint);
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue);
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const;
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const MOZ_OVERRIDE;
// Inserted child content gets its frames parented by our child block
virtual nsIFrame* GetContentInsertionFrame() {

View File

@ -6,6 +6,7 @@
#ifndef nsLegendFrame_h___
#define nsLegendFrame_h___
#include "mozilla/Attributes.h"
#include "nsBlockFrame.h"
class nsLegendFrame : public nsBlockFrame {
@ -19,14 +20,14 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
int32_t GetAlign();

View File

@ -16,6 +16,7 @@
//#define DO_PIXELS
#endif
#include "mozilla/Attributes.h"
#include "nsGfxScrollFrame.h"
#include "nsIFormControlFrame.h"
#include "nsIListControlFrame.h"
@ -53,15 +54,15 @@ public:
nsEventStatus* aEventStatus);
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aCX,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
@ -70,7 +71,7 @@ public:
NS_IMETHOD DidReflow(nsPresContext* aPresContext,
const nsHTMLReflowState* aReflowState,
nsDidReflowStatus aStatus);
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -83,7 +84,7 @@ public:
*
* @see nsGkAtoms::scrollFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
{
@ -93,74 +94,74 @@ public:
virtual void InvalidateInternal(const nsRect& aDamageRect,
nscoord aX, nscoord aY, nsIFrame* aForChild,
uint32_t aFlags);
uint32_t aFlags) MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
// nsIFormControlFrame
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue);
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const;
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
virtual nsresult GetFormProperty(nsIAtom* aName, nsAString& aValue) const MOZ_OVERRIDE;
virtual void SetFocus(bool aOn = true, bool aRepaint = false);
virtual nsGfxScrollFrameInner::ScrollbarStyles GetScrollbarStyles() const;
virtual bool ShouldPropagateComputedHeightToScrolledContent() const;
virtual nsGfxScrollFrameInner::ScrollbarStyles GetScrollbarStyles() const MOZ_OVERRIDE;
virtual bool ShouldPropagateComputedHeightToScrolledContent() const MOZ_OVERRIDE;
// for accessibility purposes
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
// nsContainerFrame
virtual int GetSkipSides() const;
virtual int GetSkipSides() const MOZ_OVERRIDE;
// nsIListControlFrame
virtual void SetComboboxFrame(nsIFrame* aComboboxFrame);
virtual int32_t GetSelectedIndex();
virtual already_AddRefed<nsIContent> GetCurrentOption();
virtual int32_t GetSelectedIndex() MOZ_OVERRIDE;
virtual already_AddRefed<nsIContent> GetCurrentOption() MOZ_OVERRIDE;
/**
* Gets the text of the currently selected item.
* If the there are zero items then an empty string is returned
* If there is nothing selected, then the 0th item's text is returned.
*/
virtual void GetOptionText(int32_t aIndex, nsAString & aStr);
virtual void GetOptionText(int32_t aIndex, nsAString & aStr) MOZ_OVERRIDE;
virtual void CaptureMouseEvents(bool aGrabMouseEvents);
virtual nscoord GetHeightOfARow();
virtual int32_t GetNumberOfOptions();
virtual void AboutToDropDown();
virtual void CaptureMouseEvents(bool aGrabMouseEvents) MOZ_OVERRIDE;
virtual nscoord GetHeightOfARow() MOZ_OVERRIDE;
virtual int32_t GetNumberOfOptions() MOZ_OVERRIDE;
virtual void AboutToDropDown() MOZ_OVERRIDE;
/**
* @note This method might destroy |this|.
*/
virtual void AboutToRollup();
virtual void AboutToRollup() MOZ_OVERRIDE;
/**
* Dispatch a DOM onchange event synchroniously.
* @note This method might destroy |this|.
*/
virtual void FireOnChange();
virtual void FireOnChange() MOZ_OVERRIDE;
/**
* Makes aIndex the selected option of a combobox list.
* @note This method might destroy |this|.
*/
virtual void ComboboxFinish(int32_t aIndex);
virtual void OnContentReset();
virtual void ComboboxFinish(int32_t aIndex) MOZ_OVERRIDE;
virtual void OnContentReset() MOZ_OVERRIDE;
// nsISelectControlFrame
NS_IMETHOD AddOption(int32_t index);
NS_IMETHOD RemoveOption(int32_t index);
NS_IMETHOD DoneAddingChildren(bool aIsDone);
NS_IMETHOD RemoveOption(int32_t index) MOZ_OVERRIDE;
NS_IMETHOD DoneAddingChildren(bool aIsDone) MOZ_OVERRIDE;
/**
* Gets the content (an option) by index and then set it as
* being selected or not selected.
*/
NS_IMETHOD OnOptionSelected(int32_t aIndex, bool aSelected);
NS_IMETHOD OnSetSelectedIndex(int32_t aOldIndex, int32_t aNewIndex);
NS_IMETHOD OnOptionSelected(int32_t aIndex, bool aSelected) MOZ_OVERRIDE;
NS_IMETHOD OnSetSelectedIndex(int32_t aOldIndex, int32_t aNewIndex) MOZ_OVERRIDE;
// mouse event listeners (both )
nsresult MouseDown(nsIDOMEvent* aMouseEvent); // might destroy |this|

View File

@ -6,6 +6,7 @@
#ifndef nsMeterFrame_h___
#define nsMeterFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsIAnonymousContentCreator.h"
#include "nsCOMPtr.h"
@ -22,7 +23,7 @@ public:
nsMeterFrame(nsStyleContext* aContext);
virtual ~nsMeterFrame();
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aCX,
nsHTMLReflowMetrics& aDesiredSize,
@ -35,12 +36,12 @@ public:
}
#endif
virtual bool IsLeaf() const { return true; }
virtual bool IsLeaf() const MOZ_OVERRIDE { return true; }
// 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;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
@ -49,7 +50,7 @@ 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 nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);

View File

@ -6,6 +6,7 @@
#ifndef nsProgressFrame_h___
#define nsProgressFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsIAnonymousContentCreator.h"
#include "nsCOMPtr.h"
@ -23,11 +24,11 @@ public:
nsProgressFrame(nsStyleContext* aContext);
virtual ~nsProgressFrame();
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aCX,
nsHTMLReflowMetrics& aDesiredSize,
@ -40,12 +41,12 @@ public:
}
#endif
virtual bool IsLeaf() const { return true; }
virtual bool IsLeaf() const MOZ_OVERRIDE { return true; }
// 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;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
@ -54,7 +55,7 @@ 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 nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);

View File

@ -5,6 +5,7 @@
#ifndef nsSelectsAreaFrame_h___
#define nsSelectsAreaFrame_h___
#include "mozilla/Attributes.h"
#include "nsBlockFrame.h"
class nsSelectsAreaFrame : public nsBlockFrame
@ -16,7 +17,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
nsresult BuildDisplayListInternal(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -25,7 +26,7 @@ public:
NS_IMETHOD Reflow(nsPresContext* aCX,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
nscoord HeightOfARow() const { return mHeightOfARow; }

View File

@ -6,6 +6,7 @@
#ifndef nsTextControlFrame_h___
#define nsTextControlFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsBlockFrame.h"
#include "nsIFormControlFrame.h"
@ -45,7 +46,7 @@ public:
nsTextControlFrame(nsIPresShell* aShell, nsStyleContext* aContext);
virtual ~nsTextControlFrame();
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual nsIScrollableFrame* GetScrollTargetFrame() {
if (!IsScrollable())
@ -59,7 +60,7 @@ public:
virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
nsSize aMargin, nsSize aBorder,
nsSize aPadding, bool aShrinkWrap);
nsSize aPadding, bool aShrinkWrap) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
@ -94,14 +95,14 @@ public:
}
// 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;
// Utility methods to set current widget state
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
//==== BEGIN NSIFORMCONTROLFRAME
virtual void SetFocus(bool aOn , bool aRepaint);
@ -113,34 +114,34 @@ public:
//==== NSITEXTCONTROLFRAME
NS_IMETHOD GetEditor(nsIEditor **aEditor);
NS_IMETHOD GetTextLength(int32_t* aTextLength);
NS_IMETHOD SetSelectionStart(int32_t aSelectionStart);
NS_IMETHOD SetSelectionEnd(int32_t aSelectionEnd);
NS_IMETHOD GetEditor(nsIEditor **aEditor) MOZ_OVERRIDE;
NS_IMETHOD GetTextLength(int32_t* aTextLength) MOZ_OVERRIDE;
NS_IMETHOD SetSelectionStart(int32_t aSelectionStart) MOZ_OVERRIDE;
NS_IMETHOD SetSelectionEnd(int32_t aSelectionEnd) MOZ_OVERRIDE;
NS_IMETHOD SetSelectionRange(int32_t aSelectionStart,
int32_t aSelectionEnd,
SelectionDirection aDirection = eNone);
SelectionDirection aDirection = eNone) MOZ_OVERRIDE;
NS_IMETHOD GetSelectionRange(int32_t* aSelectionStart,
int32_t* aSelectionEnd,
SelectionDirection* aDirection = nullptr);
NS_IMETHOD GetOwnedSelectionController(nsISelectionController** aSelCon);
virtual nsFrameSelection* GetOwnedFrameSelection();
SelectionDirection* aDirection = nullptr) MOZ_OVERRIDE;
NS_IMETHOD GetOwnedSelectionController(nsISelectionController** aSelCon) MOZ_OVERRIDE;
virtual nsFrameSelection* GetOwnedFrameSelection() MOZ_OVERRIDE;
nsresult GetPhonetic(nsAString& aPhonetic);
nsresult GetPhonetic(nsAString& aPhonetic) MOZ_OVERRIDE;
/**
* Ensure mEditor is initialized with the proper flags and the default value.
* @throws NS_ERROR_NOT_INITIALIZED if mEditor has not been created
* @throws various and sundry other things
*/
virtual nsresult EnsureEditorInitialized();
virtual nsresult EnsureEditorInitialized() MOZ_OVERRIDE;
//==== END NSITEXTCONTROLFRAME
//==== NSISTATEFULFRAME
NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState);
NS_IMETHOD RestoreState(nsPresState* aState);
NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState) MOZ_OVERRIDE;
NS_IMETHOD RestoreState(nsPresState* aState) MOZ_OVERRIDE;
//=== END NSISTATEFULFRAME
@ -343,7 +344,7 @@ protected:
nsSize& aIntrinsicSize,
float aFontSizeInflation);
nsresult ScrollSelectionIntoView();
nsresult ScrollSelectionIntoView() MOZ_OVERRIDE;
private:
//helper methods

View File

@ -8,6 +8,7 @@
#ifndef nsBulletFrame_h___
#define nsBulletFrame_h___
#include "mozilla/Attributes.h"
#include "nsFrame.h"
#include "nsStyleContext.h"
@ -65,19 +66,19 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
virtual nsIAtom* GetType() const;
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
// nsIHTMLReflow
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aMetrics,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
// nsBulletFrame
int32_t SetListItemOrdinal(int32_t aNextOrdinal, bool* aChanged,
@ -108,8 +109,8 @@ public:
void PaintBullet(nsRenderingContext& aRenderingContext, nsPoint aPt,
const nsRect& aDirtyRect);
virtual bool IsEmpty();
virtual bool IsSelfEmpty();
virtual bool IsEmpty() MOZ_OVERRIDE;
virtual bool IsSelfEmpty() MOZ_OVERRIDE;
virtual nscoord GetBaseline() const;
float GetFontSizeInflation() const;

View File

@ -8,6 +8,7 @@
#ifndef nsCanvasFrame_h___
#define nsCanvasFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsIScrollPositionListener.h"
#include "nsDisplayList.h"
@ -41,21 +42,21 @@ public:
virtual void DestroyFrom(nsIFrame* aDestructRoot);
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
{
return nsContainerFrame::IsFrameOfType(aFlags &
@ -69,7 +70,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
void PaintFocus(nsRenderingContext& aRenderingContext, nsPoint aPt);
@ -82,11 +83,11 @@ public:
*
* @see nsGkAtoms::canvasFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual nsresult StealFrame(nsPresContext* aPresContext,
nsIFrame* aChild,
bool aForceNormal)
bool aForceNormal) MOZ_OVERRIDE
{
NS_ASSERTION(!aForceNormal, "No-one should be passing this in here");
@ -100,10 +101,10 @@ public:
}
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
NS_IMETHOD GetContentForEvent(nsEvent* aEvent,
nsIContent** aContent);
nsIContent** aContent) MOZ_OVERRIDE;
nsRect CanvasArea() const;
@ -131,21 +132,21 @@ public:
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion)
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE
{
return NS_GET_A(mExtraBackgroundColor) > 0 ||
nsDisplayBackground::ComputeVisibility(aBuilder, aVisibleRegion,
aAllowVisibleRegionExpansion);
}
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap)
bool* aSnap) MOZ_OVERRIDE
{
if (NS_GET_A(mExtraBackgroundColor) == 255) {
return nsRegion(GetBounds(aBuilder, aSnap));
}
return nsDisplayBackground::GetOpaqueRegion(aBuilder, aSnap);
}
virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor)
virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor) MOZ_OVERRIDE
{
nscolor background;
if (!nsDisplayBackground::IsUniform(aBuilder, &background))
@ -156,21 +157,21 @@ public:
*aColor = mExtraBackgroundColor;
return true;
}
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
{
nsCanvasFrame* frame = static_cast<nsCanvasFrame*>(mFrame);
*aSnap = true;
return frame->CanvasArea() + ToReferenceFrame();
}
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames)
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE
{
// We need to override so we don't consider border-radius.
aOutFrames->AppendElement(mFrame);
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
void SetExtraBackgroundColor(nscolor aColor)
{

View File

@ -8,6 +8,7 @@
#ifndef nsContainerFrame_h___
#define nsContainerFrame_h___
#include "mozilla/Attributes.h"
#include "nsSplittableFrame.h"
#include "nsFrameList.h"
#include "nsLayoutUtils.h"
@ -53,27 +54,27 @@ public:
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual const nsFrameList& GetChildList(ChildListID aList) const;
virtual void GetChildLists(nsTArray<ChildList>* aLists) const;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void ChildIsDirty(nsIFrame* aChild);
virtual const nsFrameList& GetChildList(ChildListID aList) const MOZ_OVERRIDE;
virtual void GetChildLists(nsTArray<ChildList>* aLists) const MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual void ChildIsDirty(nsIFrame* aChild) MOZ_OVERRIDE;
virtual bool IsLeaf() const;
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;
#ifdef DEBUG
NS_IMETHOD List(FILE* out, int32_t aIndent) const;
NS_IMETHOD List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
#endif
// nsContainerFrame methods
@ -182,7 +183,7 @@ public:
virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
nsSize aMargin, nsSize aBorder,
nsSize aPadding, bool aShrinkWrap);
nsSize aPadding, bool aShrinkWrap) MOZ_OVERRIDE;
/**
* Invokes the WillReflow() function, positions the frame and its view (if

View File

@ -8,6 +8,7 @@
/* rendering object for CSS :first-letter pseudo-element */
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
class nsFirstLetterFrame : public nsContainerFrame {
@ -20,17 +21,17 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
bool IsFloating() const { return GetStateBits() & NS_FRAME_OUT_OF_FLOW; }
@ -42,12 +43,12 @@ public:
~(nsIFrame::eBidiInlineContainer));
}
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 void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
InlineMinWidthData *aData);
InlineMinWidthData *aData) MOZ_OVERRIDE;
virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
InlinePrefWidthData *aData);
InlinePrefWidthData *aData) MOZ_OVERRIDE;
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
nsSize aMargin, nsSize aBorder, nsSize aPadding,
@ -55,16 +56,16 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual bool CanContinueTextRun() const;
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
virtual nscoord GetBaseline() const;
//override of nsFrame method
NS_IMETHOD GetChildFrameContainingOffset(int32_t inContentOffset,
bool inHint,
int32_t* outFrameContentOffset,
nsIFrame **outChildFrame);
nsIFrame **outChildFrame) MOZ_OVERRIDE;
nscoord GetFirstLetterBaseline() const { return mBaseline; }

View File

@ -8,6 +8,7 @@
#ifndef nsFrame_h___
#define nsFrame_h___
#include "mozilla/Attributes.h"
#include "nsBox.h"
#include "nsRect.h"
#include "nsString.h"
@ -379,13 +380,13 @@ public:
// Box layout methods
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState);
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
// We compute and store the HTML content's overflow area. So don't
// try to compute it in the box code.
virtual bool ComputesOwnOverflowArea() { return true; }
virtual bool ComputesOwnOverflowArea() MOZ_OVERRIDE { return true; }
//--------------------------------------------------
// Additional methods
@ -636,10 +637,10 @@ protected:
// Fills aCursor with the appropriate information from ui
static void FillCursorInformationFromStyle(const nsStyleUserInterface* ui,
nsIFrame::Cursor& aCursor);
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
#ifdef DEBUG_LAYOUT
virtual void GetBoxName(nsAutoString& aName);
virtual void GetBoxName(nsAutoString& aName) MOZ_OVERRIDE;
#endif
void InitBoxMetrics(bool aClear);

View File

@ -8,6 +8,7 @@
#ifndef nsHTMLFrameset_h___
#define nsHTMLFrameset_h___
#include "mozilla/Attributes.h"
#include "nsGkAtoms.h"
#include "nsContainerFrame.h"
#include "nsColor.h"
@ -79,7 +80,7 @@ public:
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
@ -96,26 +97,26 @@ public:
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
nsGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
NS_IMETHOD GetCursor(const nsPoint& aPoint,
nsIFrame::Cursor& aCursor);
nsIFrame::Cursor& aCursor) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual bool IsLeaf() const;
virtual bool IsLeaf() const MOZ_OVERRIDE;
void StartMouseDrag(nsPresContext* aPresContext,
nsHTMLFramesetBorderFrame* aBorder,

View File

@ -8,6 +8,7 @@
#ifndef nsGfxScrollFrame_h___
#define nsGfxScrollFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsIAnonymousContentCreator.h"
#include "nsBoxFrame.h"
@ -79,8 +80,8 @@ public:
bool GetBorderRadii(nscoord aRadii[8]) const;
// nsIReflowCallback
virtual bool ReflowFinished();
virtual void ReflowCallbackCanceled();
virtual bool ReflowFinished() MOZ_OVERRIDE;
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE;
// This gets called when the 'curpos' attribute on one of the scrollbars changes
void CurPosAttributeChanged(nsIContent* aChild);
@ -357,7 +358,7 @@ public:
// Called to set the child frames. We typically have three: the scroll area,
// the vertical scrollbar, and the horizontal scrollbar.
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -398,16 +399,16 @@ public:
// Because there can be only one child frame, these two function return
// NS_ERROR_FAILURE
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nsIScrollableFrame* GetScrollTargetFrame() {
return this;
@ -431,9 +432,9 @@ public:
}
// 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;
// nsIScrollableFrame
virtual nsIFrame* GetScrolledFrame() const {
@ -442,72 +443,72 @@ public:
virtual nsGfxScrollFrameInner::ScrollbarStyles GetScrollbarStyles() const {
return mInner.GetScrollbarStylesFromFrame();
}
virtual uint32_t GetScrollbarVisibility() const {
virtual uint32_t GetScrollbarVisibility() const MOZ_OVERRIDE {
return mInner.GetScrollbarVisibility();
}
virtual nsMargin GetActualScrollbarSizes() const {
virtual nsMargin GetActualScrollbarSizes() const MOZ_OVERRIDE {
return mInner.GetActualScrollbarSizes();
}
virtual nsMargin GetDesiredScrollbarSizes(nsBoxLayoutState* aState) {
virtual nsMargin GetDesiredScrollbarSizes(nsBoxLayoutState* aState) MOZ_OVERRIDE {
return mInner.GetDesiredScrollbarSizes(aState);
}
virtual nsMargin GetDesiredScrollbarSizes(nsPresContext* aPresContext,
nsRenderingContext* aRC) {
nsRenderingContext* aRC) MOZ_OVERRIDE {
nsBoxLayoutState bls(aPresContext, aRC, 0);
return GetDesiredScrollbarSizes(&bls);
}
virtual nsRect GetScrollPortRect() const {
virtual nsRect GetScrollPortRect() const MOZ_OVERRIDE {
return mInner.GetScrollPortRect();
}
virtual nsPoint GetScrollPosition() const {
virtual nsPoint GetScrollPosition() const MOZ_OVERRIDE {
return mInner.GetScrollPosition();
}
virtual nsRect GetScrollRange() const {
virtual nsRect GetScrollRange() const MOZ_OVERRIDE {
return mInner.GetScrollRange();
}
virtual nsSize GetScrollPositionClampingScrollPortSize() const {
virtual nsSize GetScrollPositionClampingScrollPortSize() const MOZ_OVERRIDE {
return mInner.GetScrollPositionClampingScrollPortSize();
}
virtual nsSize GetLineScrollAmount() const {
virtual nsSize GetLineScrollAmount() const MOZ_OVERRIDE {
return mInner.GetLineScrollAmount();
}
virtual nsSize GetPageScrollAmount() const {
virtual nsSize GetPageScrollAmount() const MOZ_OVERRIDE {
return mInner.GetPageScrollAmount();
}
virtual void ScrollTo(nsPoint aScrollPosition, ScrollMode aMode,
const nsRect* aRange = nullptr) {
const nsRect* aRange = nullptr) MOZ_OVERRIDE {
mInner.ScrollTo(aScrollPosition, aMode, aRange);
}
virtual void ScrollToCSSPixels(nsIntPoint aScrollPosition) {
virtual void ScrollToCSSPixels(nsIntPoint aScrollPosition) MOZ_OVERRIDE {
mInner.ScrollToCSSPixels(aScrollPosition);
}
virtual nsIntPoint GetScrollPositionCSSPixels() {
virtual nsIntPoint GetScrollPositionCSSPixels() MOZ_OVERRIDE {
return mInner.GetScrollPositionCSSPixels();
}
virtual void ScrollBy(nsIntPoint aDelta, ScrollUnit aUnit, ScrollMode aMode,
nsIntPoint* aOverflow, nsIAtom *aOrigin = nullptr) {
nsIntPoint* aOverflow, nsIAtom *aOrigin = nullptr) MOZ_OVERRIDE {
mInner.ScrollBy(aDelta, aUnit, aMode, aOverflow, aOrigin);
}
virtual void ScrollToRestoredPosition() {
virtual void ScrollToRestoredPosition() MOZ_OVERRIDE {
mInner.ScrollToRestoredPosition();
}
virtual void AddScrollPositionListener(nsIScrollPositionListener* aListener) {
virtual void AddScrollPositionListener(nsIScrollPositionListener* aListener) MOZ_OVERRIDE {
mInner.AddScrollPositionListener(aListener);
}
virtual void RemoveScrollPositionListener(nsIScrollPositionListener* aListener) {
virtual void RemoveScrollPositionListener(nsIScrollPositionListener* aListener) MOZ_OVERRIDE {
mInner.RemoveScrollPositionListener(aListener);
}
virtual nsIFrame* GetScrollbarBox(bool aVertical) {
virtual nsIFrame* GetScrollbarBox(bool aVertical) MOZ_OVERRIDE {
return mInner.GetScrollbarBox(aVertical);
}
virtual void CurPosAttributeChanged(nsIContent* aChild) {
virtual void CurPosAttributeChanged(nsIContent* aChild) MOZ_OVERRIDE {
mInner.CurPosAttributeChanged(aChild);
}
NS_IMETHOD PostScrolledAreaEventForCurrentArea() {
NS_IMETHOD PostScrolledAreaEventForCurrentArea() MOZ_OVERRIDE {
mInner.PostScrolledAreaEvent();
return NS_OK;
}
virtual bool IsScrollingActive() {
virtual bool IsScrollingActive() MOZ_OVERRIDE {
return mInner.IsScrollingActive();
}
virtual bool UpdateOverflow() {
@ -515,12 +516,12 @@ public:
}
// nsIStatefulFrame
NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState) {
NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState) MOZ_OVERRIDE {
NS_ENSURE_ARG_POINTER(aState);
*aState = mInner.SaveState(aStateID);
return NS_OK;
}
NS_IMETHOD RestoreState(nsPresState* aState) {
NS_IMETHOD RestoreState(nsPresState* aState) MOZ_OVERRIDE {
NS_ENSURE_ARG_POINTER(aState);
mInner.RestoreState(aState);
return NS_OK;
@ -599,33 +600,33 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists) {
const nsDisplayListSet& aLists) MOZ_OVERRIDE {
return mInner.BuildDisplayList(aBuilder, aDirtyRect, aLists);
}
// XXXldb Is this actually used?
#if 0
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
#endif
// Because there can be only one child frame, these two function return
// NS_ERROR_FAILURE
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nsIScrollableFrame* GetScrollTargetFrame() {
return this;
}
virtual nsIFrame* GetContentInsertionFrame() {
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
return mInner.GetScrolledFrame()->GetContentInsertionFrame();
}
@ -644,9 +645,9 @@ public:
}
// 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 nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
@ -690,72 +691,72 @@ public:
virtual nsGfxScrollFrameInner::ScrollbarStyles GetScrollbarStyles() const {
return mInner.GetScrollbarStylesFromFrame();
}
virtual uint32_t GetScrollbarVisibility() const {
virtual uint32_t GetScrollbarVisibility() const MOZ_OVERRIDE {
return mInner.GetScrollbarVisibility();
}
virtual nsMargin GetActualScrollbarSizes() const {
virtual nsMargin GetActualScrollbarSizes() const MOZ_OVERRIDE {
return mInner.GetActualScrollbarSizes();
}
virtual nsMargin GetDesiredScrollbarSizes(nsBoxLayoutState* aState) {
virtual nsMargin GetDesiredScrollbarSizes(nsBoxLayoutState* aState) MOZ_OVERRIDE {
return mInner.GetDesiredScrollbarSizes(aState);
}
virtual nsMargin GetDesiredScrollbarSizes(nsPresContext* aPresContext,
nsRenderingContext* aRC) {
nsRenderingContext* aRC) MOZ_OVERRIDE {
nsBoxLayoutState bls(aPresContext, aRC, 0);
return GetDesiredScrollbarSizes(&bls);
}
virtual nsRect GetScrollPortRect() const {
virtual nsRect GetScrollPortRect() const MOZ_OVERRIDE {
return mInner.GetScrollPortRect();
}
virtual nsPoint GetScrollPosition() const {
virtual nsPoint GetScrollPosition() const MOZ_OVERRIDE {
return mInner.GetScrollPosition();
}
virtual nsRect GetScrollRange() const {
virtual nsRect GetScrollRange() const MOZ_OVERRIDE {
return mInner.GetScrollRange();
}
virtual nsSize GetScrollPositionClampingScrollPortSize() const {
virtual nsSize GetScrollPositionClampingScrollPortSize() const MOZ_OVERRIDE {
return mInner.GetScrollPositionClampingScrollPortSize();
}
virtual nsSize GetLineScrollAmount() const {
virtual nsSize GetLineScrollAmount() const MOZ_OVERRIDE {
return mInner.GetLineScrollAmount();
}
virtual nsSize GetPageScrollAmount() const {
virtual nsSize GetPageScrollAmount() const MOZ_OVERRIDE {
return mInner.GetPageScrollAmount();
}
virtual void ScrollTo(nsPoint aScrollPosition, ScrollMode aMode,
const nsRect* aRange = nullptr) {
const nsRect* aRange = nullptr) MOZ_OVERRIDE {
mInner.ScrollTo(aScrollPosition, aMode, aRange);
}
virtual void ScrollToCSSPixels(nsIntPoint aScrollPosition) {
virtual void ScrollToCSSPixels(nsIntPoint aScrollPosition) MOZ_OVERRIDE {
mInner.ScrollToCSSPixels(aScrollPosition);
}
virtual nsIntPoint GetScrollPositionCSSPixels() {
virtual nsIntPoint GetScrollPositionCSSPixels() MOZ_OVERRIDE {
return mInner.GetScrollPositionCSSPixels();
}
virtual void ScrollBy(nsIntPoint aDelta, ScrollUnit aUnit, ScrollMode aMode,
nsIntPoint* aOverflow, nsIAtom *aOrigin = nullptr) {
nsIntPoint* aOverflow, nsIAtom *aOrigin = nullptr) MOZ_OVERRIDE {
mInner.ScrollBy(aDelta, aUnit, aMode, aOverflow, aOrigin);
}
virtual void ScrollToRestoredPosition() {
virtual void ScrollToRestoredPosition() MOZ_OVERRIDE {
mInner.ScrollToRestoredPosition();
}
virtual void AddScrollPositionListener(nsIScrollPositionListener* aListener) {
virtual void AddScrollPositionListener(nsIScrollPositionListener* aListener) MOZ_OVERRIDE {
mInner.AddScrollPositionListener(aListener);
}
virtual void RemoveScrollPositionListener(nsIScrollPositionListener* aListener) {
virtual void RemoveScrollPositionListener(nsIScrollPositionListener* aListener) MOZ_OVERRIDE {
mInner.RemoveScrollPositionListener(aListener);
}
virtual nsIFrame* GetScrollbarBox(bool aVertical) {
virtual nsIFrame* GetScrollbarBox(bool aVertical) MOZ_OVERRIDE {
return mInner.GetScrollbarBox(aVertical);
}
virtual void CurPosAttributeChanged(nsIContent* aChild) {
virtual void CurPosAttributeChanged(nsIContent* aChild) MOZ_OVERRIDE {
mInner.CurPosAttributeChanged(aChild);
}
NS_IMETHOD PostScrolledAreaEventForCurrentArea() {
NS_IMETHOD PostScrolledAreaEventForCurrentArea() MOZ_OVERRIDE {
mInner.PostScrolledAreaEvent();
return NS_OK;
}
virtual bool IsScrollingActive() {
virtual bool IsScrollingActive() MOZ_OVERRIDE {
return mInner.IsScrollingActive();
}
virtual bool UpdateOverflow() {
@ -763,12 +764,12 @@ public:
}
// nsIStatefulFrame
NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState) {
NS_IMETHOD SaveState(SpecialStateID aStateID, nsPresState** aState) MOZ_OVERRIDE {
NS_ENSURE_ARG_POINTER(aState);
*aState = mInner.SaveState(aStateID);
return NS_OK;
}
NS_IMETHOD RestoreState(nsPresState* aState) {
NS_IMETHOD RestoreState(nsPresState* aState) MOZ_OVERRIDE {
NS_ENSURE_ARG_POINTER(aState);
mInner.RestoreState(aState);
return NS_OK;
@ -779,9 +780,9 @@ public:
*
* @see nsGkAtoms::scrollFrame
*/
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))
@ -790,7 +791,7 @@ public:
}
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
protected:

View File

@ -8,6 +8,7 @@
#ifndef nsHTMLCanvasFrame_h___
#define nsHTMLCanvasFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsString.h"
#include "nsAString.h"
@ -37,11 +38,11 @@ public:
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
@ -50,9 +51,9 @@ public:
/* get the size of the canvas's image */
nsIntSize GetCanvasSize();
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual nsSize GetIntrinsicRatio();
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nsSize GetIntrinsicRatio() MOZ_OVERRIDE;
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
@ -62,15 +63,15 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
nsRect GetInnerArea() const;
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
{
@ -78,7 +79,7 @@ public:
}
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
// Inserted child content gets its frames parented by our child block

View File

@ -377,7 +377,7 @@ public:
MOZ_COUNT_DTOR(nsDisplayImage);
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
/**
* Returns an ImageContainer for this image if the image type
@ -389,11 +389,11 @@ public:
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters);
const ContainerParameters& aParameters) MOZ_OVERRIDE;
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters);
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
/**
* Configure an ImageLayer for this display item.

View File

@ -8,6 +8,7 @@
#ifndef nsInlineFrame_h___
#define nsInlineFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsLineLayout.h"
@ -47,14 +48,14 @@ public:
// nsIFrame overrides
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual nsIAtom* GetType() const;
@ -64,19 +65,19 @@ public:
~(nsIFrame::eBidiInlineContainer | nsIFrame::eLineParticipant));
}
virtual bool IsEmpty();
virtual bool IsSelfEmpty();
virtual bool IsEmpty() MOZ_OVERRIDE;
virtual bool IsSelfEmpty() MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual bool PeekOffsetCharacter(bool aForward, int32_t* aOffset,
bool aRespectClusters = true);
bool aRespectClusters = true) MOZ_OVERRIDE;
// nsIHTMLReflow overrides
virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
InlineMinWidthData *aData);
InlineMinWidthData *aData) MOZ_OVERRIDE;
virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
InlinePrefWidthData *aData);
InlinePrefWidthData *aData) MOZ_OVERRIDE;
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
nsSize aMargin, nsSize aBorder, nsSize aPadding,
@ -85,9 +86,9 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual bool CanContinueTextRun() const;
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
virtual void PullOverflowsFromPrevInFlow();
virtual nscoord GetBaseline() const;
@ -185,20 +186,20 @@ public:
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void PullOverflowsFromPrevInFlow();
virtual void PullOverflowsFromPrevInFlow() MOZ_OVERRIDE;
protected:
nsFirstLineFrame(nsStyleContext* aContext) : nsInlineFrame(aContext) {}
virtual nsIFrame* PullOneFrame(nsPresContext* aPresContext,
InlineReflowState& rs,
bool* aIsComplete);
bool* aIsComplete) MOZ_OVERRIDE;
};
#endif /* nsInlineFrame_h___ */

View File

@ -8,6 +8,7 @@
#ifndef nsLeafFrame_h___
#define nsLeafFrame_h___
#include "mozilla/Attributes.h"
#include "nsFrame.h"
#include "nsDisplayList.h"
@ -53,7 +54,7 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
/**
* This method does most of the work that Reflow() above need done.

View File

@ -8,6 +8,7 @@
#ifndef nsObjectFrame_h___
#define nsObjectFrame_h___
#include "mozilla/Attributes.h"
#include "nsPluginInstanceOwner.h"
#include "nsIObjectFrame.h"
#include "nsFrame.h"
@ -96,7 +97,7 @@ public:
NS_METHOD GetPluginInstance(nsNPAPIPluginInstance** aPluginInstance);
virtual void SetIsDocumentActive(bool aIsActive);
virtual void SetIsDocumentActive(bool aIsActive) MOZ_OVERRIDE;
NS_IMETHOD GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor);
@ -130,8 +131,8 @@ public:
nsIFrame* aRoot);
// nsIReflowCallback
virtual bool ReflowFinished();
virtual void ReflowCallbackCanceled();
virtual bool ReflowFinished() MOZ_OVERRIDE;
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE;
void UpdateImageLayer(const gfxRect& aRect);
@ -169,7 +170,7 @@ public:
bool PaintedByGecko();
nsIWidget* GetWidget() { return mInnerView ? mWidget : nullptr; }
nsIWidget* GetWidget() MOZ_OVERRIDE { return mInnerView ? mWidget : nullptr; }
/**
* Adjust the plugin's idea of its size, using aSize as its new size.
@ -289,14 +290,14 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap);
bool* aSnap) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx);
nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion);
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Plugin", TYPE_PLUGIN)
@ -312,7 +313,7 @@ public:
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aContainerParameters)
const ContainerParameters& aContainerParameters) MOZ_OVERRIDE
{
return static_cast<nsObjectFrame*>(mFrame)->BuildLayer(aBuilder,
aManager,
@ -321,7 +322,7 @@ public:
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerParameters& aParameters)
const ContainerParameters& aParameters) MOZ_OVERRIDE
{
return static_cast<nsObjectFrame*>(mFrame)->GetLayerState(aBuilder,
aManager);

View File

@ -5,6 +5,7 @@
#ifndef nsPageContentFrame_h___
#define nsPageContentFrame_h___
#include "mozilla/Attributes.h"
#include "nsViewportFrame.h"
class nsPageFrame;
class nsSharedPageData;
@ -22,7 +23,7 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aMaxSize,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
{
@ -46,11 +47,11 @@ public:
*
* @see nsGkAtoms::pageContentFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
// Debugging
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
protected:

View File

@ -5,6 +5,7 @@
#ifndef nsPageFrame_h___
#define nsPageFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsLeafFrame.h"
@ -25,17 +26,17 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::pageFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
//////////////////
@ -108,18 +109,18 @@ class nsPageBreakFrame : public nsLeafFrame
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
protected:
virtual nscoord GetIntrinsicWidth();
virtual nscoord GetIntrinsicHeight();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
bool mHaveReflowed;

View File

@ -34,6 +34,7 @@
#ifndef nsPlaceholderFrame_h___
#define nsPlaceholderFrame_h___
#include "mozilla/Attributes.h"
#include "nsFrame.h"
#include "nsGkAtoms.h"
@ -90,19 +91,19 @@ public:
// nsIHTMLReflow overrides
// We need to override GetMinWidth and GetPrefWidth because XUL uses
// placeholders not within lines.
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 void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
InlineMinWidthData *aData);
InlineMinWidthData *aData) MOZ_OVERRIDE;
virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
InlinePrefWidthData *aData);
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState);
InlinePrefWidthData *aData) MOZ_OVERRIDE;
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
@ -114,7 +115,7 @@ public:
#endif // DEBUG || (MOZ_REFLOW_PERF_DSP && MOZ_REFLOW_PERF)
#ifdef DEBUG
NS_IMETHOD List(FILE* out, int32_t aIndent) const;
NS_IMETHOD List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
#endif // DEBUG
/**
@ -122,19 +123,19 @@ public:
*
* @see nsGkAtoms::placeholderFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual bool IsEmpty() { return true; }
virtual bool IsSelfEmpty() { return true; }
virtual bool IsEmpty() MOZ_OVERRIDE { return true; }
virtual bool IsSelfEmpty() MOZ_OVERRIDE { return true; }
virtual bool CanContinueTextRun() const;
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible()
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE
{
nsIFrame* realFrame = GetRealFrameForPlaceholder(this);
return realFrame ? realFrame->CreateAccessible() :
@ -142,7 +143,7 @@ public:
}
#endif
virtual nsIFrame* GetParentStyleContextFrame() const;
virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
/**
* @return the out-of-flow for aFrame if aFrame is a placeholder; otherwise

View File

@ -5,6 +5,7 @@
#ifndef nsSimplePageSequence_h___
#define nsSimplePageSequence_h___
#include "mozilla/Attributes.h"
#include "nsIPageSequenceFrame.h"
#include "nsContainerFrame.h"
#include "nsIPrintSettings.h"
@ -66,25 +67,25 @@ public:
// nsIPageSequenceFrame
NS_IMETHOD SetPageNo(int32_t aPageNo) { return NS_OK;}
NS_IMETHOD SetSelectionHeight(nscoord aYOffset, nscoord aHeight) { mYSelOffset = aYOffset; mSelectionHeight = aHeight; return NS_OK; }
NS_IMETHOD SetTotalNumPages(int32_t aTotal) { mTotalPages = aTotal; return NS_OK; }
NS_IMETHOD SetSelectionHeight(nscoord aYOffset, nscoord aHeight) MOZ_OVERRIDE { mYSelOffset = aYOffset; mSelectionHeight = aHeight; return NS_OK; }
NS_IMETHOD SetTotalNumPages(int32_t aTotal) MOZ_OVERRIDE { mTotalPages = aTotal; return NS_OK; }
// For Shrink To Fit
NS_IMETHOD GetSTFPercent(float& aSTFPercent);
NS_IMETHOD GetSTFPercent(float& aSTFPercent) MOZ_OVERRIDE;
// Async Printing
NS_IMETHOD StartPrint(nsPresContext* aPresContext,
nsIPrintSettings* aPrintSettings,
PRUnichar* aDocTitle,
PRUnichar* aDocURL);
NS_IMETHOD PrePrintNextPage(nsITimerCallback* aCallback, bool* aDone);
NS_IMETHOD PrintNextPage();
NS_IMETHOD ResetPrintCanvasList();
NS_IMETHOD GetCurrentPageNum(int32_t* aPageNum);
NS_IMETHOD GetNumPages(int32_t* aNumPages);
NS_IMETHOD IsDoingPrintRange(bool* aDoing);
NS_IMETHOD GetPrintRange(int32_t* aFromPage, int32_t* aToPage);
NS_IMETHOD DoPageEnd();
NS_IMETHOD PrePrintNextPage(nsITimerCallback* aCallback, bool* aDone) MOZ_OVERRIDE;
NS_IMETHOD PrintNextPage() MOZ_OVERRIDE;
NS_IMETHOD ResetPrintCanvasList() MOZ_OVERRIDE;
NS_IMETHOD GetCurrentPageNum(int32_t* aPageNum) MOZ_OVERRIDE;
NS_IMETHOD GetNumPages(int32_t* aNumPages) MOZ_OVERRIDE;
NS_IMETHOD IsDoingPrintRange(bool* aDoing) MOZ_OVERRIDE;
NS_IMETHOD GetPrintRange(int32_t* aFromPage, int32_t* aToPage) MOZ_OVERRIDE;
NS_IMETHOD DoPageEnd() MOZ_OVERRIDE;
// We must allow Print Preview UI to have a background, no matter what the
// user's settings

View File

@ -11,6 +11,7 @@
#ifndef nsSplittableFrame_h___
#define nsSplittableFrame_h___
#include "mozilla/Attributes.h"
#include "nsFrame.h"
// Derived class that allows splitting
@ -21,7 +22,7 @@ public:
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
virtual nsSplittableType GetSplittableType() const;
@ -36,12 +37,12 @@ public:
*/
// Get the previous/next continuation, regardless of its type (fluid or non-fluid).
virtual nsIFrame* GetPrevContinuation() const;
virtual nsIFrame* GetNextContinuation() const;
virtual nsIFrame* GetPrevContinuation() const MOZ_OVERRIDE;
virtual nsIFrame* GetNextContinuation() const MOZ_OVERRIDE;
// Set a previous/next non-fluid continuation.
NS_IMETHOD SetPrevContinuation(nsIFrame*);
NS_IMETHOD SetNextContinuation(nsIFrame*);
NS_IMETHOD SetPrevContinuation(nsIFrame*) MOZ_OVERRIDE;
NS_IMETHOD SetNextContinuation(nsIFrame*) MOZ_OVERRIDE;
// Get the first/last continuation for this frame.
virtual nsIFrame* GetFirstContinuation() const;
@ -57,12 +58,12 @@ public:
nsIFrame* GetPrevInFlow() const;
nsIFrame* GetNextInFlow() const;
virtual nsIFrame* GetPrevInFlowVirtual() const { return GetPrevInFlow(); }
virtual nsIFrame* GetNextInFlowVirtual() const { return GetNextInFlow(); }
virtual nsIFrame* GetPrevInFlowVirtual() const MOZ_OVERRIDE { return GetPrevInFlow(); }
virtual nsIFrame* GetNextInFlowVirtual() const MOZ_OVERRIDE { return GetNextInFlow(); }
// Set a previous/next fluid continuation.
NS_IMETHOD SetPrevInFlow(nsIFrame*);
NS_IMETHOD SetNextInFlow(nsIFrame*);
NS_IMETHOD SetPrevInFlow(nsIFrame*) MOZ_OVERRIDE;
NS_IMETHOD SetNextInFlow(nsIFrame*) MOZ_OVERRIDE;
// Get the first/last frame in the current flow.
virtual nsIFrame* GetFirstInFlow() const;
@ -76,7 +77,7 @@ protected:
nsSplittableFrame(nsStyleContext* aContext) : nsFrame(aContext) {}
#ifdef DEBUG
virtual void DumpBaseRegressionData(nsPresContext* aPresContext, FILE* out, int32_t aIndent);
virtual void DumpBaseRegressionData(nsPresContext* aPresContext, FILE* out, int32_t aIndent) MOZ_OVERRIDE;
#endif
nsIFrame* mPrevContinuation;

View File

@ -6,6 +6,7 @@
#ifndef NSSUBDOCUMENTFRAME_H_
#define NSSUBDOCUMENTFRAME_H_
#include "mozilla/Attributes.h"
#include "nsLeafFrame.h"
#include "nsIReflowCallback.h"
#include "nsFrameLoader.h"
@ -62,11 +63,11 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
@ -89,8 +90,8 @@ public:
nsIFrame* GetSubdocumentRootFrame();
// nsIReflowCallback
virtual bool ReflowFinished();
virtual void ReflowCallbackCanceled();
virtual bool ReflowFinished() MOZ_OVERRIDE;
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE;
bool ShouldClipSubdocument()
{
@ -114,8 +115,8 @@ protected:
bool IsInline() { return mIsInline; }
virtual nscoord GetIntrinsicWidth();
virtual nscoord GetIntrinsicHeight();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
virtual int GetSkipSides() const;

View File

@ -6,6 +6,7 @@
#ifndef NSTEXTRUNTRANSFORMATIONS_H_
#define NSTEXTRUNTRANSFORMATIONS_H_
#include "mozilla/Attributes.h"
#include "gfxFont.h"
class nsTransformedTextRun;
@ -34,7 +35,7 @@ public:
*/
class nsFontVariantTextRunFactory : public nsTransformingTextRunFactory {
public:
virtual void RebuildTextRun(nsTransformedTextRun* aTextRun, gfxContext* aRefContext);
virtual void RebuildTextRun(nsTransformedTextRun* aTextRun, gfxContext* aRefContext) MOZ_OVERRIDE;
};
/**
@ -55,7 +56,7 @@ public:
: mInnerTransformingTextRunFactory(aInnerTransformingTextRunFactory),
mAllUppercase(aAllUppercase) {}
virtual void RebuildTextRun(nsTransformedTextRun* aTextRun, gfxContext* aRefContext);
virtual void RebuildTextRun(nsTransformedTextRun* aTextRun, gfxContext* aRefContext) MOZ_OVERRIDE;
protected:
nsAutoPtr<nsTransformingTextRunFactory> mInnerTransformingTextRunFactory;

View File

@ -9,6 +9,7 @@
#ifndef nsVideoFrame_h___
#define nsVideoFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsString.h"
#include "nsAString.h"
@ -42,7 +43,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
@ -57,8 +58,8 @@ public:
uint32_t aFlags) MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual bool IsLeaf() const;
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual bool IsLeaf() const MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
@ -76,9 +77,9 @@ public:
return nsSplittableFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced));
}
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
uint32_t aFilters);
uint32_t aFilters) MOZ_OVERRIDE;
nsIContent* GetPosterImage() { return mPosterImage; }

View File

@ -11,6 +11,7 @@
#ifndef nsViewportFrame_h___
#define nsViewportFrame_h___
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsGkAtoms.h"
@ -32,49 +33,49 @@ public:
{}
virtual ~ViewportFrame() { } // useful for debugging
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* asPrevInFlow);
nsIFrame* asPrevInFlow) MOZ_OVERRIDE;
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::viewportFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual void InvalidateInternal(const nsRect& aDamageRect,
nscoord aX, nscoord aY, nsIFrame* aForChild,
uint32_t aFlags);
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
private:

View File

@ -8,6 +8,7 @@
#ifndef mozilla_layout_RenderFrameParent_h
#define mozilla_layout_RenderFrameParent_h
#include "mozilla/Attributes.h"
#include <map>
#include "mozilla/layout/PRenderFrameParent.h"
@ -215,7 +216,7 @@ public:
return mRect;
}
virtual uint32_t GetPerFrameKey()
virtual uint32_t GetPerFrameKey() MOZ_OVERRIDE
{
NS_ABORT();
return 0;

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLContainerFrame_h___
#define nsMathMLContainerFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsContainerFrame.h"
#include "nsBlockFrame.h"
@ -89,11 +90,11 @@ public:
NS_IMETHOD
InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD
RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
/**
* Both GetMinWidth and GetPrefWidth return whatever
@ -132,7 +133,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
virtual bool UpdateOverflow();
@ -404,7 +405,7 @@ public:
NS_IMETHOD
InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList)
nsFrameList& aFrameList) MOZ_OVERRIDE
{
NS_ASSERTION(aListID == kPrincipalList || aListID == kNoReflowPrincipalList,
"unexpected frame list");
@ -416,7 +417,7 @@ public:
NS_IMETHOD
RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame)
nsIFrame* aOldFrame) MOZ_OVERRIDE
{
NS_ASSERTION(aListID == kPrincipalList || aListID == kNoReflowPrincipalList,
"unexpected frame list");
@ -426,7 +427,7 @@ public:
return rv;
}
virtual bool IsFrameOfType(uint32_t aFlags) const {
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE {
return nsBlockFrame::IsFrameOfType(aFlags &
~(nsIFrame::eMathML | nsIFrame::eExcludesIgnorableWhitespace));
}
@ -461,7 +462,7 @@ public:
NS_IMETHOD
AppendFrames(ChildListID aListID,
nsFrameList& aFrameList)
nsFrameList& aFrameList) MOZ_OVERRIDE
{
NS_ASSERTION(aListID == kPrincipalList || aListID == kNoReflowPrincipalList,
"unexpected frame list");
@ -474,7 +475,7 @@ public:
NS_IMETHOD
InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList)
nsFrameList& aFrameList) MOZ_OVERRIDE
{
NS_ASSERTION(aListID == kPrincipalList || aListID == kNoReflowPrincipalList,
"unexpected frame list");
@ -486,7 +487,7 @@ public:
NS_IMETHOD
RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame)
nsIFrame* aOldFrame) MOZ_OVERRIDE
{
NS_ASSERTION(aListID == kPrincipalList || aListID == kNoReflowPrincipalList,
"unexpected frame list");

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLFrame_h___
#define nsMathMLFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsPresContext.h"
#include "nsFontMetrics.h"
@ -32,64 +33,64 @@ public:
}
NS_IMETHOD
GetBoundingMetrics(nsBoundingMetrics& aBoundingMetrics) {
GetBoundingMetrics(nsBoundingMetrics& aBoundingMetrics) MOZ_OVERRIDE {
aBoundingMetrics = mBoundingMetrics;
return NS_OK;
}
NS_IMETHOD
SetBoundingMetrics(const nsBoundingMetrics& aBoundingMetrics) {
SetBoundingMetrics(const nsBoundingMetrics& aBoundingMetrics) MOZ_OVERRIDE {
mBoundingMetrics = aBoundingMetrics;
return NS_OK;
}
NS_IMETHOD
SetReference(const nsPoint& aReference) {
SetReference(const nsPoint& aReference) MOZ_OVERRIDE {
mReference = aReference;
return NS_OK;
}
virtual eMathMLFrameType GetMathMLFrameType();
virtual eMathMLFrameType GetMathMLFrameType() MOZ_OVERRIDE;
NS_IMETHOD
Stretch(nsRenderingContext& aRenderingContext,
nsStretchDirection aStretchDirection,
nsBoundingMetrics& aContainerSize,
nsHTMLReflowMetrics& aDesiredStretchSize)
nsHTMLReflowMetrics& aDesiredStretchSize) MOZ_OVERRIDE
{
return NS_OK;
}
NS_IMETHOD
GetEmbellishData(nsEmbellishData& aEmbellishData) {
GetEmbellishData(nsEmbellishData& aEmbellishData) MOZ_OVERRIDE {
aEmbellishData = mEmbellishData;
return NS_OK;
}
NS_IMETHOD
GetPresentationData(nsPresentationData& aPresentationData) {
GetPresentationData(nsPresentationData& aPresentationData) MOZ_OVERRIDE {
aPresentationData = mPresentationData;
return NS_OK;
}
NS_IMETHOD
InheritAutomaticData(nsIFrame* aParent);
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
NS_IMETHOD
TransmitAutomaticData()
TransmitAutomaticData() MOZ_OVERRIDE
{
return NS_OK;
}
NS_IMETHOD
UpdatePresentationData(uint32_t aFlagsValues,
uint32_t aFlagsToUpdate);
uint32_t aFlagsToUpdate) MOZ_OVERRIDE;
NS_IMETHOD
UpdatePresentationDataFromChildAt(int32_t aFirstIndex,
int32_t aLastIndex,
uint32_t aFlagsValues,
uint32_t aFlagsToUpdate)
uint32_t aFlagsToUpdate) MOZ_OVERRIDE
{
return NS_OK;
}

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLTokenFrame_h___
#define nsMathMLTokenFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -36,32 +37,32 @@ public:
NS_IMETHOD
SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
NS_IMETHOD
AppendFrames(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
NS_IMETHOD
InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
NS_IMETHOD
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nsresult
Place(nsRenderingContext& aRenderingContext,
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize);
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty();
virtual nsresult
ChildListChanged(int32_t aModType)
ChildListChanged(int32_t aModType) MOZ_OVERRIDE
{
ProcessTextData();
return nsMathMLContainerFrame::ChildListChanged(aModType);

View File

@ -31,30 +31,30 @@ public:
NS_IMETHOD
SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
virtual nsresult
ChildListChanged(int32_t aModType);
ChildListChanged(int32_t aModType) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
virtual nsresult
Place(nsRenderingContext& aRenderingContext,
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize);
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
NS_IMETHOD
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD
AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
private:
void MouseClick();

View File

@ -7,6 +7,7 @@
#ifndef nsMathMLmencloseFrame_h___
#define nsMathMLmencloseFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -54,12 +55,12 @@ public:
virtual nsresult
MeasureForWidth(nsRenderingContext& aRenderingContext,
nsHTMLReflowMetrics& aDesiredSize);
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
NS_IMETHOD
AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual void
SetAdditionalStyleContext(int32_t aIndex,
@ -69,16 +70,16 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD
InheritAutomaticData(nsIFrame* aParent);
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
NS_IMETHOD
TransmitAutomaticData();
TransmitAutomaticData() MOZ_OVERRIDE;
virtual nscoord
FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize);
FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
protected:
nsMathMLmencloseFrame(nsStyleContext* aContext);

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmfencedFrame_h
#define nsMathMLmfencedFrame_h
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -26,37 +27,37 @@ public:
GetAdditionalStyleContext(int32_t aIndex) const;
NS_IMETHOD
InheritAutomaticData(nsIFrame* aParent);
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
NS_IMETHOD
SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
NS_IMETHOD
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
virtual nscoord
GetIntrinsicWidth(nsRenderingContext* aRenderingContext);
GetIntrinsicWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD
AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
// override the base method because we must keep separators in sync
virtual nsresult
ChildListChanged(int32_t aModType);
ChildListChanged(int32_t aModType) MOZ_OVERRIDE;
// override the base method so that we can deal with fences and separators
virtual nscoord
FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize);
FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
// helper routines to format the MathMLChars involved here
static nsresult

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmfracFrame_h___
#define nsMathMLmfracFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -64,24 +65,24 @@ public:
virtual nsresult
Place(nsRenderingContext& aRenderingContext,
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize);
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD
TransmitAutomaticData();
TransmitAutomaticData() MOZ_OVERRIDE;
NS_IMETHOD
UpdatePresentationDataFromChildAt(int32_t aFirstIndex,
int32_t aLastIndex,
uint32_t aFlagsValues,
uint32_t aFlagsToUpdate);
uint32_t aFlagsToUpdate) MOZ_OVERRIDE;
// override the base method so that we can deal with the fraction line
virtual nscoord
FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize);
FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
// helper to translate the thickness attribute into a usable form
static nscoord

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmoFrame_h___
#define nsMathMLmoFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLTokenFrame.h"
@ -32,26 +33,26 @@ public:
const nsDisplayListSet& aLists);
NS_IMETHOD
InheritAutomaticData(nsIFrame* aParent);
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
NS_IMETHOD
TransmitAutomaticData();
TransmitAutomaticData() MOZ_OVERRIDE;
NS_IMETHOD
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty();
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual nscoord
GetIntrinsicWidth(nsRenderingContext *aRenderingContext);
GetIntrinsicWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD
AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
// This method is called by the parent frame to ask <mo>
// to stretch itself.
@ -59,13 +60,13 @@ public:
Stretch(nsRenderingContext& aRenderingContext,
nsStretchDirection aStretchDirection,
nsBoundingMetrics& aContainerSize,
nsHTMLReflowMetrics& aDesiredStretchSize);
nsHTMLReflowMetrics& aDesiredStretchSize) MOZ_OVERRIDE;
protected:
nsMathMLmoFrame(nsStyleContext* aContext) : nsMathMLTokenFrame(aContext) {}
virtual ~nsMathMLmoFrame();
virtual int GetSkipSides() const { return 0; }
virtual int GetSkipSides() const MOZ_OVERRIDE { return 0; }
nsMathMLChar mMathMLChar; // Here is the MathMLChar that will deal with the operator.
nsOperatorFlags mFlags;
@ -75,7 +76,7 @@ protected:
bool UseMathMLChar();
// overload the base method so that we can setup our nsMathMLChar
virtual void ProcessTextData();
virtual void ProcessTextData() MOZ_OVERRIDE;
// helper to get our 'form' and lookup in the Operator Dictionary to fetch
// our default data that may come from there, and to complete the setup

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmpaddedFrame_h___
#define nsMathMLmpaddedFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -31,12 +32,12 @@ public:
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nsresult
Place(nsRenderingContext& aRenderingContext,
bool aPlaceOrigin,
nsHTMLReflowMetrics& aDesiredSize);
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
protected:
nsMathMLmpaddedFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {}

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmphantomFrame_h___
#define nsMathMLmphantomFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -29,7 +30,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists) { return NS_OK; }
const nsDisplayListSet& aLists) MOZ_OVERRIDE { return NS_OK; }
protected:
nsMathMLmphantomFrame(nsStyleContext* aContext)

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmrootFrame_h___
#define nsMathMLmrootFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -31,20 +32,20 @@ public:
nsIFrame* aPrevInFlow);
NS_IMETHOD
TransmitAutomaticData();
TransmitAutomaticData() MOZ_OVERRIDE;
NS_IMETHOD
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nscoord
GetIntrinsicWidth(nsRenderingContext* aRenderingContext);
GetIntrinsicWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
protected:
nsMathMLmrootFrame(nsStyleContext* aContext);

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmrowFrame_h___
#define nsMathMLmrowFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -28,7 +29,7 @@ public:
InheritAutomaticData(nsIFrame* aParent);
NS_IMETHOD
TransmitAutomaticData() {
TransmitAutomaticData() MOZ_OVERRIDE {
return TransmitAutomaticDataForMrowLikeElement();
}

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmspaceFrame_h___
#define nsMathMLmspaceFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -33,7 +34,7 @@ public:
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
protected:
nsMathMLmspaceFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {}

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmsqrtFrame_h___
#define nsMathMLmsqrtFrame_h___
#include "mozilla/Attributes.h"
#include "nsMathMLmencloseFrame.h"
//
@ -44,12 +45,12 @@ public:
nsIFrame* aPrevInFlow);
NS_IMETHOD
InheritAutomaticData(nsIFrame* aParent);
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
NS_IMETHOD
AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
protected:
nsMathMLmsqrtFrame(nsStyleContext* aContext);

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmstyleFrame_h___
#define nsMathMLmstyleFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -28,17 +29,17 @@ public:
InheritAutomaticData(nsIFrame* aParent);
NS_IMETHOD
TransmitAutomaticData();
TransmitAutomaticData() MOZ_OVERRIDE;
NS_IMETHOD
UpdatePresentationData(uint32_t aFlagsValues,
uint32_t aFlagsToUpdate);
uint32_t aFlagsToUpdate) MOZ_OVERRIDE;
NS_IMETHOD
UpdatePresentationDataFromChildAt(int32_t aFirstIndex,
int32_t aLastIndex,
uint32_t aFlagsValues,
uint32_t aFlagsToUpdate);
uint32_t aFlagsToUpdate) MOZ_OVERRIDE;
protected:
nsMathMLmstyleFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {}

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmtableFrame_h___
#define nsMathMLmtableFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -25,7 +26,7 @@ public:
// Overloaded nsIMathMLFrame methods
NS_IMETHOD
InheritAutomaticData(nsIFrame* aParent);
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
NS_IMETHOD
UpdatePresentationData(uint32_t aFlagsValues,
@ -35,7 +36,7 @@ public:
UpdatePresentationDataFromChildAt(int32_t aFirstIndex,
int32_t aLastIndex,
uint32_t aFlagsValues,
uint32_t aWhichFlags);
uint32_t aWhichFlags) MOZ_OVERRIDE;
// overloaded nsTableOuterFrame methods
@ -43,7 +44,7 @@ public:
Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD
AttributeChanged(int32_t aNameSpaceID,
@ -143,7 +144,7 @@ public:
NS_IMETHOD
AppendFrames(ChildListID aListID,
nsFrameList& aFrameList)
nsFrameList& aFrameList) MOZ_OVERRIDE
{
nsresult rv = nsTableRowFrame::AppendFrames(aListID, aFrameList);
RestyleTable();
@ -153,7 +154,7 @@ public:
NS_IMETHOD
InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList)
nsFrameList& aFrameList) MOZ_OVERRIDE
{
nsresult rv = nsTableRowFrame::InsertFrames(aListID, aPrevFrame, aFrameList);
RestyleTable();
@ -162,7 +163,7 @@ public:
NS_IMETHOD
RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame)
nsIFrame* aOldFrame) MOZ_OVERRIDE
{
nsresult rv = nsTableRowFrame::RemoveFrame(aListID, aOldFrame);
RestyleTable();
@ -205,8 +206,8 @@ public:
nsIAtom* aAttribute,
int32_t aModType);
virtual int32_t GetRowSpan();
virtual int32_t GetColSpan();
virtual int32_t GetRowSpan() MOZ_OVERRIDE;
virtual int32_t GetColSpan() MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
{
return nsTableCellFrame::IsFrameOfType(aFlags & ~(nsIFrame::eMathML));
@ -233,7 +234,7 @@ public:
UpdatePresentationDataFromChildAt(int32_t aFirstIndex,
int32_t aLastIndex,
uint32_t aFlagsValues,
uint32_t aFlagsToUpdate)
uint32_t aFlagsToUpdate) MOZ_OVERRIDE
{
nsMathMLContainerFrame::PropagatePresentationDataFromChildAt(this,
aFirstIndex, aLastIndex, aFlagsValues, aFlagsToUpdate);
@ -256,7 +257,7 @@ protected:
nsMathMLmtdInnerFrame(nsStyleContext* aContext) : nsBlockFrame(aContext) {}
virtual ~nsMathMLmtdInnerFrame();
virtual int GetSkipSides() const { return 0; }
virtual int GetSkipSides() const MOZ_OVERRIDE { return 0; }
}; // class nsMathMLmtdInnerFrame
#endif /* nsMathMLmtableFrame_h___ */

View File

@ -6,6 +6,7 @@
#ifndef nsMathMLmunderoverFrame_h___
#define nsMathMLmunderoverFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsMathMLContainerFrame.h"
@ -28,22 +29,22 @@ public:
InheritAutomaticData(nsIFrame* aParent);
NS_IMETHOD
TransmitAutomaticData();
TransmitAutomaticData() MOZ_OVERRIDE;
NS_IMETHOD
UpdatePresentationData(uint32_t aFlagsValues,
uint32_t aFlagsToUpdate);
uint32_t aFlagsToUpdate) MOZ_OVERRIDE;
NS_IMETHOD
UpdatePresentationDataFromChildAt(int32_t aFirstIndex,
int32_t aLastIndex,
uint32_t aFlagsValues,
uint32_t aFlagsToUpdate);
uint32_t aFlagsToUpdate) MOZ_OVERRIDE;
NS_IMETHOD
AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
protected:
nsMathMLmunderoverFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {}

View File

@ -38,10 +38,10 @@ public:
// nsIStyleRuleProcessor (parts)
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData);
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData);
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
virtual nsRestyleHint
HasAttributeDependentStyle(AttributeRuleProcessorData* aData);
virtual bool MediumFeaturesChanged(nsPresContext* aPresContext);
HasAttributeDependentStyle(AttributeRuleProcessorData* aData) MOZ_OVERRIDE;
virtual bool MediumFeaturesChanged(nsPresContext* aPresContext) MOZ_OVERRIDE;
virtual NS_MUST_OVERRIDE size_t
SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
virtual NS_MUST_OVERRIDE size_t
@ -79,7 +79,7 @@ public:
// nsIStyleRule implementation
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
void AddValue(nsCSSProperty aProperty, nsStyleAnimation::Value &aStartValue)

View File

@ -277,7 +277,7 @@ public:
// nsIStyleRule interface
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
protected:

View File

@ -5,6 +5,7 @@
#ifndef nsAnimationManager_h_
#define nsAnimationManager_h_
#include "mozilla/Attributes.h"
#include "AnimationCommon.h"
#include "nsCSSPseudoElements.h"
#include "nsStyleContext.h"
@ -187,11 +188,11 @@ public:
}
// nsIStyleRuleProcessor (parts)
virtual void RulesMatching(ElementRuleProcessorData* aData);
virtual void RulesMatching(PseudoElementRuleProcessorData* aData);
virtual void RulesMatching(AnonBoxRuleProcessorData* aData);
virtual void RulesMatching(ElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(PseudoElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(AnonBoxRuleProcessorData* aData) MOZ_OVERRIDE;
#ifdef MOZ_XUL
virtual void RulesMatching(XULTreeRuleProcessorData* aData);
virtual void RulesMatching(XULTreeRuleProcessorData* aData) MOZ_OVERRIDE;
#endif
virtual NS_MUST_OVERRIDE size_t
SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
@ -199,7 +200,7 @@ public:
SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
// nsARefreshObserver
virtual void WillRefresh(mozilla::TimeStamp aTime);
virtual void WillRefresh(mozilla::TimeStamp aTime) MOZ_OVERRIDE;
/**
* Return the style rule that RulesMatching should add for

View File

@ -12,6 +12,7 @@
#ifndef nsCSSRuleProcessor_h_
#define nsCSSRuleProcessor_h_
#include "mozilla/Attributes.h"
#include "nsIStyleRuleProcessor.h"
#include "nsCSSStyleSheet.h"
#include "nsTArray.h"
@ -88,24 +89,24 @@ public:
static bool IsLink(mozilla::dom::Element* aElement);
// nsIStyleRuleProcessor
virtual void RulesMatching(ElementRuleProcessorData* aData);
virtual void RulesMatching(ElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(PseudoElementRuleProcessorData* aData);
virtual void RulesMatching(PseudoElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(AnonBoxRuleProcessorData* aData);
virtual void RulesMatching(AnonBoxRuleProcessorData* aData) MOZ_OVERRIDE;
#ifdef MOZ_XUL
virtual void RulesMatching(XULTreeRuleProcessorData* aData);
virtual void RulesMatching(XULTreeRuleProcessorData* aData) MOZ_OVERRIDE;
#endif
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData);
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData);
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
virtual nsRestyleHint
HasAttributeDependentStyle(AttributeRuleProcessorData* aData);
HasAttributeDependentStyle(AttributeRuleProcessorData* aData) MOZ_OVERRIDE;
virtual bool MediumFeaturesChanged(nsPresContext* aPresContext);
virtual bool MediumFeaturesChanged(nsPresContext* aPresContext) MOZ_OVERRIDE;
virtual NS_MUST_OVERRIDE size_t
SizeOfExcludingThis(nsMallocSizeOfFun mallocSizeOf) const MOZ_OVERRIDE;

View File

@ -169,8 +169,8 @@ public:
SetIsDOMBinding();
}
virtual nsINode *GetParentObject();
virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName);
virtual nsINode *GetParentObject() MOZ_OVERRIDE;
virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName) MOZ_OVERRIDE;
nsresult GetPropertyValue(nsCSSFontDesc aFontDescID,
nsAString & aResult) const;
@ -229,7 +229,7 @@ public:
void SetDesc(nsCSSFontDesc aDescID, nsCSSValue const & aValue);
void GetDesc(nsCSSFontDesc aDescID, nsCSSValue & aValue);
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
protected:
friend class nsCSSFontFaceStyleDecl;
@ -308,12 +308,12 @@ public:
nsCSSKeyframeStyleDeclaration(nsCSSKeyframeRule *aRule);
virtual ~nsCSSKeyframeStyleDeclaration();
NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent);
NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent) MOZ_OVERRIDE;
void DropReference() { mRule = nullptr; }
virtual mozilla::css::Declaration* GetCSSDeclaration(bool aAllocate);
virtual nsresult SetCSSDeclaration(mozilla::css::Declaration* aDecl);
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv);
virtual nsIDocument* DocToUpdate();
virtual mozilla::css::Declaration* GetCSSDeclaration(bool aAllocate) MOZ_OVERRIDE;
virtual nsresult SetCSSDeclaration(mozilla::css::Declaration* aDecl) MOZ_OVERRIDE;
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv) MOZ_OVERRIDE;
virtual nsIDocument* DocToUpdate() MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsCSSKeyframeStyleDeclaration,
@ -365,7 +365,7 @@ public:
void ChangeDeclaration(mozilla::css::Declaration* aDeclaration);
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
private:
nsAutoTArray<float, 1> mKeys;
@ -413,7 +413,7 @@ public:
const nsString& GetName() { return mName; }
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
private:
uint32_t FindRuleIndexForKey(const nsAString& aKey);

View File

@ -116,22 +116,22 @@ public:
// nsIStyleSheet interface
virtual nsIURI* GetSheetURI() const;
virtual nsIURI* GetBaseURI() const;
virtual void GetTitle(nsString& aTitle) const;
virtual void GetType(nsString& aType) const;
virtual bool HasRules() const;
virtual bool IsApplicable() const;
virtual void SetEnabled(bool aEnabled);
virtual bool IsComplete() const;
virtual void SetComplete();
virtual nsIStyleSheet* GetParentSheet() const; // may be null
virtual nsIDocument* GetOwningDocument() const; // may be null
virtual void SetOwningDocument(nsIDocument* aDocument);
virtual nsIURI* GetBaseURI() const MOZ_OVERRIDE;
virtual void GetTitle(nsString& aTitle) const MOZ_OVERRIDE;
virtual void GetType(nsString& aType) const MOZ_OVERRIDE;
virtual bool HasRules() const MOZ_OVERRIDE;
virtual bool IsApplicable() const MOZ_OVERRIDE;
virtual void SetEnabled(bool aEnabled) MOZ_OVERRIDE;
virtual bool IsComplete() const MOZ_OVERRIDE;
virtual void SetComplete() MOZ_OVERRIDE;
virtual nsIStyleSheet* GetParentSheet() const MOZ_OVERRIDE; // may be null
virtual nsIDocument* GetOwningDocument() const MOZ_OVERRIDE; // may be null
virtual void SetOwningDocument(nsIDocument* aDocument) MOZ_OVERRIDE;
// Find the ID of the owner inner window.
uint64_t FindOwningWindowInnerID() const;
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
void AppendStyleSheet(nsCSSStyleSheet* aSheet);
@ -240,7 +240,7 @@ public:
// list after we clone a unique inner for ourselves.
static bool RebuildChildList(mozilla::css::Rule* aRule, void* aBuilder);
size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
// Get this style sheet's CORS mode
mozilla::CORSMode GetCORSMode() const { return mInner->mCORSMode; }

View File

@ -8,6 +8,7 @@
#ifndef nsComputedDOMStyle_h__
#define nsComputedDOMStyle_h__
#include "mozilla/Attributes.h"
#include "nsDOMCSSDeclaration.h"
#include "nsROCSSPrimitiveValue.h"
@ -44,7 +45,7 @@ public:
static void Shutdown();
virtual nsINode *GetParentObject()
virtual nsINode *GetParentObject() MOZ_OVERRIDE
{
return mContent;
}
@ -70,10 +71,10 @@ public:
// nsDOMCSSDeclaration abstract methods which should never be called
// on a nsComputedDOMStyle object, but must be defined to avoid
// compile errors.
virtual mozilla::css::Declaration* GetCSSDeclaration(bool);
virtual nsresult SetCSSDeclaration(mozilla::css::Declaration*);
virtual nsIDocument* DocToUpdate();
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv);
virtual mozilla::css::Declaration* GetCSSDeclaration(bool) MOZ_OVERRIDE;
virtual nsresult SetCSSDeclaration(mozilla::css::Declaration*) MOZ_OVERRIDE;
virtual nsIDocument* DocToUpdate() MOZ_OVERRIDE;
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv) MOZ_OVERRIDE;
private:
void AssertFlushedPendingReflows() {

View File

@ -8,6 +8,7 @@
#ifndef nsDOMCSSAttributeDeclaration_h
#define nsDOMCSSAttributeDeclaration_h
#include "mozilla/Attributes.h"
#include "nsDOMCSSDeclaration.h"
#include "nsAutoPtr.h"
@ -37,14 +38,14 @@ public:
// If GetCSSDeclaration returns non-null, then the decl it returns
// is owned by our current style rule.
virtual mozilla::css::Declaration* GetCSSDeclaration(bool aAllocate);
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv);
NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent);
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv) MOZ_OVERRIDE;
NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent) MOZ_OVERRIDE;
virtual nsINode* GetParentObject();
virtual nsINode* GetParentObject() MOZ_OVERRIDE;
protected:
virtual nsresult SetCSSDeclaration(mozilla::css::Declaration* aDecl);
virtual nsIDocument* DocToUpdate();
virtual nsresult SetCSSDeclaration(mozilla::css::Declaration* aDecl) MOZ_OVERRIDE;
virtual nsIDocument* DocToUpdate() MOZ_OVERRIDE;
nsRefPtr<Element> mElement;

View File

@ -8,6 +8,7 @@
#ifndef nsDOMCSSDeclaration_h___
#define nsDOMCSSDeclaration_h___
#include "mozilla/Attributes.h"
#include "nsICSSDeclaration.h"
#include "nsIDOMCSS2Properties.h"
#include "nsCOMPtr.h"
@ -46,19 +47,19 @@ public:
// Require subclasses to implement |GetParentRule|.
//NS_DECL_NSIDOMCSSSTYLEDECLARATION
NS_IMETHOD GetCssText(nsAString & aCssText);
NS_IMETHOD SetCssText(const nsAString & aCssText);
NS_IMETHOD SetCssText(const nsAString & aCssText) MOZ_OVERRIDE;
NS_IMETHOD GetPropertyValue(const nsAString & propertyName,
nsAString & _retval);
nsAString & _retval) MOZ_OVERRIDE;
NS_IMETHOD GetPropertyCSSValue(const nsAString & propertyName,
nsIDOMCSSValue **_retval);
nsIDOMCSSValue **_retval) MOZ_OVERRIDE;
NS_IMETHOD RemoveProperty(const nsAString & propertyName,
nsAString & _retval);
NS_IMETHOD GetPropertyPriority(const nsAString & propertyName,
nsAString & _retval);
nsAString & _retval) MOZ_OVERRIDE;
NS_IMETHOD SetProperty(const nsAString & propertyName,
const nsAString & value, const nsAString & priority);
NS_IMETHOD GetLength(uint32_t *aLength);
NS_IMETHOD GetParentRule(nsIDOMCSSRule * *aParentRule) = 0;
const nsAString & value, const nsAString & priority) MOZ_OVERRIDE;
NS_IMETHOD GetLength(uint32_t *aLength) MOZ_OVERRIDE;
NS_IMETHOD GetParentRule(nsIDOMCSSRule * *aParentRule) MOZ_OVERRIDE = 0;
// We implement this as a shim which forwards to GetPropertyValue
// and SetPropertyValue; subclasses need not.

View File

@ -27,33 +27,33 @@ public:
// nsIStyleSheet
virtual nsIURI* GetSheetURI() const;
virtual nsIURI* GetBaseURI() const;
virtual void GetTitle(nsString& aTitle) const;
virtual void GetType(nsString& aType) const;
virtual bool HasRules() const;
virtual bool IsApplicable() const;
virtual void SetEnabled(bool aEnabled);
virtual bool IsComplete() const;
virtual void SetComplete();
virtual nsIStyleSheet* GetParentSheet() const; // will be null
virtual nsIDocument* GetOwningDocument() const;
virtual void SetOwningDocument(nsIDocument* aDocument);
virtual nsIURI* GetBaseURI() const MOZ_OVERRIDE;
virtual void GetTitle(nsString& aTitle) const MOZ_OVERRIDE;
virtual void GetType(nsString& aType) const MOZ_OVERRIDE;
virtual bool HasRules() const MOZ_OVERRIDE;
virtual bool IsApplicable() const MOZ_OVERRIDE;
virtual void SetEnabled(bool aEnabled) MOZ_OVERRIDE;
virtual bool IsComplete() const MOZ_OVERRIDE;
virtual void SetComplete() MOZ_OVERRIDE;
virtual nsIStyleSheet* GetParentSheet() const MOZ_OVERRIDE; // will be null
virtual nsIDocument* GetOwningDocument() const MOZ_OVERRIDE;
virtual void SetOwningDocument(nsIDocument* aDocument) MOZ_OVERRIDE;
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
// nsIStyleRuleProcessor
virtual void RulesMatching(ElementRuleProcessorData* aData);
virtual void RulesMatching(PseudoElementRuleProcessorData* aData);
virtual void RulesMatching(AnonBoxRuleProcessorData* aData);
virtual void RulesMatching(ElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(PseudoElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(AnonBoxRuleProcessorData* aData) MOZ_OVERRIDE;
#ifdef MOZ_XUL
virtual void RulesMatching(XULTreeRuleProcessorData* aData);
virtual void RulesMatching(XULTreeRuleProcessorData* aData) MOZ_OVERRIDE;
#endif
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData);
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData);
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
virtual nsRestyleHint
HasAttributeDependentStyle(AttributeRuleProcessorData* aData);
virtual bool MediumFeaturesChanged(nsPresContext* aPresContext);
HasAttributeDependentStyle(AttributeRuleProcessorData* aData) MOZ_OVERRIDE;
virtual bool MediumFeaturesChanged(nsPresContext* aPresContext) MOZ_OVERRIDE;
virtual NS_MUST_OVERRIDE size_t
SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
virtual NS_MUST_OVERRIDE size_t

View File

@ -34,33 +34,33 @@ public:
// nsIStyleSheet api
virtual nsIURI* GetSheetURI() const;
virtual nsIURI* GetBaseURI() const;
virtual void GetTitle(nsString& aTitle) const;
virtual void GetType(nsString& aType) const;
virtual bool HasRules() const;
virtual bool IsApplicable() const;
virtual void SetEnabled(bool aEnabled);
virtual bool IsComplete() const;
virtual void SetComplete();
virtual nsIStyleSheet* GetParentSheet() const; // will be null
virtual nsIDocument* GetOwningDocument() const;
virtual void SetOwningDocument(nsIDocument* aDocumemt);
virtual nsIURI* GetBaseURI() const MOZ_OVERRIDE;
virtual void GetTitle(nsString& aTitle) const MOZ_OVERRIDE;
virtual void GetType(nsString& aType) const MOZ_OVERRIDE;
virtual bool HasRules() const MOZ_OVERRIDE;
virtual bool IsApplicable() const MOZ_OVERRIDE;
virtual void SetEnabled(bool aEnabled) MOZ_OVERRIDE;
virtual bool IsComplete() const MOZ_OVERRIDE;
virtual void SetComplete() MOZ_OVERRIDE;
virtual nsIStyleSheet* GetParentSheet() const MOZ_OVERRIDE; // will be null
virtual nsIDocument* GetOwningDocument() const MOZ_OVERRIDE;
virtual void SetOwningDocument(nsIDocument* aDocumemt) MOZ_OVERRIDE;
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
// nsIStyleRuleProcessor API
virtual void RulesMatching(ElementRuleProcessorData* aData);
virtual void RulesMatching(PseudoElementRuleProcessorData* aData);
virtual void RulesMatching(AnonBoxRuleProcessorData* aData);
virtual void RulesMatching(ElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(PseudoElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(AnonBoxRuleProcessorData* aData) MOZ_OVERRIDE;
#ifdef MOZ_XUL
virtual void RulesMatching(XULTreeRuleProcessorData* aData);
virtual void RulesMatching(XULTreeRuleProcessorData* aData) MOZ_OVERRIDE;
#endif
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData);
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData);
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
virtual nsRestyleHint
HasAttributeDependentStyle(AttributeRuleProcessorData* aData);
virtual bool MediumFeaturesChanged(nsPresContext* aPresContext);
HasAttributeDependentStyle(AttributeRuleProcessorData* aData) MOZ_OVERRIDE;
virtual bool MediumFeaturesChanged(nsPresContext* aPresContext) MOZ_OVERRIDE;
virtual NS_MUST_OVERRIDE size_t
SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
virtual NS_MUST_OVERRIDE size_t
@ -94,7 +94,7 @@ private:
// nsIStyleRule interface
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
nscolor mColor;
@ -115,7 +115,7 @@ private:
// nsIStyleRule interface
virtual void MapRuleInfoInto(nsRuleData* aRuleData) = 0;
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
};

View File

@ -38,7 +38,7 @@ class nsEmptyStyleRule MOZ_FINAL : public nsIStyleRule
NS_DECL_ISUPPORTS
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
};
@ -47,7 +47,7 @@ class nsInitialStyleRule MOZ_FINAL : public nsIStyleRule
NS_DECL_ISUPPORTS
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
};

View File

@ -8,6 +8,7 @@
#ifndef nsTransitionManager_h_
#define nsTransitionManager_h_
#include "mozilla/Attributes.h"
#include "AnimationCommon.h"
#include "nsCSSPseudoElements.h"
@ -135,11 +136,11 @@ public:
nsStyleContext *aNewStyleContext);
// nsIStyleRuleProcessor (parts)
virtual void RulesMatching(ElementRuleProcessorData* aData);
virtual void RulesMatching(PseudoElementRuleProcessorData* aData);
virtual void RulesMatching(AnonBoxRuleProcessorData* aData);
virtual void RulesMatching(ElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(PseudoElementRuleProcessorData* aData) MOZ_OVERRIDE;
virtual void RulesMatching(AnonBoxRuleProcessorData* aData) MOZ_OVERRIDE;
#ifdef MOZ_XUL
virtual void RulesMatching(XULTreeRuleProcessorData* aData);
virtual void RulesMatching(XULTreeRuleProcessorData* aData) MOZ_OVERRIDE;
#endif
virtual NS_MUST_OVERRIDE size_t
SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
@ -147,7 +148,7 @@ public:
SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
// nsARefreshObserver
virtual void WillRefresh(mozilla::TimeStamp aTime);
virtual void WillRefresh(mozilla::TimeStamp aTime) MOZ_OVERRIDE;
private:
void ConsiderStartingTransition(nsCSSProperty aProperty,

View File

@ -6,6 +6,7 @@
#ifndef NS_SVGCONTAINERFRAME_H
#define NS_SVGCONTAINERFRAME_H
#include "mozilla/Attributes.h"
#include "gfxMatrix.h"
#include "gfxRect.h"
#include "nsContainerFrame.h"
@ -111,16 +112,16 @@ public:
// nsIFrame:
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
virtual bool IsSVGTransformed(gfxMatrix *aOwnTransform = nullptr,
gfxMatrix *aFromParentTransform = nullptr) const;
@ -128,13 +129,13 @@ public:
// nsISVGChildFrame interface:
NS_IMETHOD PaintSVG(nsRenderingContext* aContext,
const nsIntRect *aDirtyRect);
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint);
NS_IMETHOD_(nsRect) GetCoveredRegion();
virtual void ReflowSVG();
virtual void NotifySVGChanged(uint32_t aFlags);
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
NS_IMETHOD_(nsRect) GetCoveredRegion() MOZ_OVERRIDE;
virtual void ReflowSVG() MOZ_OVERRIDE;
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
virtual SVGBBox GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
uint32_t aFlags);
NS_IMETHOD_(bool) IsDisplayContainer() { return true; }
uint32_t aFlags) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsDisplayContainer() MOZ_OVERRIDE { return true; }
};
#endif

View File

@ -6,6 +6,7 @@
#ifndef NSSVGEFFECTS_H_
#define NSSVGEFFECTS_H_
#include "mozilla/Attributes.h"
#include "FramePropertyTable.h"
#include "mozilla/dom/Element.h"
#include "nsHashKeys.h"
@ -112,10 +113,10 @@ public:
virtual ~nsSVGIDRenderingObserver();
protected:
Element* GetTarget() { return mElement.get(); }
Element* GetTarget() MOZ_OVERRIDE { return mElement.get(); }
// This is called when the referenced resource changes.
virtual void DoUpdate();
virtual void DoUpdate() MOZ_OVERRIDE;
class SourceReference : public nsReferencedElement {
public:
@ -167,7 +168,7 @@ public:
private:
// nsSVGRenderingObserver
virtual void DoUpdate();
virtual void DoUpdate() MOZ_OVERRIDE;
};
class nsSVGMarkerProperty : public nsSVGIDRenderingObserver {
@ -176,7 +177,7 @@ public:
: nsSVGIDRenderingObserver(aURI, aFrame, aReferenceImage) {}
protected:
virtual void DoUpdate();
virtual void DoUpdate() MOZ_OVERRIDE;
};
class nsSVGTextPathProperty : public nsSVGIDRenderingObserver {
@ -185,7 +186,7 @@ public:
: nsSVGIDRenderingObserver(aURI, aFrame, aReferenceImage) {}
protected:
virtual void DoUpdate();
virtual void DoUpdate() MOZ_OVERRIDE;
};
class nsSVGPaintingProperty : public nsSVGIDRenderingObserver {
@ -194,7 +195,7 @@ public:
: nsSVGIDRenderingObserver(aURI, aFrame, aReferenceImage) {}
protected:
virtual void DoUpdate();
virtual void DoUpdate() MOZ_OVERRIDE;
};
/**

View File

@ -6,6 +6,7 @@
#ifndef NSSVGFOREIGNOBJECTFRAME_H__
#define NSSVGFOREIGNOBJECTFRAME_H__
#include "mozilla/Attributes.h"
#include "nsContainerFrame.h"
#include "nsIPresShell.h"
#include "nsISVGChildFrame.h"
@ -83,13 +84,13 @@ public:
// nsISVGChildFrame interface:
NS_IMETHOD PaintSVG(nsRenderingContext *aContext,
const nsIntRect *aDirtyRect);
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint);
NS_IMETHOD_(nsRect) GetCoveredRegion();
virtual void ReflowSVG();
virtual void NotifySVGChanged(uint32_t aFlags);
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
NS_IMETHOD_(nsRect) GetCoveredRegion() MOZ_OVERRIDE;
virtual void ReflowSVG() MOZ_OVERRIDE;
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
virtual SVGBBox GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
uint32_t aFlags);
NS_IMETHOD_(bool) IsDisplayContainer() { return true; }
uint32_t aFlags) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsDisplayContainer() MOZ_OVERRIDE { return true; }
gfxMatrix GetCanvasTM(uint32_t aFor);

View File

@ -6,6 +6,7 @@
#ifndef __NS_SVGGLYPHFRAME_H__
#define __NS_SVGGLYPHFRAME_H__
#include "mozilla/Attributes.h"
#include "gfxFont.h"
#include "nsISVGGlyphFragmentNode.h"
#include "nsISVGChildFrame.h"
@ -155,14 +156,14 @@ public:
// These four always use the global transform, even if NS_STATE_NONDISPLAY_CHILD
NS_IMETHOD PaintSVG(nsRenderingContext *aContext,
const nsIntRect *aDirtyRect);
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint);
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
virtual SVGBBox GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
uint32_t aFlags);
uint32_t aFlags) MOZ_OVERRIDE;
NS_IMETHOD_(nsRect) GetCoveredRegion();
virtual void ReflowSVG();
virtual void NotifySVGChanged(uint32_t aFlags);
NS_IMETHOD_(bool) IsDisplayContainer() { return false; }
NS_IMETHOD_(nsRect) GetCoveredRegion() MOZ_OVERRIDE;
virtual void ReflowSVG() MOZ_OVERRIDE;
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsDisplayContainer() MOZ_OVERRIDE { return false; }
// nsSVGGeometryFrame methods
gfxMatrix GetCanvasTM(uint32_t aFor);
@ -170,12 +171,12 @@ public:
// nsISVGGlyphFragmentNode interface:
// These do not use the global transform if NS_STATE_NONDISPLAY_CHILD
virtual uint32_t GetNumberOfChars();
virtual float GetComputedTextLength();
virtual float GetSubStringLength(uint32_t charnum, uint32_t fragmentChars);
virtual int32_t GetCharNumAtPosition(nsIDOMSVGPoint *point);
NS_IMETHOD_(nsSVGGlyphFrame *) GetFirstGlyphFrame();
NS_IMETHOD_(nsSVGGlyphFrame *) GetNextGlyphFrame();
NS_IMETHOD_(void) SetWhitespaceCompression(bool aCompressWhitespace) {
virtual float GetComputedTextLength() MOZ_OVERRIDE;
virtual float GetSubStringLength(uint32_t charnum, uint32_t fragmentChars) MOZ_OVERRIDE;
virtual int32_t GetCharNumAtPosition(nsIDOMSVGPoint *point) MOZ_OVERRIDE;
NS_IMETHOD_(nsSVGGlyphFrame *) GetFirstGlyphFrame() MOZ_OVERRIDE;
NS_IMETHOD_(nsSVGGlyphFrame *) GetNextGlyphFrame() MOZ_OVERRIDE;
NS_IMETHOD_(void) SetWhitespaceCompression(bool aCompressWhitespace) MOZ_OVERRIDE {
if (mCompressWhitespace != aCompressWhitespace) {
mCompressWhitespace = aCompressWhitespace;
ClearTextRun();

View File

@ -6,6 +6,7 @@
#ifndef __NS_SVGPATHGEOMETRYFRAME_H__
#define __NS_SVGPATHGEOMETRYFRAME_H__
#include "mozilla/Attributes.h"
#include "gfxMatrix.h"
#include "gfxRect.h"
#include "nsFrame.h"
@ -84,13 +85,13 @@ protected:
// nsISVGChildFrame interface:
NS_IMETHOD PaintSVG(nsRenderingContext *aContext,
const nsIntRect *aDirtyRect);
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint);
NS_IMETHOD_(nsRect) GetCoveredRegion();
virtual void ReflowSVG();
virtual void NotifySVGChanged(uint32_t aFlags);
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
NS_IMETHOD_(nsRect) GetCoveredRegion() MOZ_OVERRIDE;
virtual void ReflowSVG() MOZ_OVERRIDE;
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
virtual SVGBBox GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
uint32_t aFlags);
NS_IMETHOD_(bool) IsDisplayContainer() { return false; }
uint32_t aFlags) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsDisplayContainer() MOZ_OVERRIDE { return false; }
protected:
void GeneratePath(gfxContext *aContext, const gfxMatrix &aTransform);

View File

@ -6,6 +6,7 @@
#ifndef NSSVGTSPANFRAME_H
#define NSSVGTSPANFRAME_H
#include "mozilla/Attributes.h"
#include "gfxMatrix.h"
#include "nsFrame.h"
#include "nsISVGGlyphFragmentNode.h"
@ -65,12 +66,12 @@ public:
// nsISVGGlyphFragmentNode interface:
virtual uint32_t GetNumberOfChars();
virtual float GetComputedTextLength();
virtual float GetSubStringLength(uint32_t charnum, uint32_t fragmentChars);
virtual int32_t GetCharNumAtPosition(nsIDOMSVGPoint *point);
NS_IMETHOD_(nsSVGGlyphFrame *) GetFirstGlyphFrame();
NS_IMETHOD_(nsSVGGlyphFrame *) GetNextGlyphFrame();
NS_IMETHOD_(void) SetWhitespaceCompression(bool aCompressWhitespace);
virtual float GetComputedTextLength() MOZ_OVERRIDE;
virtual float GetSubStringLength(uint32_t charnum, uint32_t fragmentChars) MOZ_OVERRIDE;
virtual int32_t GetCharNumAtPosition(nsIDOMSVGPoint *point) MOZ_OVERRIDE;
NS_IMETHOD_(nsSVGGlyphFrame *) GetFirstGlyphFrame() MOZ_OVERRIDE;
NS_IMETHOD_(nsSVGGlyphFrame *) GetNextGlyphFrame() MOZ_OVERRIDE;
NS_IMETHOD_(void) SetWhitespaceCompression(bool aCompressWhitespace) MOZ_OVERRIDE;
};
#endif

View File

@ -6,6 +6,7 @@
#ifndef NS_SVGTEXTCONTAINERFRAME_H
#define NS_SVGTEXTCONTAINERFRAME_H
#include "mozilla/Attributes.h"
#include "nsFrame.h"
#include "nsIFrame.h"
#include "nsISVGChildFrame.h"
@ -40,8 +41,8 @@ public:
// nsIFrame
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
NS_IMETHOD RemoveFrame(ChildListID aListID, nsIFrame *aOldFrame);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID, nsIFrame *aOldFrame) MOZ_OVERRIDE;
NS_IMETHOD GetStartPositionOfChar(uint32_t charnum, nsIDOMSVGPoint **_retval);
NS_IMETHOD GetEndPositionOfChar(uint32_t charnum, nsIDOMSVGPoint **_retval);

View File

@ -12,6 +12,7 @@
#ifndef BasicTableLayoutStrategy_h_
#define BasicTableLayoutStrategy_h_
#include "mozilla/Attributes.h"
#include "nsITableLayoutStrategy.h"
class nsTableFrame;
@ -23,11 +24,11 @@ public:
virtual ~BasicTableLayoutStrategy();
// nsITableLayoutStrategy implementation
virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext* aRenderingContext,
bool aComputingSize);
virtual void MarkIntrinsicWidthsDirty();
virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState);
bool aComputingSize) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState) MOZ_OVERRIDE;
private:
// NOTE: Using prefix "BTLS" to avoid overlapping names with

View File

@ -12,6 +12,7 @@
#ifndef FixedTableLayoutStrategy_h_
#define FixedTableLayoutStrategy_h_
#include "mozilla/Attributes.h"
#include "nsITableLayoutStrategy.h"
class nsTableFrame;
@ -23,11 +24,11 @@ public:
virtual ~FixedTableLayoutStrategy();
// nsITableLayoutStrategy implementation
virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext);
virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext* aRenderingContext,
bool aComputingSize);
virtual void MarkIntrinsicWidthsDirty();
virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState);
bool aComputingSize) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState) MOZ_OVERRIDE;
private:
nsTableFrame *mTableFrame;

View File

@ -5,6 +5,7 @@
#ifndef nsTableCellFrame_h__
#define nsTableCellFrame_h__
#include "mozilla/Attributes.h"
#include "nsITableCellLayout.h"
#include "nscore.h"
#include "nsContainerFrame.h"
@ -68,12 +69,12 @@ public:
// so these functions should never be called. They assert and return
// NS_ERROR_NOT_IMPLEMENTED
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nsIFrame* GetContentInsertionFrame() {
return GetFirstPrincipalChild()->GetContentInsertionFrame();
@ -83,7 +84,7 @@ public:
virtual void NotifyPercentHeight(const nsHTMLReflowState& aReflowState);
virtual bool NeedsToObserve(const nsHTMLReflowState& aReflowState);
virtual bool NeedsToObserve(const nsHTMLReflowState& aReflowState) MOZ_OVERRIDE;
/** instantiate a new instance of nsTableRowFrame.
* @param aPresShell the pres shell for this frame
@ -94,7 +95,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
void PaintCellBackground(nsRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, nsPoint aPt,
@ -164,7 +165,7 @@ public:
NS_IMETHOD GetCellIndexes(int32_t &aRowIndex, int32_t &aColIndex);
/** return the mapped cell's row index (starting at 0 for the first row) */
virtual nsresult GetRowIndex(int32_t &aRowIndex) const;
virtual nsresult GetRowIndex(int32_t &aRowIndex) const MOZ_OVERRIDE;
/**
* return the cell's specified col span. this is what was specified in the
@ -175,7 +176,7 @@ public:
virtual int32_t GetColSpan();
/** return the cell's column index (starting at 0 for the first column) */
virtual nsresult GetColIndex(int32_t &aColIndex) const;
virtual nsresult GetColIndex(int32_t &aColIndex) const MOZ_OVERRIDE;
void SetColIndex(int32_t aColIndex);
/** return the available width given to this frame during its last reflow */
@ -286,13 +287,13 @@ public:
~nsBCTableCellFrame();
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual nsMargin GetUsedBorder() const;
virtual bool GetBorderRadii(nscoord aRadii[8]) const;
// Get the *inner half of the border only*, in twips.
virtual nsMargin* GetBorderWidth(nsMargin& aBorder) const;
virtual nsMargin* GetBorderWidth(nsMargin& aBorder) const MOZ_OVERRIDE;
// Get the *inner half of the border only*, in pixels.
BCPixelSize GetBorderWidth(mozilla::css::Side aSide) const;
@ -300,16 +301,16 @@ public:
// Set the full (both halves) width of the border
void SetBorderWidth(mozilla::css::Side aSide, BCPixelSize aPixelValue);
virtual nsMargin GetBorderOverflow();
virtual nsMargin GetBorderOverflow() MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual void PaintBackground(nsRenderingContext& aRenderingContext,
const nsRect& aDirtyRect,
nsPoint aPt,
uint32_t aFlags);
uint32_t aFlags) MOZ_OVERRIDE;
private:

View File

@ -5,6 +5,7 @@
#ifndef nsTableColFrame_h__
#define nsTableColFrame_h__
#include "mozilla/Attributes.h"
#include "nscore.h"
#include "nsContainerFrame.h"
#include "nsTablePainter.h"
@ -39,7 +40,7 @@ public:
friend nsTableColFrame* NS_NewTableColFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);
/** @see nsIFrame::DidSetStyleContext */
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
int32_t GetColIndex() const;
@ -50,7 +51,7 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
/**
* Table columns never paint anything, nor receive events.
@ -64,13 +65,13 @@ public:
*
* @see nsGkAtoms::tableColFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual nsSplittableType GetSplittableType() const;
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE;
/** return the number of the columns the col represents. always >= 1 */
int32_t GetSpan();

View File

@ -5,6 +5,7 @@
#ifndef nsTableColGroupFrame_h__
#define nsTableColGroupFrame_h__
#include "mozilla/Attributes.h"
#include "nscore.h"
#include "nsContainerFrame.h"
#include "nsTableColFrame.h"
@ -42,7 +43,7 @@ public:
* @see nsIFrame::SetInitialChildList
*/
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
/**
* ColGroups never paint anything, nor receive events.
@ -77,17 +78,17 @@ public:
static nsTableColGroupFrame* GetLastRealColGroup(nsTableFrame* aTableFrame);
/** @see nsIFrame::DidSetStyleContext */
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
/** @see nsIFrame::AppendFrames, InsertFrames, RemoveFrame
*/
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
/** remove the column aChild from the column group, if requested renumber
* the subsequent columns in this column group and all following column
@ -108,14 +109,14 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::tableColGroupFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
/** Add column frames to the table storages: colframe cache and cellmap
* this doesn't change the mFrames of the colgroup frame.
@ -136,7 +137,7 @@ public:
const nsFrameList::Slice& aCols);
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
void Dump(int32_t aIndent);
#endif

View File

@ -5,6 +5,7 @@
#ifndef nsTableOuterFrame_h__
#define nsTableOuterFrame_h__
#include "mozilla/Attributes.h"
#include "nscore.h"
#include "nsContainerFrame.h"
#include "nsBlockFrame.h"
@ -28,11 +29,11 @@ public:
virtual nsIFrame* GetParentStyleContextFrame() const;
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
protected:
@ -68,32 +69,32 @@ public:
virtual void DestroyFrom(nsIFrame* aDestructRoot);
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
virtual const nsFrameList& GetChildList(ChildListID aListID) const;
virtual void GetChildLists(nsTArray<ChildList>* aLists) const;
virtual void GetChildLists(nsTArray<ChildList>* aLists) const MOZ_OVERRIDE;
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nsIFrame* GetContentInsertionFrame() {
return GetFirstPrincipalChild()->GetContentInsertionFrame();
}
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
nsresult BuildDisplayListForInnerTable(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -101,12 +102,12 @@ public:
virtual nscoord GetBaseline() const;
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 ComputeAutoSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
nsSize aMargin, nsSize aBorder,
nsSize aPadding, bool aShrinkWrap);
nsSize aPadding, bool aShrinkWrap) MOZ_OVERRIDE;
/** process a reflow command for the table.
* This involves reflowing the caption and the inner table.
@ -114,20 +115,20 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
/**
* Get the "type" of the frame
*
* @see nsGkAtoms::tableOuterFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
virtual nsIFrame* GetParentStyleContextFrame() const;
virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
/*---------------- nsITableLayout methods ------------------------*/
@ -140,10 +141,10 @@ public:
bool& aIsSelected);
/** @see nsITableFrame::GetTableSize */
NS_IMETHOD GetTableSize(int32_t& aRowCount, int32_t& aColCount);
NS_IMETHOD GetTableSize(int32_t& aRowCount, int32_t& aColCount) MOZ_OVERRIDE;
NS_IMETHOD GetIndexByRowAndColumn(int32_t aRow, int32_t aColumn, int32_t *aIndex);
NS_IMETHOD GetRowAndColumnByIndex(int32_t aIndex, int32_t *aRow, int32_t *aColumn);
NS_IMETHOD GetIndexByRowAndColumn(int32_t aRow, int32_t aColumn, int32_t *aIndex) MOZ_OVERRIDE;
NS_IMETHOD GetRowAndColumnByIndex(int32_t aIndex, int32_t *aRow, int32_t *aColumn) MOZ_OVERRIDE;
protected:

View File

@ -5,6 +5,7 @@
#ifndef nsTableRowFrame_h__
#define nsTableRowFrame_h__
#include "mozilla/Attributes.h"
#include "nscore.h"
#include "nsContainerFrame.h"
#include "nsTablePainter.h"
@ -43,17 +44,17 @@ public:
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
/** @see nsIFrame::DidSetStyleContext */
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
/** instantiate a new instance of nsTableRowFrame.
* @param aPresShell the pres shell for this frame
@ -68,7 +69,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
nsTableCellFrame* GetFirstCell() ;
@ -88,7 +89,7 @@ public:
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
void DidResize();
@ -97,10 +98,10 @@ public:
*
* @see nsGkAtoms::tableRowFrame
*/
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
void UpdateHeight(nscoord aHeight,
@ -224,7 +225,7 @@ public:
BCPixelSize aPixelValue);
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();
virtual already_AddRefed<Accessible> CreateAccessible() MOZ_OVERRIDE;
#endif
protected:

View File

@ -5,6 +5,7 @@
#ifndef nsTableRowGroupFrame_h__
#define nsTableRowGroupFrame_h__
#include "mozilla/Attributes.h"
#include "nscore.h"
#include "nsContainerFrame.h"
#include "nsIAtom.h"
@ -79,14 +80,14 @@ public:
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nsMargin GetUsedMargin() const;
virtual nsMargin GetUsedBorder() const;
@ -94,7 +95,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
/** calls Reflow for all of its child rows.
* Rows are all set to the same width and stacked vertically.
@ -185,7 +186,7 @@ public:
// nsILineIterator methods
public:
virtual void DisposeLineIterator() { }
virtual void DisposeLineIterator() MOZ_OVERRIDE { }
// The table row is the equivalent to a line in block layout.
// The nsILineIterator assumes that a line resides in a block, this role is
@ -197,12 +198,12 @@ public:
/** Get the number of rows in a row group
* @return the number of lines in a row group
*/
virtual int32_t GetNumLines();
virtual int32_t GetNumLines() MOZ_OVERRIDE;
/** @see nsILineIterator.h GetDirection
* @return true if the table is rtl
*/
virtual bool GetDirection();
virtual bool GetDirection() MOZ_OVERRIDE;
/** Return structural information about a line.
* @param aLineNumber - the index of the row relative to the row group
@ -220,7 +221,7 @@ public:
nsIFrame** aFirstFrameOnLine,
int32_t* aNumFramesOnLine,
nsRect& aLineBounds,
uint32_t* aLineFlags);
uint32_t* aLineFlags) MOZ_OVERRIDE;
/** Given a frame that's a child of the rowgroup, find which line its on.
* @param aFrame - frame, should be a row
@ -229,7 +230,7 @@ public:
* frame and the index is at least aStartLine.
* -1 if the frame cannot be found.
*/
virtual int32_t FindLineContaining(nsIFrame* aFrame, int32_t aStartLine = 0);
virtual int32_t FindLineContaining(nsIFrame* aFrame, int32_t aStartLine = 0) MOZ_OVERRIDE;
/** Find the orginating cell frame on a row that is the nearest to the
* coordinate X.
@ -246,7 +247,7 @@ public:
nscoord aX,
nsIFrame** aFrameFound,
bool* aXIsBeforeFirstFrame,
bool* aXIsAfterLastFrame);
bool* aXIsAfterLastFrame) MOZ_OVERRIDE;
#ifdef IBMBIDI
/** Check whether visual and logical order of cell frames within a line are
@ -260,7 +261,7 @@ public:
NS_IMETHOD CheckLineOrder(int32_t aLine,
bool *aIsReordered,
nsIFrame **aFirstVisual,
nsIFrame **aLastVisual);
nsIFrame **aLastVisual) MOZ_OVERRIDE;
#endif
/** Find the next originating cell frame that originates in the row.
@ -268,7 +269,7 @@ public:
* originating in a row
* @param aLineNumber - the index of the row relative to the table
*/
NS_IMETHOD GetNextSiblingOnLine(nsIFrame*& aFrame, int32_t aLineNumber);
NS_IMETHOD GetNextSiblingOnLine(nsIFrame*& aFrame, int32_t aLineNumber) MOZ_OVERRIDE;
// row cursor methods to speed up searching for the row(s)
// containing a point. The basic idea is that we set the cursor

View File

@ -7,6 +7,7 @@
#ifndef nsGridLayout2_h___
#define nsGridLayout2_h___
#include "mozilla/Attributes.h"
#include "nsStackLayout.h"
#include "nsIGridPart.h"
#include "nsCoord.h"
@ -31,23 +32,23 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual nsGridRowGroupLayout* CastToRowGroupLayout() { return nullptr; }
virtual nsGridLayout2* CastToGridLayout() { return this; }
virtual nsGrid* GetGrid(nsIFrame* aBox, int32_t* aIndex, nsGridRowLayout* aRequestor=nullptr);
virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox, nsIFrame** aParentBox) {
virtual nsGridLayout2* CastToGridLayout() MOZ_OVERRIDE { return this; }
virtual nsGrid* GetGrid(nsIFrame* aBox, int32_t* aIndex, nsGridRowLayout* aRequestor=nullptr) MOZ_OVERRIDE;
virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox, nsIFrame** aParentBox) MOZ_OVERRIDE {
NS_NOTREACHED("Should not be called"); return nullptr;
}
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount, int32_t& aComputedColumnCount) { aRowCount++; }
virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) { }
virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows);
virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal);
virtual Type GetType() { return eGrid; }
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount, int32_t& aComputedColumnCount) MOZ_OVERRIDE { aRowCount++; }
virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) MOZ_OVERRIDE { }
virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows) MOZ_OVERRIDE;
virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) MOZ_OVERRIDE;
virtual Type GetType() MOZ_OVERRIDE { return eGrid; }
virtual void ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
nsIFrame* aPrevBox,
const nsFrameList::Slice& aNewChildren);

View File

@ -14,6 +14,7 @@
#ifndef nsGridRowGroupFrame_h___
#define nsGridRowGroupFrame_h___
#include "mozilla/Attributes.h"
#include "nsBoxFrame.h"
/**
@ -28,7 +29,7 @@ public:
NS_DECL_FRAMEARENA_HELPERS
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("nsGridRowGroup"), aResult);
}
@ -39,7 +40,7 @@ public:
nsBoxLayout* aLayoutManager):
nsBoxFrame(aPresShell, aContext, false, aLayoutManager) {}
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState);
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
}; // class nsGridRowGroupFrame

View File

@ -13,6 +13,7 @@
#ifndef nsGridRowGroupLayout_h___
#define nsGridRowGroupLayout_h___
#include "mozilla/Attributes.h"
#include "nsGridRowLayout.h"
/**
@ -28,18 +29,18 @@ public:
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount, int32_t& aComputedColumnCount);
virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState);
virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows);
virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal);
virtual int32_t GetRowCount() { return mRowCount; }
virtual Type GetType() { return eRowGroup; }
virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount, int32_t& aComputedColumnCount) MOZ_OVERRIDE;
virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) MOZ_OVERRIDE;
virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows) MOZ_OVERRIDE;
virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) MOZ_OVERRIDE;
virtual int32_t GetRowCount() MOZ_OVERRIDE { return mRowCount; }
virtual Type GetType() MOZ_OVERRIDE { return eRowGroup; }
protected:
nsGridRowGroupLayout();
virtual ~nsGridRowGroupLayout();
virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState);
virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState) MOZ_OVERRIDE;
static void AddWidth(nsSize& aSize, nscoord aSize2, bool aIsHorizontal);
private:

View File

@ -13,6 +13,7 @@
#ifndef nsGridRowLayout_h___
#define nsGridRowLayout_h___
#include "mozilla/Attributes.h"
#include "nsSprocketLayout.h"
#include "nsIGridPart.h"
class nsGridRowGroupLayout;
@ -34,9 +35,9 @@ public:
NS_DECL_ISUPPORTS_INHERITED
virtual nsGridRowGroupLayout* CastToRowGroupLayout() { return nullptr; }
virtual nsGridLayout2* CastToGridLayout() { return nullptr; }
virtual nsGrid* GetGrid(nsIFrame* aBox, int32_t* aIndex, nsGridRowLayout* aRequestor=nullptr);
virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox, nsIFrame** aParentBox);
virtual nsGridLayout2* CastToGridLayout() MOZ_OVERRIDE { return nullptr; }
virtual nsGrid* GetGrid(nsIFrame* aBox, int32_t* aIndex, nsGridRowLayout* aRequestor=nullptr) MOZ_OVERRIDE;
virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox, nsIFrame** aParentBox) MOZ_OVERRIDE;
virtual void ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
nsIFrame* aPrevBox,
const nsFrameList::Slice& aNewChildren);
@ -44,7 +45,7 @@ public:
const nsFrameList::Slice& aNewChildren);
virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList);
virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList);
virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal);
virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) MOZ_OVERRIDE;
virtual nsIGridPart* AsGridPart() { return this; }

View File

@ -14,6 +14,7 @@
#ifndef nsGridRowLeafFrame_h___
#define nsGridRowLeafFrame_h___
#include "mozilla/Attributes.h"
#include "nsBoxFrame.h"
/**
@ -32,7 +33,7 @@ public:
nsStyleContext* aContext);
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("nsGridRowLeaf"), aResult);
}

View File

@ -13,6 +13,7 @@
#ifndef nsGridRowLeafLayout_h___
#define nsGridRowLeafLayout_h___
#include "mozilla/Attributes.h"
#include "nsGridRowLayout.h"
#include "nsCOMPtr.h"
@ -31,22 +32,22 @@ public:
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState);
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount, int32_t& aComputedColumnCount);
virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState);
virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows);
virtual Type GetType() { return eRowLeaf; }
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount, int32_t& aComputedColumnCount) MOZ_OVERRIDE;
virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) MOZ_OVERRIDE;
virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows) MOZ_OVERRIDE;
virtual Type GetType() MOZ_OVERRIDE { return eRowLeaf; }
protected:
virtual void PopulateBoxSizes(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState,
nsBoxSize*& aBoxSizes, nscoord& aMinSize,
nscoord& aMaxSize, int32_t& aFlexes);
nscoord& aMaxSize, int32_t& aFlexes) MOZ_OVERRIDE;
virtual void ComputeChildSizes(nsIFrame* aBox,
nsBoxLayoutState& aState,
nscoord& aGivenSize,
nsBoxSize* aBoxSizes,
nsComputedBoxSize*& aComputedBoxSizes);
nsComputedBoxSize*& aComputedBoxSizes) MOZ_OVERRIDE;
nsGridRowLeafLayout();

View File

@ -14,6 +14,7 @@
#ifndef nsBoxFrame_h___
#define nsBoxFrame_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsContainerFrame.h"
#include "nsBoxLayout.h"
@ -70,13 +71,13 @@ public:
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
#ifdef DEBUG_LAYOUT
NS_IMETHOD SetDebug(nsBoxLayoutState& aBoxLayoutState, bool aDebug);
NS_IMETHOD GetDebug(bool& aDebug);
NS_IMETHOD GetDebug(bool& aDebug) MOZ_OVERRIDE;
#endif
virtual Valignment GetVAlign() const { return mValign; }
virtual Halignment GetHAlign() const { return mHalign; }
virtual Valignment GetVAlign() const MOZ_OVERRIDE { return mValign; }
virtual Halignment GetHAlign() const MOZ_OVERRIDE { return mHalign; }
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
virtual bool ComputesOwnOverflowArea() { return false; }
virtual bool ComputesOwnOverflowArea() MOZ_OVERRIDE { return false; }
// ----- child and sibling operations ---
@ -84,40 +85,40 @@ public:
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* asPrevInFlow);
nsIFrame* asPrevInFlow) MOZ_OVERRIDE;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty();
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD AppendFrames(ChildListID aListID,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList);
nsFrameList& aFrameList) MOZ_OVERRIDE;
NS_IMETHOD RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame);
nsIFrame* aOldFrame) MOZ_OVERRIDE;
virtual nsIFrame* GetContentInsertionFrame();
NS_IMETHOD SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList);
nsFrameList& aChildList) MOZ_OVERRIDE;
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const
{
@ -137,12 +138,12 @@ public:
}
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
NS_IMETHOD DidReflow(nsPresContext* aPresContext,
const nsHTMLReflowState* aReflowState,
nsDidReflowStatus aStatus);
nsDidReflowStatus aStatus) MOZ_OVERRIDE;
virtual bool HonorPrintBackgroundSettings();
@ -158,7 +159,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
#ifdef DEBUG_LAYOUT
virtual void SetDebugOnChildList(nsBoxLayoutState& aState, nsIFrame* aChild, bool aDebug);
@ -185,7 +186,7 @@ public:
protected:
#ifdef DEBUG_LAYOUT
virtual void GetBoxName(nsAutoString& aName);
virtual void GetBoxName(nsAutoString& aName) MOZ_OVERRIDE;
void PaintXULDebugBackground(nsRenderingContext& aRenderingContext,
nsPoint aPt);
void PaintXULDebugOverlay(nsRenderingContext& aRenderingContext,
@ -199,7 +200,7 @@ protected:
virtual bool GetInitialVAlignment(Valignment& aValign);
virtual bool GetInitialAutoStretch(bool& aStretch);
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
nsSize mPrefSize;
nsSize mMinSize;

View File

@ -5,6 +5,7 @@
#ifndef nsBoxObject_h_
#define nsBoxObject_h_
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIBoxObject.h"
#include "nsPIBoxObject.h"
@ -31,8 +32,8 @@ public:
// nsPIBoxObject
virtual nsresult Init(nsIContent* aContent);
virtual void Clear();
virtual void ClearCachedValues();
virtual void Clear() MOZ_OVERRIDE;
virtual void ClearCachedValues() MOZ_OVERRIDE;
nsIFrame* GetFrame(bool aFlushLayout);
nsIPresShell* GetPresShell(bool aFlushLayout);

View File

@ -5,6 +5,7 @@
#ifndef nsButtonBoxFrame_h___
#define nsButtonBoxFrame_h___
#include "mozilla/Attributes.h"
#include "nsBoxFrame.h"
class nsButtonBoxFrame : public nsBoxFrame
@ -21,17 +22,17 @@ public:
NS_IMETHOD BuildDisplayListForChildren(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
nsGUIEvent* aEvent,
nsEventStatus* aEventStatus);
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
virtual void MouseClicked (nsPresContext* aPresContext, nsGUIEvent* aEvent)
{ DoMouseClick(aEvent, false); }
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const {
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
return MakeFrameName(NS_LITERAL_STRING("ButtonBoxFrame"), aResult);
}
#endif
@ -41,7 +42,7 @@ public:
* @param aTrustEvent if true and aEvent as null, then assume the event was trusted
*/
void DoMouseClick(nsGUIEvent* aEvent, bool aTrustEvent);
void UpdateMouseThrough() { AddStateBits(NS_FRAME_MOUSE_THROUGH_NEVER); }
void UpdateMouseThrough() MOZ_OVERRIDE { AddStateBits(NS_FRAME_MOUSE_THROUGH_NEVER); }
}; // class nsButtonBoxFrame
#endif /* nsButtonBoxFrame_h___ */

View File

@ -14,6 +14,7 @@
#ifndef nsDeckFrame_h___
#define nsDeckFrame_h___
#include "mozilla/Attributes.h"
#include "nsBoxFrame.h"
class nsDeckFrame : public nsBoxFrame
@ -28,26 +29,26 @@ public:
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
NS_IMETHOD DoLayout(nsBoxLayoutState& aState);
NS_IMETHOD DoLayout(nsBoxLayoutState& aState) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayListForChildren(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("Deck"), aResult);
}

View File

@ -5,6 +5,7 @@
#ifndef nsImageBoxFrame_h___
#define nsImageBoxFrame_h___
#include "mozilla/Attributes.h"
#include "nsLeafBoxFrame.h"
#include "imgILoader.h"
@ -46,26 +47,26 @@ public:
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
virtual void MarkIntrinsicWidthsDirty();
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
friend nsIFrame* NS_NewImageBoxFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* asPrevInFlow);
nsIFrame* asPrevInFlow) MOZ_OVERRIDE;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual nsIAtom* GetType() const;
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
/**
@ -83,7 +84,7 @@ public:
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD OnStartContainer(imgIRequest *request, imgIContainer *image);
NS_IMETHOD OnStopContainer(imgIRequest *request, imgIContainer *image);

View File

@ -5,6 +5,7 @@
#ifndef nsLeafBoxFrame_h___
#define nsLeafBoxFrame_h___
#include "mozilla/Attributes.h"
#include "nsLeafFrame.h"
#include "nsBox.h"
@ -19,12 +20,12 @@ public:
virtual nsSize GetPrefSize(nsBoxLayoutState& aState);
virtual nsSize GetMinSize(nsBoxLayoutState& aState);
virtual nsSize GetMaxSize(nsBoxLayoutState& aState);
virtual nscoord GetFlex(nsBoxLayoutState& aState);
virtual nscoord GetBoxAscent(nsBoxLayoutState& aState);
virtual nsSize GetMaxSize(nsBoxLayoutState& aState) MOZ_OVERRIDE;
virtual nscoord GetFlex(nsBoxLayoutState& aState) MOZ_OVERRIDE;
virtual nscoord GetBoxAscent(nsBoxLayoutState& aState) 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
{
// This is bogus, but it's what we've always done.
// Note that nsLeafFrame is also eReplacedContainsBlock.
@ -33,52 +34,52 @@ public:
}
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
#endif
// nsIHTMLReflow overrides
virtual void MarkIntrinsicWidthsDirty();
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
// Our auto size is that provided by nsFrame, not nsLeafFrame
virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,
nsSize aMargin, nsSize aBorder,
nsSize aPadding, bool aShrinkWrap);
nsSize aPadding, bool aShrinkWrap) MOZ_OVERRIDE;
NS_IMETHOD Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
nsReflowStatus& aStatus) MOZ_OVERRIDE;
NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo);
NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE;
NS_IMETHOD Init(
nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* asPrevInFlow);
nsIFrame* asPrevInFlow) MOZ_OVERRIDE;
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
int32_t aModType);
int32_t aModType) MOZ_OVERRIDE;
virtual bool ComputesOwnOverflowArea() { return false; }
virtual bool ComputesOwnOverflowArea() MOZ_OVERRIDE { return false; }
protected:
NS_IMETHOD DoLayout(nsBoxLayoutState& aState);
NS_IMETHOD DoLayout(nsBoxLayoutState& aState) MOZ_OVERRIDE;
#ifdef DEBUG_LAYOUT
virtual void GetBoxName(nsAutoString& aName);
virtual void GetBoxName(nsAutoString& aName) MOZ_OVERRIDE;
#endif
virtual nscoord GetIntrinsicWidth();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
nsLeafBoxFrame(nsIPresShell* aShell, nsStyleContext* aContext);

View File

@ -6,6 +6,7 @@
#ifndef nsListBoxBodyFrame_h
#define nsListBoxBodyFrame_h
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsBoxFrame.h"
#include "nsIListBoxObject.h"
@ -49,22 +50,22 @@ public:
// nsIFrame
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
virtual void DestroyFrom(nsIFrame* aDestructRoot);
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType);
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE;
// nsIScrollbarMediator
NS_IMETHOD PositionChanged(nsScrollbarFrame* aScrollbar, int32_t aOldIndex, int32_t& aNewIndex);
NS_IMETHOD ScrollbarButtonPressed(nsScrollbarFrame* aScrollbar, int32_t aOldIndex, int32_t aNewIndex);
NS_IMETHOD VisibilityChanged(bool aVisible);
NS_IMETHOD ScrollbarButtonPressed(nsScrollbarFrame* aScrollbar, int32_t aOldIndex, int32_t aNewIndex) MOZ_OVERRIDE;
NS_IMETHOD VisibilityChanged(bool aVisible) MOZ_OVERRIDE;
// nsIReflowCallback
virtual bool ReflowFinished();
virtual void ReflowCallbackCanceled();
virtual bool ReflowFinished() MOZ_OVERRIDE;
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE;
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
virtual void MarkIntrinsicWidthsDirty();
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual nsSize GetMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
@ -118,9 +119,9 @@ public:
return true;
}
virtual bool SupportsOrdinalsInChildren();
virtual bool SupportsOrdinalsInChildren() MOZ_OVERRIDE;
virtual bool ComputesOwnOverflowArea() { return true; }
virtual bool ComputesOwnOverflowArea() MOZ_OVERRIDE { return true; }
protected:
class nsPositionChangedEvent;

View File

@ -6,6 +6,7 @@
#ifndef nsListBoxLayout_h___
#define nsListBoxLayout_h___
#include "mozilla/Attributes.h"
#include "nsGridRowGroupLayout.h"
class nsIFrame;
@ -18,10 +19,10 @@ public:
nsListBoxLayout();
// nsBoxLayout
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aState);
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aState) MOZ_OVERRIDE;
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
protected:
NS_IMETHOD LayoutInternal(nsIFrame* aBox, nsBoxLayoutState& aState);

View File

@ -3,6 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/Attributes.h"
#include "nsGridRowLeafFrame.h"
nsIFrame* NS_NewListItemFrame(nsIPresShell* aPresShell,
@ -22,7 +23,7 @@ public:
const nsRect& aDirtyRect,
const nsDisplayListSet& aLists);
virtual nsSize GetPrefSize(nsBoxLayoutState& aState);
virtual nsSize GetPrefSize(nsBoxLayoutState& aState) MOZ_OVERRIDE;
protected:
nsListItemFrame(nsIPresShell* aPresShell,

View File

@ -10,6 +10,7 @@
#ifndef nsMenuBarFrame_h__
#define nsMenuBarFrame_h__
#include "mozilla/Attributes.h"
#include "prtypes.h"
#include "nsIAtom.h"
#include "nsCOMPtr.h"
@ -32,18 +33,18 @@ public:
nsMenuBarFrame(nsIPresShell* aShell, nsStyleContext* aContext);
// nsMenuParent interface
virtual nsMenuFrame* GetCurrentMenuItem();
NS_IMETHOD SetCurrentMenuItem(nsMenuFrame* aMenuItem);
virtual void CurrentMenuIsBeingDestroyed();
NS_IMETHOD ChangeMenuItem(nsMenuFrame* aMenuItem, bool aSelectFirstItem);
virtual nsMenuFrame* GetCurrentMenuItem() MOZ_OVERRIDE;
NS_IMETHOD SetCurrentMenuItem(nsMenuFrame* aMenuItem) MOZ_OVERRIDE;
virtual void CurrentMenuIsBeingDestroyed() MOZ_OVERRIDE;
NS_IMETHOD ChangeMenuItem(nsMenuFrame* aMenuItem, bool aSelectFirstItem) MOZ_OVERRIDE;
NS_IMETHOD SetActive(bool aActiveFlag);
NS_IMETHOD SetActive(bool aActiveFlag) MOZ_OVERRIDE;
virtual bool IsMenuBar() { return true; }
virtual bool IsMenuBar() MOZ_OVERRIDE { return true; }
virtual bool IsContextMenu() { return false; }
virtual bool IsActive() { return mIsActive; }
virtual bool IsActive() MOZ_OVERRIDE { return mIsActive; }
virtual bool IsMenu() { return false; }
virtual bool IsOpen() { return true; } // menubars are considered always open
virtual bool IsOpen() MOZ_OVERRIDE { return true; } // menubars are considered always open
bool IsMenuOpen() { return mCurrentMenu && mCurrentMenu->IsOpen(); }
@ -52,12 +53,12 @@ public:
NS_IMETHOD Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow);
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
virtual void DestroyFrom(nsIFrame* aDestructRoot);
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
virtual void LockMenuUntilClosed(bool aLock) {}
virtual bool IsMenuLocked() { return false; }
virtual void LockMenuUntilClosed(bool aLock) MOZ_OVERRIDE {}
virtual bool IsMenuLocked() MOZ_OVERRIDE { return false; }
// Non-interface helpers
@ -73,7 +74,7 @@ public:
// indicate that a menu on the menubar was closed. Returns true if the caller
// may deselect the menuitem.
virtual bool MenuClosed();
virtual bool MenuClosed() MOZ_OVERRIDE;
// Called when Enter is pressed while the menubar is focused. If the current
// menu is open, let the child handle the key.
@ -82,7 +83,7 @@ public:
// Used to handle ALT+key combos
nsMenuFrame* FindMenuWithShortcut(nsIDOMKeyEvent* aKeyEvent);
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))
@ -91,7 +92,7 @@ public:
}
#ifdef DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
{
return MakeFrameName(NS_LITERAL_STRING("MenuBar"), aResult);
}

Some files were not shown because too many files have changed in this diff Show More