mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
Bug 870516: Annotate ~600 more methods with MOZ_OVERRIDE in /layout r=dholbert
This commit is contained in:
Arnaud Sourioux
parent
bb24402b54
commit
623d2ed378
@ -9,6 +9,7 @@
|
||||
#ifndef nsCounterManager_h_
|
||||
#define nsCounterManager_h_
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsGenConList.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsClassHashtable.h"
|
||||
@ -94,7 +95,7 @@ struct nsCounterUseNode : public nsCounterNode {
|
||||
}
|
||||
|
||||
virtual bool InitTextFrame(nsGenConList* aList,
|
||||
nsIFrame* aPseudoFrame, nsIFrame* aTextFrame);
|
||||
nsIFrame* aPseudoFrame, nsIFrame* aTextFrame) MOZ_OVERRIDE;
|
||||
|
||||
// assign the correct |mValueAfter| value to a node that has been inserted
|
||||
// Should be called immediately after calling |Insert|.
|
||||
|
||||
@ -1661,7 +1661,7 @@ public:
|
||||
nsDisplayListBuilder* aBuilder) = 0;
|
||||
virtual void ConfigureLayer(ImageLayer* aLayer, const nsIntPoint& aOffset) = 0;
|
||||
|
||||
virtual bool SupportsOptimizingToImage() { return true; }
|
||||
virtual bool SupportsOptimizingToImage() MOZ_OVERRIDE { return true; }
|
||||
};
|
||||
|
||||
/**
|
||||
@ -1846,7 +1846,7 @@ public:
|
||||
|
||||
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayItemGeometry* aGeometry,
|
||||
nsRegion* aInvalidRegion);
|
||||
nsRegion* aInvalidRegion) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -1902,7 +1902,7 @@ public:
|
||||
|
||||
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayItemGeometry* aGeometry,
|
||||
nsRegion* aInvalidRegion)
|
||||
nsRegion* aInvalidRegion) MOZ_OVERRIDE
|
||||
{
|
||||
const nsDisplayItemBoundsGeometry* geometry = static_cast<const nsDisplayItemBoundsGeometry*>(aGeometry);
|
||||
ComputeInvalidationRegionDifference(aBuilder, geometry, aInvalidRegion);
|
||||
@ -2001,7 +2001,7 @@ public:
|
||||
const nsRect& aRect, bool* aSnap);
|
||||
|
||||
#ifdef MOZ_DUMP_PAINTING
|
||||
virtual void WriteDebugInfo(FILE *aOutput);
|
||||
virtual void WriteDebugInfo(FILE *aOutput) MOZ_OVERRIDE;
|
||||
#endif
|
||||
protected:
|
||||
typedef class mozilla::layers::ImageContainer ImageContainer;
|
||||
@ -2065,7 +2065,7 @@ public:
|
||||
|
||||
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayItemGeometry* aGeometry,
|
||||
nsRegion* aInvalidRegion)
|
||||
nsRegion* aInvalidRegion) MOZ_OVERRIDE
|
||||
{
|
||||
const nsDisplayItemBoundsGeometry* geometry = static_cast<const nsDisplayItemBoundsGeometry*>(aGeometry);
|
||||
ComputeInvalidationRegionDifference(aBuilder, geometry, aInvalidRegion);
|
||||
@ -2159,7 +2159,7 @@ public:
|
||||
|
||||
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayItemGeometry* aGeometry,
|
||||
nsRegion* aInvalidRegion)
|
||||
nsRegion* aInvalidRegion) MOZ_OVERRIDE
|
||||
{
|
||||
const nsDisplayBoxShadowInnerGeometry* geometry = static_cast<const nsDisplayBoxShadowInnerGeometry*>(aGeometry);
|
||||
if (!geometry->mPaddingRect.IsEqualInterior(GetPaddingRect())) {
|
||||
@ -2275,7 +2275,7 @@ public:
|
||||
{
|
||||
aFrames->AppendElements(mMergedFrames);
|
||||
}
|
||||
virtual bool IsInvalid(nsRect& aRect)
|
||||
virtual bool IsInvalid(nsRect& aRect) MOZ_OVERRIDE
|
||||
{
|
||||
if (mFrame->IsInvalid(aRect) && aRect.IsEmpty()) {
|
||||
return true;
|
||||
@ -2413,7 +2413,7 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
bool CanUseAsyncAnimations(nsDisplayListBuilder* aBuilder);
|
||||
bool CanUseAsyncAnimations(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#ifndef NSDISPLAYLISTINVALIDATION_H_
|
||||
#define NSDISPLAYLISTINVALIDATION_H_
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsRect.h"
|
||||
|
||||
class nsDisplayItem;
|
||||
@ -58,7 +59,7 @@ class nsDisplayItemGenericGeometry : public nsDisplayItemGeometry
|
||||
public:
|
||||
nsDisplayItemGenericGeometry(nsDisplayItem* aItem, nsDisplayListBuilder* aBuilder);
|
||||
|
||||
virtual void MoveBy(const nsPoint& aOffset);
|
||||
virtual void MoveBy(const nsPoint& aOffset) MOZ_OVERRIDE;
|
||||
|
||||
nsRect mBorderRect;
|
||||
};
|
||||
@ -68,7 +69,7 @@ class nsDisplayItemBoundsGeometry : public nsDisplayItemGeometry
|
||||
public:
|
||||
nsDisplayItemBoundsGeometry(nsDisplayItem* aItem, nsDisplayListBuilder* aBuilder);
|
||||
|
||||
virtual void MoveBy(const nsPoint& aOffset);
|
||||
virtual void MoveBy(const nsPoint& aOffset) MOZ_OVERRIDE;
|
||||
|
||||
bool mHasRoundedCorners;
|
||||
};
|
||||
@ -78,7 +79,7 @@ class nsDisplayBorderGeometry : public nsDisplayItemGeometry
|
||||
public:
|
||||
nsDisplayBorderGeometry(nsDisplayItem* aItem, nsDisplayListBuilder* aBuilder);
|
||||
|
||||
virtual void MoveBy(const nsPoint& aOffset);
|
||||
virtual void MoveBy(const nsPoint& aOffset) MOZ_OVERRIDE;
|
||||
|
||||
nsRect mContentRect;
|
||||
};
|
||||
@ -88,7 +89,7 @@ class nsDisplayBackgroundGeometry : public nsDisplayItemGeometry
|
||||
public:
|
||||
nsDisplayBackgroundGeometry(nsDisplayBackgroundImage* aItem, nsDisplayListBuilder* aBuilder);
|
||||
|
||||
virtual void MoveBy(const nsPoint& aOffset);
|
||||
virtual void MoveBy(const nsPoint& aOffset) MOZ_OVERRIDE;
|
||||
|
||||
nsRect mPositioningArea;
|
||||
};
|
||||
@ -98,7 +99,7 @@ class nsDisplayBoxShadowInnerGeometry : public nsDisplayItemGeometry
|
||||
public:
|
||||
nsDisplayBoxShadowInnerGeometry(nsDisplayItem* aItem, nsDisplayListBuilder* aBuilder);
|
||||
|
||||
virtual void MoveBy(const nsPoint& aOffset);
|
||||
virtual void MoveBy(const nsPoint& aOffset) MOZ_OVERRIDE;
|
||||
|
||||
nsRect mPaddingRect;
|
||||
};
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
#ifndef NSFRAMETRAVERSAL_H
|
||||
#define NSFRAMETRAVERSAL_H
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsIFrame.h"
|
||||
#include "nsIFrameTraversal.h"
|
||||
|
||||
@ -32,7 +33,7 @@ public:
|
||||
int32_t aType,
|
||||
bool aVisual,
|
||||
bool aLockInScrollView,
|
||||
bool aFollowOOFs);
|
||||
bool aFollowOOFs) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif //NSFRAMETRAVERSAL_H
|
||||
|
||||
@ -70,13 +70,13 @@ public:
|
||||
void Init(nsIDocument* aDocument, nsPresContext* aPresContext,
|
||||
nsViewManager* aViewManager, nsStyleSet* aStyleSet,
|
||||
nsCompatibility aCompatMode);
|
||||
virtual NS_HIDDEN_(void) Destroy();
|
||||
virtual NS_HIDDEN_(void) MakeZombie();
|
||||
virtual NS_HIDDEN_(void) Destroy() MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) MakeZombie() MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(nsresult) SetPreferenceStyleRules(bool aForceReflow);
|
||||
virtual NS_HIDDEN_(nsresult) SetPreferenceStyleRules(bool aForceReflow) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetSelection(SelectionType aType, nsISelection** aSelection);
|
||||
virtual mozilla::Selection* GetCurrentSelection(SelectionType aType);
|
||||
virtual mozilla::Selection* GetCurrentSelection(SelectionType aType) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetDisplaySelection(int16_t aToggle);
|
||||
NS_IMETHOD GetDisplaySelection(int16_t *aToggle);
|
||||
@ -84,135 +84,135 @@ public:
|
||||
int16_t aFlags);
|
||||
NS_IMETHOD RepaintSelection(SelectionType aType);
|
||||
|
||||
virtual NS_HIDDEN_(void) BeginObservingDocument();
|
||||
virtual NS_HIDDEN_(void) EndObservingDocument();
|
||||
virtual NS_HIDDEN_(nsresult) Initialize(nscoord aWidth, nscoord aHeight);
|
||||
virtual NS_HIDDEN_(nsresult) ResizeReflow(nscoord aWidth, nscoord aHeight);
|
||||
virtual NS_HIDDEN_(nsresult) ResizeReflowOverride(nscoord aWidth, nscoord aHeight);
|
||||
virtual NS_HIDDEN_(nsIPageSequenceFrame*) GetPageSequenceFrame() const;
|
||||
virtual NS_HIDDEN_(nsIFrame*) GetRealPrimaryFrameFor(nsIContent* aContent) const;
|
||||
virtual NS_HIDDEN_(void) BeginObservingDocument() MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) EndObservingDocument() MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsresult) Initialize(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsresult) ResizeReflow(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsresult) ResizeReflowOverride(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsIPageSequenceFrame*) GetPageSequenceFrame() const MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsIFrame*) GetRealPrimaryFrameFor(nsIContent* aContent) const MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(nsIFrame*) GetPlaceholderFrameFor(nsIFrame* aFrame) const;
|
||||
virtual NS_HIDDEN_(nsIFrame*) GetPlaceholderFrameFor(nsIFrame* aFrame) const MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty,
|
||||
nsFrameState aBitToAdd);
|
||||
virtual NS_HIDDEN_(void) FrameNeedsToContinueReflow(nsIFrame *aFrame);
|
||||
virtual NS_HIDDEN_(void) CancelAllPendingReflows();
|
||||
virtual NS_HIDDEN_(bool) IsSafeToFlush() const;
|
||||
virtual NS_HIDDEN_(void) FlushPendingNotifications(mozFlushType aType);
|
||||
virtual NS_HIDDEN_(void) FlushPendingNotifications(mozilla::ChangesToFlush aType);
|
||||
nsFrameState aBitToAdd) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) FrameNeedsToContinueReflow(nsIFrame *aFrame) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) CancelAllPendingReflows() MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(bool) IsSafeToFlush() const MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) FlushPendingNotifications(mozilla::ChangesToFlush aType) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Recreates the frames for a node
|
||||
*/
|
||||
virtual NS_HIDDEN_(nsresult) RecreateFramesFor(nsIContent* aContent);
|
||||
virtual NS_HIDDEN_(nsresult) RecreateFramesFor(nsIContent* aContent) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Post a callback that should be handled after reflow has finished.
|
||||
*/
|
||||
virtual NS_HIDDEN_(nsresult) PostReflowCallback(nsIReflowCallback* aCallback);
|
||||
virtual NS_HIDDEN_(void) CancelReflowCallback(nsIReflowCallback* aCallback);
|
||||
virtual NS_HIDDEN_(nsresult) PostReflowCallback(nsIReflowCallback* aCallback) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) CancelReflowCallback(nsIReflowCallback* aCallback) MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(void) ClearFrameRefs(nsIFrame* aFrame);
|
||||
virtual NS_HIDDEN_(void) ClearFrameRefs(nsIFrame* aFrame) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(already_AddRefed<nsRenderingContext>) GetReferenceRenderingContext();
|
||||
virtual NS_HIDDEN_(nsresult) GoToAnchor(const nsAString& aAnchorName, bool aScroll);
|
||||
virtual NS_HIDDEN_(nsresult) ScrollToAnchor();
|
||||
virtual NS_HIDDEN_(nsresult) GoToAnchor(const nsAString& aAnchorName, bool aScroll) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsresult) ScrollToAnchor() MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(nsresult) ScrollContentIntoView(nsIContent* aContent,
|
||||
ScrollAxis aVertical,
|
||||
ScrollAxis aHorizontal,
|
||||
uint32_t aFlags);
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
virtual bool ScrollFrameRectIntoView(nsIFrame* aFrame,
|
||||
const nsRect& aRect,
|
||||
ScrollAxis aVertical,
|
||||
ScrollAxis aHorizontal,
|
||||
uint32_t aFlags);
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
virtual nsRectVisibility GetRectVisibility(nsIFrame *aFrame,
|
||||
const nsRect &aRect,
|
||||
nscoord aMinTwips) const;
|
||||
nscoord aMinTwips) const MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(void) SetIgnoreFrameDestruction(bool aIgnore);
|
||||
virtual NS_HIDDEN_(void) NotifyDestroyingFrame(nsIFrame* aFrame);
|
||||
virtual NS_HIDDEN_(void) SetIgnoreFrameDestruction(bool aIgnore) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) NotifyDestroyingFrame(nsIFrame* aFrame) MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(nsresult) CaptureHistoryState(nsILayoutHistoryState** aLayoutHistoryState);
|
||||
virtual NS_HIDDEN_(nsresult) CaptureHistoryState(nsILayoutHistoryState** aLayoutHistoryState) MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(void) UnsuppressPainting();
|
||||
virtual NS_HIDDEN_(void) UnsuppressPainting() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult GetAgentStyleSheets(nsCOMArray<nsIStyleSheet>& aSheets);
|
||||
virtual nsresult SetAgentStyleSheets(const nsCOMArray<nsIStyleSheet>& aSheets);
|
||||
virtual nsresult GetAgentStyleSheets(nsCOMArray<nsIStyleSheet>& aSheets) MOZ_OVERRIDE;
|
||||
virtual nsresult SetAgentStyleSheets(const nsCOMArray<nsIStyleSheet>& aSheets) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult AddOverrideStyleSheet(nsIStyleSheet *aSheet);
|
||||
virtual nsresult RemoveOverrideStyleSheet(nsIStyleSheet *aSheet);
|
||||
virtual nsresult AddOverrideStyleSheet(nsIStyleSheet *aSheet) MOZ_OVERRIDE;
|
||||
virtual nsresult RemoveOverrideStyleSheet(nsIStyleSheet *aSheet) MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(nsresult) HandleEventWithTarget(nsEvent* aEvent, nsIFrame* aFrame,
|
||||
nsIContent* aContent,
|
||||
nsEventStatus* aStatus);
|
||||
virtual NS_HIDDEN_(nsIFrame*) GetEventTargetFrame();
|
||||
virtual NS_HIDDEN_(already_AddRefed<nsIContent>) GetEventTargetContent(nsEvent* aEvent);
|
||||
nsEventStatus* aStatus) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsIFrame*) GetEventTargetFrame() MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(already_AddRefed<nsIContent>) GetEventTargetContent(nsEvent* aEvent) MOZ_OVERRIDE;
|
||||
|
||||
|
||||
virtual nsresult ReconstructFrames(void);
|
||||
virtual void Freeze();
|
||||
virtual void Thaw();
|
||||
virtual void FireOrClearDelayedEvents(bool aFireEvents);
|
||||
virtual void Freeze() MOZ_OVERRIDE;
|
||||
virtual void Thaw() MOZ_OVERRIDE;
|
||||
virtual void FireOrClearDelayedEvents(bool aFireEvents) MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(nsresult) RenderDocument(const nsRect& aRect, uint32_t aFlags,
|
||||
nscolor aBackgroundColor,
|
||||
gfxContext* aThebesContext);
|
||||
gfxContext* aThebesContext) MOZ_OVERRIDE;
|
||||
|
||||
virtual already_AddRefed<gfxASurface> RenderNode(nsIDOMNode* aNode,
|
||||
nsIntRegion* aRegion,
|
||||
nsIntPoint& aPoint,
|
||||
nsIntRect* aScreenRect);
|
||||
nsIntRect* aScreenRect) MOZ_OVERRIDE;
|
||||
|
||||
virtual already_AddRefed<gfxASurface> RenderSelection(nsISelection* aSelection,
|
||||
nsIntPoint& aPoint,
|
||||
nsIntRect* aScreenRect);
|
||||
nsIntRect* aScreenRect) MOZ_OVERRIDE;
|
||||
|
||||
virtual already_AddRefed<nsPIDOMWindow> GetRootWindow();
|
||||
virtual already_AddRefed<nsPIDOMWindow> GetRootWindow() MOZ_OVERRIDE;
|
||||
|
||||
virtual LayerManager* GetLayerManager();
|
||||
virtual LayerManager* GetLayerManager() MOZ_OVERRIDE;
|
||||
|
||||
virtual void SetIgnoreViewportScrolling(bool aIgnore);
|
||||
virtual void SetIgnoreViewportScrolling(bool aIgnore) MOZ_OVERRIDE;
|
||||
|
||||
virtual void SetDisplayPort(const nsRect& aDisplayPort);
|
||||
|
||||
virtual nsresult SetResolution(float aXResolution, float aYResolution);
|
||||
virtual nsresult SetResolution(float aXResolution, float aYResolution) MOZ_OVERRIDE;
|
||||
|
||||
//nsIViewObserver interface
|
||||
|
||||
virtual void Paint(nsView* aViewToPaint, const nsRegion& aDirtyRegion,
|
||||
uint32_t aFlags);
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
virtual nsresult HandleEvent(nsIFrame* aFrame,
|
||||
nsGUIEvent* aEvent,
|
||||
bool aDontRetargetEvents,
|
||||
nsEventStatus* aEventStatus);
|
||||
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsresult) HandleDOMEventWithTarget(nsIContent* aTargetContent,
|
||||
nsEvent* aEvent,
|
||||
nsEventStatus* aStatus);
|
||||
nsEventStatus* aStatus) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(nsresult) HandleDOMEventWithTarget(nsIContent* aTargetContent,
|
||||
nsIDOMEvent* aEvent,
|
||||
nsEventStatus* aStatus);
|
||||
virtual bool ShouldIgnoreInvalidation();
|
||||
virtual void WillPaint();
|
||||
virtual void WillPaintWindow();
|
||||
virtual void DidPaintWindow();
|
||||
virtual void ScheduleViewManagerFlush();
|
||||
virtual void DispatchSynthMouseMove(nsGUIEvent *aEvent, bool aFlushOnHoverChange);
|
||||
virtual void ClearMouseCaptureOnView(nsView* aView);
|
||||
virtual bool IsVisible();
|
||||
nsEventStatus* aStatus) MOZ_OVERRIDE;
|
||||
virtual bool ShouldIgnoreInvalidation() MOZ_OVERRIDE;
|
||||
virtual void WillPaint() MOZ_OVERRIDE;
|
||||
virtual void WillPaintWindow() MOZ_OVERRIDE;
|
||||
virtual void DidPaintWindow() MOZ_OVERRIDE;
|
||||
virtual void ScheduleViewManagerFlush() MOZ_OVERRIDE;
|
||||
virtual void DispatchSynthMouseMove(nsGUIEvent *aEvent, bool aFlushOnHoverChange) MOZ_OVERRIDE;
|
||||
virtual void ClearMouseCaptureOnView(nsView* aView) MOZ_OVERRIDE;
|
||||
virtual bool IsVisible() MOZ_OVERRIDE;
|
||||
|
||||
// caret handling
|
||||
virtual NS_HIDDEN_(already_AddRefed<nsCaret>) GetCaret() const;
|
||||
virtual NS_HIDDEN_(void) MaybeInvalidateCaretPosition();
|
||||
virtual NS_HIDDEN_(already_AddRefed<nsCaret>) GetCaret() const MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) MaybeInvalidateCaretPosition() MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetCaretEnabled(bool aInEnable);
|
||||
NS_IMETHOD SetCaretReadOnly(bool aReadOnly);
|
||||
NS_IMETHOD GetCaretEnabled(bool *aOutEnabled);
|
||||
NS_IMETHOD SetCaretVisibilityDuringSelection(bool aVisibility);
|
||||
NS_IMETHOD GetCaretVisible(bool *_retval);
|
||||
virtual void SetCaret(nsCaret *aNewCaret);
|
||||
virtual void RestoreCaret();
|
||||
virtual void SetCaret(nsCaret *aNewCaret) MOZ_OVERRIDE;
|
||||
virtual void RestoreCaret() MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetSelectionFlags(int16_t aInEnable);
|
||||
NS_IMETHOD SetSelectionFlags(int16_t aInEnable) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetSelectionFlags(int16_t *aOutEnable);
|
||||
|
||||
// nsISelectionController
|
||||
@ -261,52 +261,52 @@ public:
|
||||
|
||||
#ifdef MOZ_REFLOW_PERF
|
||||
virtual NS_HIDDEN_(void) DumpReflows();
|
||||
virtual NS_HIDDEN_(void) CountReflows(const char * aName, nsIFrame * aFrame);
|
||||
virtual NS_HIDDEN_(void) CountReflows(const char * aName, nsIFrame * aFrame) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) PaintCount(const char * aName,
|
||||
nsRenderingContext* aRenderingContext,
|
||||
nsPresContext* aPresContext,
|
||||
nsIFrame * aFrame,
|
||||
const nsPoint& aOffset,
|
||||
uint32_t aColor);
|
||||
virtual NS_HIDDEN_(void) SetPaintFrameCount(bool aOn);
|
||||
virtual bool IsPaintingFrameCounts();
|
||||
uint32_t aColor) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) SetPaintFrameCount(bool aOn) MOZ_OVERRIDE;
|
||||
virtual bool IsPaintingFrameCounts() MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
virtual void ListStyleContexts(nsIFrame *aRootFrame, FILE *out,
|
||||
int32_t aIndent = 0);
|
||||
int32_t aIndent = 0) MOZ_OVERRIDE;
|
||||
|
||||
virtual void ListStyleSheets(FILE *out, int32_t aIndent = 0);
|
||||
virtual void VerifyStyleTree();
|
||||
virtual void ListStyleSheets(FILE *out, int32_t aIndent = 0) MOZ_OVERRIDE;
|
||||
virtual void VerifyStyleTree() MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
#ifdef PR_LOGGING
|
||||
static PRLogModuleInfo* gLog;
|
||||
#endif
|
||||
|
||||
virtual NS_HIDDEN_(void) DisableNonTestMouseEvents(bool aDisable);
|
||||
virtual NS_HIDDEN_(void) DisableNonTestMouseEvents(bool aDisable) MOZ_OVERRIDE;
|
||||
|
||||
virtual void UpdateCanvasBackground();
|
||||
virtual void UpdateCanvasBackground() MOZ_OVERRIDE;
|
||||
|
||||
virtual void AddCanvasBackgroundColorItem(nsDisplayListBuilder& aBuilder,
|
||||
nsDisplayList& aList,
|
||||
nsIFrame* aFrame,
|
||||
const nsRect& aBounds,
|
||||
nscolor aBackstopColor,
|
||||
uint32_t aFlags);
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
|
||||
virtual void AddPrintPreviewBackgroundItem(nsDisplayListBuilder& aBuilder,
|
||||
nsDisplayList& aList,
|
||||
nsIFrame* aFrame,
|
||||
const nsRect& aBounds);
|
||||
const nsRect& aBounds) MOZ_OVERRIDE;
|
||||
|
||||
virtual nscolor ComputeBackstopColor(nsView* aDisplayRoot);
|
||||
virtual nscolor ComputeBackstopColor(nsView* aDisplayRoot) MOZ_OVERRIDE;
|
||||
|
||||
virtual NS_HIDDEN_(nsresult) SetIsActive(bool aIsActive);
|
||||
virtual NS_HIDDEN_(nsresult) SetIsActive(bool aIsActive) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool GetIsViewportOverridden() { return mViewportOverridden; }
|
||||
virtual bool GetIsViewportOverridden() MOZ_OVERRIDE { return mViewportOverridden; }
|
||||
|
||||
virtual bool IsLayoutFlushObserver()
|
||||
virtual bool IsLayoutFlushObserver() MOZ_OVERRIDE
|
||||
{
|
||||
return GetPresContext()->RefreshDriver()->
|
||||
IsLayoutFlushObserver(this);
|
||||
@ -317,10 +317,10 @@ public:
|
||||
size_t *aPresShellSize,
|
||||
size_t *aStyleSetsSize,
|
||||
size_t *aTextRunsSize,
|
||||
size_t *aPresContextSize);
|
||||
size_t *aPresContextSize) MOZ_OVERRIDE;
|
||||
size_t SizeOfTextRuns(nsMallocSizeOfFun aMallocSizeOf) const;
|
||||
|
||||
virtual void AddInvalidateHiddenPresShellObserver(nsRefreshDriver *aDriver);
|
||||
virtual void AddInvalidateHiddenPresShellObserver(nsRefreshDriver *aDriver) MOZ_OVERRIDE;
|
||||
|
||||
|
||||
// This data is stored as a content property (nsGkAtoms::scrolling) on
|
||||
@ -331,11 +331,11 @@ public:
|
||||
uint32_t mContentToScrollToFlags;
|
||||
};
|
||||
|
||||
virtual void ScheduleImageVisibilityUpdate();
|
||||
virtual void ScheduleImageVisibilityUpdate() MOZ_OVERRIDE;
|
||||
|
||||
virtual void RebuildImageVisibility(const nsDisplayList& aList);
|
||||
virtual void RebuildImageVisibility(const nsDisplayList& aList) MOZ_OVERRIDE;
|
||||
|
||||
virtual void EnsureImageInVisibleList(nsIImageLoadingContent* aImage);
|
||||
virtual void EnsureImageInVisibleList(nsIImageLoadingContent* aImage) MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual ~PresShell();
|
||||
@ -687,7 +687,7 @@ protected:
|
||||
void FireBeforeResizeEvent();
|
||||
static void AsyncResizeEventCallback(nsITimer* aTimer, void* aPresShell);
|
||||
|
||||
virtual void SynthesizeMouseMove(bool aFromScroll);
|
||||
virtual void SynthesizeMouseMove(bool aFromScroll) MOZ_OVERRIDE;
|
||||
|
||||
PresShell* GetRootPresShell();
|
||||
|
||||
@ -701,10 +701,10 @@ protected:
|
||||
bool ScheduleReflowOffTimer();
|
||||
|
||||
// Widget notificiations
|
||||
virtual void WindowSizeMoveDone();
|
||||
virtual void SysColorChanged() { mPresContext->SysColorChanged(); }
|
||||
virtual void ThemeChanged() { mPresContext->ThemeChanged(); }
|
||||
virtual void BackingScaleFactorChanged() { mPresContext->UIResolutionChanged(); }
|
||||
virtual void WindowSizeMoveDone() MOZ_OVERRIDE;
|
||||
virtual void SysColorChanged() MOZ_OVERRIDE { mPresContext->SysColorChanged(); }
|
||||
virtual void ThemeChanged() MOZ_OVERRIDE { mPresContext->ThemeChanged(); }
|
||||
virtual void BackingScaleFactorChanged() MOZ_OVERRIDE { mPresContext->UIResolutionChanged(); }
|
||||
|
||||
void UpdateImageVisibility();
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ public:
|
||||
NS_DECL_FRAMEARENA_HELPERS
|
||||
|
||||
// nsIAnonymousContentCreator
|
||||
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
|
||||
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
|
||||
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
|
||||
uint32_t aFilter) MOZ_OVERRIDE;
|
||||
virtual nsIFrame* CreateFrameFor(nsIContent* aContent) MOZ_OVERRIDE;
|
||||
@ -123,10 +123,10 @@ public:
|
||||
* @param aRepaint if true then force repaint (NOTE: we always force repaint currently)
|
||||
* @note This method might destroy |this|.
|
||||
*/
|
||||
virtual void SetFocus(bool aOn, bool aRepaint);
|
||||
virtual void SetFocus(bool aOn, bool aRepaint) MOZ_OVERRIDE;
|
||||
|
||||
//nsIComboboxControlFrame
|
||||
virtual bool IsDroppedDown() { return mDroppedDown; }
|
||||
virtual bool IsDroppedDown() MOZ_OVERRIDE { return mDroppedDown; }
|
||||
/**
|
||||
* @note This method might destroy |this|.
|
||||
*/
|
||||
@ -156,7 +156,7 @@ public:
|
||||
virtual void OnContentReset() MOZ_OVERRIDE;
|
||||
|
||||
// nsISelectControlFrame
|
||||
NS_IMETHOD AddOption(int32_t index);
|
||||
NS_IMETHOD AddOption(int32_t index) MOZ_OVERRIDE;
|
||||
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;
|
||||
|
||||
@ -35,8 +35,8 @@ public:
|
||||
NS_DECL_FRAMEARENA_HELPERS
|
||||
|
||||
// nsIFormControlFrame
|
||||
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue);
|
||||
virtual void SetFocus(bool aOn, bool aRepaint);
|
||||
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
|
||||
virtual void SetFocus(bool aOn, bool aRepaint) MOZ_OVERRIDE;
|
||||
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
|
||||
|
||||
@ -26,9 +26,9 @@ public:
|
||||
*/
|
||||
nsFormControlFrame(nsStyleContext*);
|
||||
|
||||
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 nsLeafFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
|
||||
@ -56,11 +56,11 @@ public:
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
// new behavior
|
||||
|
||||
virtual void SetFocus(bool aOn = true, bool aRepaint = false);
|
||||
virtual void SetFocus(bool aOn = true, bool aRepaint = false) MOZ_OVERRIDE;
|
||||
|
||||
// nsIFormControlFrame
|
||||
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
|
||||
|
||||
@ -31,7 +31,7 @@ public:
|
||||
nsGUIEvent* aEvent,
|
||||
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
@ -40,16 +40,16 @@ public:
|
||||
NS_DECL_QUERYFRAME
|
||||
|
||||
// nsIAnonymousContentCreator
|
||||
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
|
||||
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) MOZ_OVERRIDE;
|
||||
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
|
||||
uint32_t aFilter) MOZ_OVERRIDE;
|
||||
virtual nsIFrame* CreateFrameFor(nsIContent* aContent) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsLeaf() const;
|
||||
virtual bool IsLeaf() const MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE;
|
||||
|
||||
|
||||
@ -56,7 +56,7 @@ public:
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* asPrevInFlow) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsStyleContext* GetAdditionalStyleContext(int32_t aIndex) const;
|
||||
virtual nsStyleContext* GetAdditionalStyleContext(int32_t aIndex) const MOZ_OVERRIDE;
|
||||
virtual void SetAdditionalStyleContext(int32_t aIndex,
|
||||
nsStyleContext* aStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
@ -82,18 +82,18 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual bool HonorPrintBackgroundSettings() { return false; }
|
||||
virtual bool HonorPrintBackgroundSettings() MOZ_OVERRIDE { return false; }
|
||||
|
||||
// nsIFormControlFrame
|
||||
void SetFocus(bool aOn, bool aRepaint);
|
||||
void SetFocus(bool aOn, bool aRepaint) MOZ_OVERRIDE;
|
||||
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
|
||||
|
||||
// Inserted child content gets its frames parented by our child block
|
||||
virtual nsIFrame* GetContentInsertionFrame() {
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
|
||||
return GetFirstPrincipalChild()->GetContentInsertionFrame();
|
||||
}
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
|
||||
|
||||
@ -51,7 +51,7 @@ public:
|
||||
// nsIFrame
|
||||
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
|
||||
nsGUIEvent* aEvent,
|
||||
nsEventStatus* aEventStatus);
|
||||
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
@ -70,14 +70,14 @@ public:
|
||||
|
||||
NS_IMETHOD DidReflow(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState* aReflowState,
|
||||
nsDidReflowStatus aStatus);
|
||||
nsDidReflowStatus aStatus) MOZ_OVERRIDE;
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame();
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
@ -86,7 +86,7 @@ public:
|
||||
*/
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsHTMLScrollFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
|
||||
@ -98,7 +98,7 @@ public:
|
||||
|
||||
// nsIFormControlFrame
|
||||
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
|
||||
virtual void SetFocus(bool aOn = true, bool aRepaint = false);
|
||||
virtual void SetFocus(bool aOn = true, bool aRepaint = false) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsGfxScrollFrameInner::ScrollbarStyles GetScrollbarStyles() const MOZ_OVERRIDE;
|
||||
virtual bool ShouldPropagateComputedHeightToScrolledContent() const MOZ_OVERRIDE;
|
||||
@ -109,7 +109,7 @@ public:
|
||||
#endif
|
||||
|
||||
// nsIListControlFrame
|
||||
virtual void SetComboboxFrame(nsIFrame* aComboboxFrame);
|
||||
virtual void SetComboboxFrame(nsIFrame* aComboboxFrame) MOZ_OVERRIDE;
|
||||
virtual int32_t GetSelectedIndex() MOZ_OVERRIDE;
|
||||
virtual already_AddRefed<nsIContent> GetCurrentOption() MOZ_OVERRIDE;
|
||||
|
||||
@ -144,7 +144,7 @@ public:
|
||||
virtual void OnContentReset() MOZ_OVERRIDE;
|
||||
|
||||
// nsISelectControlFrame
|
||||
NS_IMETHOD AddOption(int32_t index);
|
||||
NS_IMETHOD AddOption(int32_t index) MOZ_OVERRIDE;
|
||||
NS_IMETHOD RemoveOption(int32_t index) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DoneAddingChildren(bool aIsDone) MOZ_OVERRIDE;
|
||||
|
||||
@ -238,7 +238,7 @@ public:
|
||||
/**
|
||||
* Dropdowns need views
|
||||
*/
|
||||
virtual bool NeedsView() { return IsInDropDownMode(); }
|
||||
virtual bool NeedsView() MOZ_OVERRIDE { return IsInDropDownMode(); }
|
||||
|
||||
/**
|
||||
* Frees statics owned by this class.
|
||||
|
||||
@ -28,10 +28,10 @@ public:
|
||||
NS_IMETHOD Reflow(nsPresContext* aCX,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const {
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
|
||||
return MakeFrameName(NS_LITERAL_STRING("Meter"), aResult);
|
||||
}
|
||||
#endif
|
||||
@ -45,17 +45,17 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
nsSize aMargin, nsSize aBorder,
|
||||
nsSize aPadding, bool aShrinkWrap) 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;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
|
||||
|
||||
@ -33,10 +33,10 @@ public:
|
||||
NS_IMETHOD Reflow(nsPresContext* aCX,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const {
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
|
||||
return MakeFrameName(NS_LITERAL_STRING("Progress"), aResult);
|
||||
}
|
||||
#endif
|
||||
@ -50,17 +50,17 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
nsSize aMargin, nsSize aBorder,
|
||||
nsSize aPadding, bool aShrinkWrap) 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;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
|
||||
|
||||
@ -44,14 +44,14 @@ public:
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIScrollableFrame* GetScrollTargetFrame() {
|
||||
virtual nsIScrollableFrame* GetScrollTargetFrame() MOZ_OVERRIDE {
|
||||
if (!IsScrollable())
|
||||
return nullptr;
|
||||
return do_QueryFrame(GetFirstPrincipalChild());
|
||||
}
|
||||
|
||||
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,
|
||||
@ -61,26 +61,26 @@ public:
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual bool IsCollapsed();
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual bool IsCollapsed() MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsLeaf() const;
|
||||
virtual bool IsLeaf() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
aResult.AssignLiteral("nsTextControlFrame");
|
||||
return NS_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
// nsStackFrame is already both of these, but that's somewhat bogus,
|
||||
// and we really mean it.
|
||||
@ -103,8 +103,8 @@ public:
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
//==== BEGIN NSIFORMCONTROLFRAME
|
||||
virtual void SetFocus(bool aOn , bool aRepaint);
|
||||
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue);
|
||||
virtual void SetFocus(bool aOn , bool aRepaint) MOZ_OVERRIDE;
|
||||
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) MOZ_OVERRIDE;
|
||||
|
||||
//==== END NSIFORMCONTROLFRAME
|
||||
|
||||
@ -141,16 +141,16 @@ public:
|
||||
//=== END NSISTATEFULFRAME
|
||||
|
||||
//==== OVERLOAD of nsIFrame
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
/** handler for attribute changes to mContent */
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
nsresult GetText(nsString& aText);
|
||||
|
||||
NS_IMETHOD PeekOffset(nsPeekOffsetStruct *aPos);
|
||||
NS_IMETHOD PeekOffset(nsPeekOffsetStruct *aPos) MOZ_OVERRIDE;
|
||||
|
||||
NS_DECL_QUERYFRAME
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ public:
|
||||
NS_IMETHOD Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData);
|
||||
|
||||
// nsIFrame
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
@ -39,7 +39,7 @@ public:
|
||||
NS_DECL_FRAMEARENA_HELPERS
|
||||
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
@ -57,7 +57,7 @@ public:
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eCanContainOverflowContainers));
|
||||
@ -75,8 +75,8 @@ public:
|
||||
void PaintFocus(nsRenderingContext& aRenderingContext, nsPoint aPt);
|
||||
|
||||
// nsIScrollPositionListener
|
||||
virtual void ScrollPositionWillChange(nscoord aX, nscoord aY);
|
||||
virtual void ScrollPositionDidChange(nscoord aX, nscoord aY) {}
|
||||
virtual void ScrollPositionWillChange(nscoord aX, nscoord aY) MOZ_OVERRIDE;
|
||||
virtual void ScrollPositionDidChange(nscoord aX, nscoord aY) MOZ_OVERRIDE {}
|
||||
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
@ -167,7 +167,7 @@ public:
|
||||
|
||||
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayItemGeometry* aGeometry,
|
||||
nsRegion* aInvalidRegion)
|
||||
nsRegion* aInvalidRegion) MOZ_OVERRIDE
|
||||
{
|
||||
const nsDisplayItemBoundsGeometry* geometry = static_cast<const nsDisplayItemBoundsGeometry*>(aGeometry);
|
||||
ComputeInvalidationRegionDifference(aBuilder, geometry, aInvalidRegion);
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
/* rendering object for css3 multi-column layout */
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsContainerFrame.h"
|
||||
#include "nsIContent.h"
|
||||
#include "nsIFrame.h"
|
||||
@ -27,25 +28,25 @@ public:
|
||||
nsColumnSetFrame(nsStyleContext* aContext);
|
||||
|
||||
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 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;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame() {
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
|
||||
nsIFrame* frame = GetFirstPrincipalChild();
|
||||
|
||||
// if no children return nullptr
|
||||
@ -57,12 +58,12 @@ public:
|
||||
|
||||
virtual nsresult StealFrame(nsPresContext* aPresContext,
|
||||
nsIFrame* aChild,
|
||||
bool aForceNormal)
|
||||
bool aForceNormal) MOZ_OVERRIDE
|
||||
{ // nsColumnSetFrame keeps overflow containers in main child list
|
||||
return nsContainerFrame::StealFrame(aPresContext, aChild, true);
|
||||
}
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eCanContainOverflowContainers));
|
||||
@ -72,14 +73,14 @@ public:
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual void PaintColumnRule(nsRenderingContext* aCtx,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsPoint& aPt);
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const {
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
|
||||
return MakeFrameName(NS_LITERAL_STRING("ColumnSet"), aResult);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -58,10 +58,10 @@ public:
|
||||
NS_IMETHOD SetInitialChildList(ChildListID aListID,
|
||||
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) MOZ_OVERRIDE;
|
||||
|
||||
@ -70,7 +70,7 @@ public:
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
virtual void ChildIsDirty(nsIFrame* aChild) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsLeaf() const;
|
||||
virtual bool IsLeaf() const MOZ_OVERRIDE;
|
||||
virtual bool PeekOffsetNoAmount(bool aForward, int32_t* aOffset) MOZ_OVERRIDE;
|
||||
virtual bool PeekOffsetCharacter(bool aForward, int32_t* aOffset,
|
||||
bool aRespectClusters = true) MOZ_OVERRIDE;
|
||||
@ -309,7 +309,7 @@ public:
|
||||
* Move any frames on our overflow list to the end of our principal list.
|
||||
* @return true if there were any overflow frames
|
||||
*/
|
||||
virtual bool DrainSelfOverflowList();
|
||||
virtual bool DrainSelfOverflowList() MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Removes aChild without destroying it and without requesting reflow.
|
||||
|
||||
@ -35,7 +35,7 @@ public:
|
||||
|
||||
bool IsFloating() const { return GetStateBits() & NS_FRAME_OUT_OF_FLOW; }
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
if (!IsFloating())
|
||||
aFlags = aFlags & ~(nsIFrame::eLineParticipant);
|
||||
|
||||
@ -146,38 +146,38 @@ public:
|
||||
nsIFrame* aParent,
|
||||
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);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual nsStyleContext* GetAdditionalStyleContext(int32_t aIndex) const;
|
||||
nsIFrame* aOldFrame) MOZ_OVERRIDE;
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
virtual nsStyleContext* GetAdditionalStyleContext(int32_t aIndex) const MOZ_OVERRIDE;
|
||||
virtual void SetAdditionalStyleContext(int32_t aIndex,
|
||||
nsStyleContext* aStyleContext);
|
||||
virtual void SetParent(nsIFrame* aParent);
|
||||
nsStyleContext* aStyleContext) MOZ_OVERRIDE;
|
||||
virtual void SetParent(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
virtual nscoord GetBaseline() const MOZ_OVERRIDE;
|
||||
virtual const nsFrameList& GetChildList(ChildListID aListID) const;
|
||||
virtual void GetChildLists(nsTArray<ChildList>* aLists) const;
|
||||
virtual const nsFrameList& GetChildList(ChildListID aListID) const MOZ_OVERRIDE;
|
||||
virtual void GetChildLists(nsTArray<ChildList>* aLists) const MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
|
||||
nsGUIEvent* aEvent,
|
||||
nsEventStatus* aEventStatus);
|
||||
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetContentForEvent(nsEvent* aEvent,
|
||||
nsIContent** aContent);
|
||||
nsIContent** aContent) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetCursor(const nsPoint& aPoint,
|
||||
nsIFrame::Cursor& aCursor);
|
||||
|
||||
NS_IMETHOD GetPointFromOffset(int32_t inOffset,
|
||||
nsPoint* outPoint);
|
||||
nsPoint* outPoint) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetChildFrameContainingOffset(int32_t inContentOffset,
|
||||
bool inHint,
|
||||
int32_t* outFrameContentOffset,
|
||||
nsIFrame* *outChildFrame);
|
||||
nsIFrame* *outChildFrame) MOZ_OVERRIDE;
|
||||
|
||||
static nsresult GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
|
||||
nsPeekOffsetStruct *aPos,
|
||||
@ -186,31 +186,31 @@ public:
|
||||
int8_t aOutSideLimit
|
||||
);
|
||||
|
||||
NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo);
|
||||
NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE;
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
virtual nsSplittableType GetSplittableType() const;
|
||||
virtual nsIFrame* GetPrevContinuation() const;
|
||||
NS_IMETHOD SetPrevContinuation(nsIFrame*);
|
||||
virtual nsIFrame* GetNextContinuation() const;
|
||||
NS_IMETHOD SetNextContinuation(nsIFrame*);
|
||||
virtual nsIFrame* GetPrevInFlowVirtual() const;
|
||||
NS_IMETHOD SetPrevInFlow(nsIFrame*);
|
||||
virtual nsIFrame* GetNextInFlowVirtual() const;
|
||||
NS_IMETHOD SetNextInFlow(nsIFrame*);
|
||||
NS_IMETHOD GetOffsetFromView(nsPoint& aOffset, nsView** aView) const;
|
||||
virtual nsIAtom* GetType() const;
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE;
|
||||
virtual nsIFrame* GetPrevContinuation() const MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetPrevContinuation(nsIFrame*) MOZ_OVERRIDE;
|
||||
virtual nsIFrame* GetNextContinuation() const MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetNextContinuation(nsIFrame*) MOZ_OVERRIDE;
|
||||
virtual nsIFrame* GetPrevInFlowVirtual() const MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetPrevInFlow(nsIFrame*) MOZ_OVERRIDE;
|
||||
virtual nsIFrame* GetNextInFlowVirtual() const MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetNextInFlow(nsIFrame*) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetOffsetFromView(nsPoint& aOffset, nsView** aView) const MOZ_OVERRIDE;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD IsSelectable(bool* aIsSelectable, uint8_t* aSelectStyle) const;
|
||||
NS_IMETHOD IsSelectable(bool* aIsSelectable, uint8_t* aSelectStyle) const MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetSelectionController(nsPresContext *aPresContext, nsISelectionController **aSelCon);
|
||||
NS_IMETHOD GetSelectionController(nsPresContext *aPresContext, nsISelectionController **aSelCon) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool PeekOffsetNoAmount(bool aForward, int32_t* aOffset);
|
||||
virtual bool PeekOffsetNoAmount(bool aForward, int32_t* aOffset) MOZ_OVERRIDE;
|
||||
virtual bool PeekOffsetCharacter(bool aForward, int32_t* aOffset,
|
||||
bool aRespectClusters = true);
|
||||
bool aRespectClusters = true) MOZ_OVERRIDE;
|
||||
virtual bool PeekOffsetWord(bool aForward, bool aWordSelectEatSpace, bool aIsKeyboardSelect,
|
||||
int32_t* aOffset, PeekWordState *aState);
|
||||
int32_t* aOffset, PeekWordState *aState) MOZ_OVERRIDE;
|
||||
/**
|
||||
* Check whether we should break at a boundary between punctuation and
|
||||
* non-punctuation. Only call it at a punctuation boundary
|
||||
@ -224,16 +224,16 @@ public:
|
||||
bool aPunctAfter, bool aWhitespaceAfter,
|
||||
bool aIsKeyboardSelect);
|
||||
|
||||
NS_IMETHOD CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *_retval);
|
||||
NS_IMETHOD CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *_retval) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetOffsets(int32_t &aStart, int32_t &aEnd) const;
|
||||
virtual void ChildIsDirty(nsIFrame* aChild);
|
||||
NS_IMETHOD GetOffsets(int32_t &aStart, int32_t &aEnd) const MOZ_OVERRIDE;
|
||||
virtual void ChildIsDirty(nsIFrame* aChild) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
virtual nsIFrame* GetParentStyleContextFrame() const {
|
||||
virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE {
|
||||
return DoGetParentStyleContextFrame();
|
||||
}
|
||||
|
||||
@ -246,20 +246,20 @@ public:
|
||||
*/
|
||||
nsIFrame* DoGetParentStyleContextFrame() const;
|
||||
|
||||
virtual bool IsEmpty();
|
||||
virtual bool IsSelfEmpty();
|
||||
virtual bool IsEmpty() MOZ_OVERRIDE;
|
||||
virtual bool IsSelfEmpty() 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;
|
||||
virtual void AddInlineMinWidth(nsRenderingContext *aRenderingContext,
|
||||
InlineMinWidthData *aData);
|
||||
InlineMinWidthData *aData) MOZ_OVERRIDE;
|
||||
virtual void AddInlinePrefWidth(nsRenderingContext *aRenderingContext,
|
||||
InlinePrefWidthData *aData);
|
||||
InlinePrefWidthData *aData) MOZ_OVERRIDE;
|
||||
virtual IntrinsicWidthOffsetData
|
||||
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext);
|
||||
virtual IntrinsicSize GetIntrinsicSize();
|
||||
virtual nsSize GetIntrinsicRatio();
|
||||
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
|
||||
virtual IntrinsicSize GetIntrinsicSize() MOZ_OVERRIDE;
|
||||
virtual nsSize GetIntrinsicRatio() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
@ -297,7 +297,7 @@ public:
|
||||
nscoord ShrinkWidthToFit(nsRenderingContext *aRenderingContext,
|
||||
nscoord aWidthInCB);
|
||||
|
||||
NS_IMETHOD WillReflow(nsPresContext* aPresContext);
|
||||
NS_IMETHOD WillReflow(nsPresContext* aPresContext) MOZ_OVERRIDE;
|
||||
/**
|
||||
* Calculates the size of this frame after reflowing (calling Reflow on, and
|
||||
* updating the size and position of) its children, as necessary. The
|
||||
@ -323,10 +323,10 @@ public:
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DidReflow(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState* aReflowState,
|
||||
nsDidReflowStatus aStatus);
|
||||
nsDidReflowStatus aStatus) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* NOTE: aStatus is assumed to be already-initialized. The reflow statuses of
|
||||
@ -343,9 +343,9 @@ public:
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus,
|
||||
bool aConstrainHeight = true);
|
||||
virtual bool CanContinueTextRun() const;
|
||||
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
|
||||
|
||||
virtual bool UpdateOverflow();
|
||||
virtual bool UpdateOverflow() MOZ_OVERRIDE;
|
||||
|
||||
// Selection Methods
|
||||
|
||||
@ -386,10 +386,10 @@ public:
|
||||
virtual ContentOffsets CalcContentOffsetsFromFramePoint(nsPoint aPoint);
|
||||
|
||||
// Box layout methods
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
// We compute and store the HTML content's overflow area. So don't
|
||||
@ -413,7 +413,7 @@ public:
|
||||
void ConsiderChildOverflow(nsOverflowAreas& aOverflowAreas,
|
||||
nsIFrame* aChildFrame);
|
||||
|
||||
virtual const void* StyleDataExternal(nsStyleStructID aSID) const;
|
||||
virtual const void* StyleDataExternal(nsStyleStructID aSID) const MOZ_OVERRIDE;
|
||||
|
||||
|
||||
/**
|
||||
@ -557,7 +557,7 @@ protected:
|
||||
int16_t DisplaySelection(nsPresContext* aPresContext, bool isOkToTurnOn = false);
|
||||
|
||||
// Style post processing hook
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
public:
|
||||
//given a frame five me the first/last leaf available
|
||||
@ -657,7 +657,7 @@ private:
|
||||
|
||||
NS_IMETHODIMP RefreshSizeCache(nsBoxLayoutState& aState);
|
||||
|
||||
virtual nsILineIterator* GetLineIterator();
|
||||
virtual nsILineIterator* GetLineIterator() MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
public:
|
||||
@ -665,12 +665,12 @@ public:
|
||||
* Get a printable from of the name of the frame type.
|
||||
* XXX This should be eliminated and we use GetType() instead...
|
||||
*/
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
/**
|
||||
* Return the state bits that are relevant to regression tests (that
|
||||
* is, those bits which indicate a real difference when they differ
|
||||
*/
|
||||
NS_IMETHOD_(nsFrameState) GetDebugStateBits() const;
|
||||
NS_IMETHOD_(nsFrameState) GetDebugStateBits() const MOZ_OVERRIDE;
|
||||
/**
|
||||
* Called to dump out regression data that describes the layout
|
||||
* of the frame and its children, and so on. The format of the
|
||||
@ -680,7 +680,7 @@ public:
|
||||
* For more information, see XXX.
|
||||
*/
|
||||
NS_IMETHOD DumpRegressionData(nsPresContext* aPresContext,
|
||||
FILE* out, int32_t aIndent);
|
||||
FILE* out, int32_t aIndent) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* See if style tree verification is enabled. To enable style tree
|
||||
|
||||
@ -83,7 +83,7 @@ public:
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList);
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
|
||||
static bool gDragInProgress;
|
||||
|
||||
|
||||
@ -406,19 +406,19 @@ public:
|
||||
const nsPoint& aScrollPosition);
|
||||
nscoord GetIntrinsicVScrollbarWidth(nsRenderingContext *aRenderingContext);
|
||||
|
||||
virtual bool GetBorderRadii(nscoord aRadii[8]) const {
|
||||
virtual bool GetBorderRadii(nscoord aRadii[8]) const MOZ_OVERRIDE {
|
||||
return mInner.GetBorderRadii(aRadii);
|
||||
}
|
||||
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
|
||||
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
|
||||
NS_IMETHOD GetPadding(nsMargin& aPadding);
|
||||
virtual bool IsCollapsed();
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPadding(nsMargin& aPadding) MOZ_OVERRIDE;
|
||||
virtual bool IsCollapsed() MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool UpdateOverflow() MOZ_OVERRIDE {
|
||||
return mInner.UpdateOverflow();
|
||||
@ -438,18 +438,18 @@ public:
|
||||
NS_IMETHOD RemoveFrame(ChildListID aListID,
|
||||
nsIFrame* aOldFrame) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIScrollableFrame* GetScrollTargetFrame() {
|
||||
virtual nsIScrollableFrame* GetScrollTargetFrame() MOZ_OVERRIDE {
|
||||
return this;
|
||||
}
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame() {
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
|
||||
return mInner.GetScrolledFrame()->GetContentInsertionFrame();
|
||||
}
|
||||
|
||||
virtual bool DoesClipChildren() { return true; }
|
||||
virtual nsSplittableType GetSplittableType() const;
|
||||
virtual bool DoesClipChildren() MOZ_OVERRIDE { return true; }
|
||||
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual nsPoint GetPositionOfChildIgnoringScrolling(nsIFrame* aChild)
|
||||
virtual nsPoint GetPositionOfChildIgnoringScrolling(nsIFrame* aChild) MOZ_OVERRIDE
|
||||
{ nsPoint pt = aChild->GetPosition();
|
||||
if (aChild == mInner.GetScrolledFrame()) pt += GetScrollPosition();
|
||||
return pt;
|
||||
@ -466,7 +466,7 @@ public:
|
||||
}
|
||||
|
||||
// nsIScrollableFrame
|
||||
virtual nsIFrame* GetScrolledFrame() const {
|
||||
virtual nsIFrame* GetScrolledFrame() const MOZ_OVERRIDE {
|
||||
return mInner.GetScrolledFrame();
|
||||
}
|
||||
virtual nsGfxScrollFrameInner::ScrollbarStyles GetScrollbarStyles() const {
|
||||
@ -543,7 +543,7 @@ public:
|
||||
virtual bool IsScrollingActive() MOZ_OVERRIDE {
|
||||
return mInner.IsScrollingActive();
|
||||
}
|
||||
virtual void ResetScrollPositionForLayerPixelAlignment() {
|
||||
virtual void ResetScrollPositionForLayerPixelAlignment() MOZ_OVERRIDE {
|
||||
mInner.ResetScrollPositionForLayerPixelAlignment();
|
||||
}
|
||||
virtual bool DidHistoryRestore() MOZ_OVERRIDE {
|
||||
@ -570,10 +570,10 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::scrollFrame
|
||||
*/
|
||||
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
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
@ -630,7 +630,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;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
@ -660,7 +660,7 @@ public:
|
||||
NS_IMETHOD RemoveFrame(ChildListID aListID,
|
||||
nsIFrame* aOldFrame) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIScrollableFrame* GetScrollTargetFrame() {
|
||||
virtual nsIScrollableFrame* GetScrollTargetFrame() MOZ_OVERRIDE {
|
||||
return this;
|
||||
}
|
||||
|
||||
@ -668,10 +668,10 @@ public:
|
||||
return mInner.GetScrolledFrame()->GetContentInsertionFrame();
|
||||
}
|
||||
|
||||
virtual bool DoesClipChildren() { return true; }
|
||||
virtual nsSplittableType GetSplittableType() const;
|
||||
virtual bool DoesClipChildren() MOZ_OVERRIDE { return true; }
|
||||
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual nsPoint GetPositionOfChildIgnoringScrolling(nsIFrame* aChild)
|
||||
virtual nsPoint GetPositionOfChildIgnoringScrolling(nsIFrame* aChild) MOZ_OVERRIDE
|
||||
{ nsPoint pt = aChild->GetPosition();
|
||||
if (aChild == mInner.GetScrolledFrame())
|
||||
pt += mInner.GetLogicalScrollPosition();
|
||||
@ -683,15 +683,15 @@ public:
|
||||
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
|
||||
uint32_t aFilter) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
|
||||
NS_IMETHOD GetPadding(nsMargin& aPadding);
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPadding(nsMargin& aPadding) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool GetBorderRadii(nscoord aRadii[8]) const {
|
||||
virtual bool GetBorderRadii(nscoord aRadii[8]) const MOZ_OVERRIDE {
|
||||
return mInner.GetBorderRadii(aRadii);
|
||||
}
|
||||
|
||||
@ -724,7 +724,7 @@ public:
|
||||
}
|
||||
|
||||
// nsIScrollableFrame
|
||||
virtual nsIFrame* GetScrolledFrame() const {
|
||||
virtual nsIFrame* GetScrolledFrame() const MOZ_OVERRIDE {
|
||||
return mInner.GetScrolledFrame();
|
||||
}
|
||||
virtual nsGfxScrollFrameInner::ScrollbarStyles GetScrollbarStyles() const {
|
||||
@ -801,7 +801,7 @@ public:
|
||||
virtual bool IsScrollingActive() MOZ_OVERRIDE {
|
||||
return mInner.IsScrollingActive();
|
||||
}
|
||||
virtual void ResetScrollPositionForLayerPixelAlignment() {
|
||||
virtual void ResetScrollPositionForLayerPixelAlignment() MOZ_OVERRIDE {
|
||||
mInner.ResetScrollPositionForLayerPixelAlignment();
|
||||
}
|
||||
virtual bool DidHistoryRestore() MOZ_OVERRIDE {
|
||||
|
||||
@ -78,7 +78,7 @@ public:
|
||||
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsSplittableFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced));
|
||||
}
|
||||
@ -88,7 +88,7 @@ public:
|
||||
#endif
|
||||
|
||||
// Inserted child content gets its frames parented by our child block
|
||||
virtual nsIFrame* GetContentInsertionFrame() {
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
|
||||
return GetFirstPrincipalChild()->GetContentInsertionFrame();
|
||||
}
|
||||
|
||||
|
||||
@ -184,7 +184,7 @@ public:
|
||||
friend nsIFrame* NS_NewFirstLineFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
|
||||
@ -34,8 +34,8 @@ public:
|
||||
* Both GetMinWidth and GetPrefWidth will return whatever GetIntrinsicWidth
|
||||
* returns.
|
||||
*/
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
|
||||
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Our auto size is just intrinsic width and intrinsic height.
|
||||
@ -43,7 +43,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;
|
||||
|
||||
/**
|
||||
* Reflow our frame. This will use the computed width plus borderpadding for
|
||||
@ -64,7 +64,7 @@ public:
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
// We don't actually contain a block, but we do always want a
|
||||
// computed width, so tell a little white lie here.
|
||||
|
||||
@ -1609,28 +1609,28 @@ public:
|
||||
nsLineIterator();
|
||||
~nsLineIterator();
|
||||
|
||||
virtual void DisposeLineIterator();
|
||||
virtual void DisposeLineIterator() MOZ_OVERRIDE;
|
||||
|
||||
virtual int32_t GetNumLines();
|
||||
virtual bool GetDirection();
|
||||
virtual int32_t GetNumLines() MOZ_OVERRIDE;
|
||||
virtual bool GetDirection() MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetLine(int32_t aLineNumber,
|
||||
nsIFrame** aFirstFrameOnLine,
|
||||
int32_t* aNumFramesOnLine,
|
||||
nsRect& aLineBounds,
|
||||
uint32_t* aLineFlags);
|
||||
virtual int32_t FindLineContaining(nsIFrame* aFrame, int32_t aStartLine = 0);
|
||||
uint32_t* aLineFlags) MOZ_OVERRIDE;
|
||||
virtual int32_t FindLineContaining(nsIFrame* aFrame, int32_t aStartLine = 0) MOZ_OVERRIDE;
|
||||
NS_IMETHOD FindFrameAt(int32_t aLineNumber,
|
||||
nscoord aX,
|
||||
nsIFrame** aFrameFound,
|
||||
bool* aXIsBeforeFirstFrame,
|
||||
bool* aXIsAfterLastFrame);
|
||||
bool* aXIsAfterLastFrame) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetNextSiblingOnLine(nsIFrame*& aFrame, int32_t aLineNumber);
|
||||
NS_IMETHOD GetNextSiblingOnLine(nsIFrame*& aFrame, int32_t aLineNumber) MOZ_OVERRIDE;
|
||||
#ifdef IBMBIDI
|
||||
NS_IMETHOD CheckLineOrder(int32_t aLine,
|
||||
bool *aIsReordered,
|
||||
nsIFrame **aFirstVisual,
|
||||
nsIFrame **aLastVisual);
|
||||
nsIFrame **aLastVisual) MOZ_OVERRIDE;
|
||||
#endif
|
||||
nsresult Init(nsLineList& aLines, bool aRightToLeft);
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ public:
|
||||
const nsHTMLReflowState& aMaxSize,
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return ViewportFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eCanContainOverflowContainers));
|
||||
|
||||
@ -22,7 +22,7 @@ public:
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aMaxSize,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
@ -50,7 +50,7 @@ public:
|
||||
|
||||
// We must allow Print Preview UI to have a background, no matter what the
|
||||
// user's settings
|
||||
virtual bool HonorPrintBackgroundSettings() { return false; }
|
||||
virtual bool HonorPrintBackgroundSettings() MOZ_OVERRIDE { return false; }
|
||||
|
||||
void PaintHeaderFooter(nsRenderingContext& aRenderingContext,
|
||||
nsPoint aPt);
|
||||
|
||||
@ -56,7 +56,7 @@ public:
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aMaxSize,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
@ -74,7 +74,7 @@ public:
|
||||
NS_IMETHOD StartPrint(nsPresContext* aPresContext,
|
||||
nsIPrintSettings* aPrintSettings,
|
||||
PRUnichar* aDocTitle,
|
||||
PRUnichar* aDocURL);
|
||||
PRUnichar* aDocURL) MOZ_OVERRIDE;
|
||||
NS_IMETHOD PrePrintNextPage(nsITimerCallback* aCallback, bool* aDone) MOZ_OVERRIDE;
|
||||
NS_IMETHOD PrintNextPage() MOZ_OVERRIDE;
|
||||
NS_IMETHOD ResetPrintCanvasList() MOZ_OVERRIDE;
|
||||
@ -86,7 +86,7 @@ public:
|
||||
|
||||
// We must allow Print Preview UI to have a background, no matter what the
|
||||
// user's settings
|
||||
virtual bool HonorPrintBackgroundSettings() { return false; }
|
||||
virtual bool HonorPrintBackgroundSettings() MOZ_OVERRIDE { return false; }
|
||||
|
||||
virtual bool HasTransformGetter() const MOZ_OVERRIDE { return true; }
|
||||
|
||||
@ -95,10 +95,10 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::sequenceFrame
|
||||
*/
|
||||
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:
|
||||
|
||||
@ -24,9 +24,9 @@ public:
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSplittableType GetSplittableType() const;
|
||||
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
/*
|
||||
* Frame continuations can be either fluid or not:
|
||||
@ -45,8 +45,8 @@ public:
|
||||
NS_IMETHOD SetNextContinuation(nsIFrame*) MOZ_OVERRIDE;
|
||||
|
||||
// Get the first/last continuation for this frame.
|
||||
virtual nsIFrame* GetFirstContinuation() const;
|
||||
virtual nsIFrame* GetLastContinuation() const;
|
||||
virtual nsIFrame* GetFirstContinuation() const MOZ_OVERRIDE;
|
||||
virtual nsIFrame* GetLastContinuation() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
// Can aFrame2 be reached from aFrame1 by following prev/next continuations?
|
||||
@ -66,8 +66,8 @@ public:
|
||||
NS_IMETHOD SetNextInFlow(nsIFrame*) MOZ_OVERRIDE;
|
||||
|
||||
// Get the first/last frame in the current flow.
|
||||
virtual nsIFrame* GetFirstInFlow() const;
|
||||
virtual nsIFrame* GetLastInFlow() const;
|
||||
virtual nsIFrame* GetFirstInFlow() const MOZ_OVERRIDE;
|
||||
virtual nsIFrame* GetLastInFlow() const MOZ_OVERRIDE;
|
||||
|
||||
// Remove the frame from the flow. Connects the frame's prev-in-flow
|
||||
// and its next-in-flow. This should only be called in frame Destroy() methods.
|
||||
|
||||
@ -24,15 +24,15 @@ public:
|
||||
nsSubDocumentFrame(nsStyleContext* aContext);
|
||||
|
||||
#ifdef DEBUG
|
||||
void List(FILE* out, int32_t aIndent, uint32_t aFlags = 0) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
void List(FILE* out, int32_t aIndent, uint32_t aFlags = 0) const MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
NS_DECL_QUERYFRAME
|
||||
|
||||
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
|
||||
{
|
||||
// nsLeafFrame is already eReplacedContainsBlock, but that's somewhat bogus
|
||||
return nsLeafFrame::IsFrameOfType(aFlags &
|
||||
@ -43,18 +43,18 @@ public:
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) 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;
|
||||
|
||||
virtual IntrinsicSize GetIntrinsicSize();
|
||||
virtual nsSize GetIntrinsicRatio();
|
||||
virtual IntrinsicSize GetIntrinsicSize() MOZ_OVERRIDE;
|
||||
virtual nsSize GetIntrinsicRatio() 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;
|
||||
|
||||
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
@ -72,13 +72,13 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
// if the content is "visibility:hidden", then just hide the view
|
||||
// and all our contents. We don't extend "visibility:hidden" to
|
||||
// the child content ourselves, since it belongs to a different
|
||||
// document and CSS doesn't inherit in there.
|
||||
virtual bool SupportsVisibilityHidden() { return false; }
|
||||
virtual bool SupportsVisibilityHidden() MOZ_OVERRIDE { return false; }
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
|
||||
|
||||
@ -49,32 +49,32 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
/* get the size of the video's display */
|
||||
nsSize GetVideoIntrinsicSize(nsRenderingContext *aRenderingContext);
|
||||
virtual nsSize GetIntrinsicRatio();
|
||||
virtual nsSize GetIntrinsicRatio() MOZ_OVERRIDE;
|
||||
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
nsSize aMargin, nsSize aBorder, nsSize aPadding,
|
||||
uint32_t aFlags) 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;
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
virtual bool IsLeaf() const MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
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 nsSplittableFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced));
|
||||
}
|
||||
@ -92,7 +92,7 @@ public:
|
||||
nsIContent *GetCaptionOverlay() { return mCaptionDiv; }
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
|
||||
|
||||
@ -83,7 +83,7 @@ public:
|
||||
#endif
|
||||
|
||||
private:
|
||||
virtual mozilla::layout::FrameChildListID GetAbsoluteListID() const { return kFixedList; }
|
||||
virtual mozilla::layout::FrameChildListID GetAbsoluteListID() const MOZ_OVERRIDE { return kFixedList; }
|
||||
|
||||
protected:
|
||||
/**
|
||||
|
||||
@ -47,13 +47,13 @@ public:
|
||||
Stretch(nsRenderingContext& aRenderingContext,
|
||||
nsStretchDirection aStretchDirection,
|
||||
nsBoundingMetrics& aContainerSize,
|
||||
nsHTMLReflowMetrics& aDesiredStretchSize);
|
||||
nsHTMLReflowMetrics& aDesiredStretchSize) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
UpdatePresentationDataFromChildAt(int32_t aFirstIndex,
|
||||
int32_t aLastIndex,
|
||||
uint32_t aFlagsValues,
|
||||
uint32_t aFlagsToUpdate)
|
||||
uint32_t aFlagsToUpdate) MOZ_OVERRIDE
|
||||
{
|
||||
PropagatePresentationDataFromChildAt(this, aFirstIndex, aLastIndex,
|
||||
aFlagsValues, aFlagsToUpdate);
|
||||
@ -75,7 +75,7 @@ public:
|
||||
// --------------------------------------------------------------------------
|
||||
// Overloaded nsContainerFrame methods -- see documentation in nsIFrame.h
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return !(aFlags & nsIFrame::eLineParticipant) &&
|
||||
nsContainerFrame::IsFrameOfType(aFlags &
|
||||
@ -84,7 +84,7 @@ public:
|
||||
|
||||
NS_IMETHOD
|
||||
AppendFrames(ChildListID aListID,
|
||||
nsFrameList& aFrameList);
|
||||
nsFrameList& aFrameList) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
InsertFrames(ChildListID aListID,
|
||||
@ -99,8 +99,8 @@ public:
|
||||
* Both GetMinWidth and GetPrefWidth return whatever
|
||||
* GetIntrinsicWidth returns.
|
||||
*/
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
|
||||
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Return the intrinsic width of the frame's content area.
|
||||
@ -111,10 +111,10 @@ public:
|
||||
Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
WillReflow(nsPresContext* aPresContext)
|
||||
WillReflow(nsPresContext* aPresContext) MOZ_OVERRIDE
|
||||
{
|
||||
mPresentationData.flags &= ~NS_MATHML_ERROR;
|
||||
return nsContainerFrame::WillReflow(aPresContext);
|
||||
@ -123,7 +123,7 @@ public:
|
||||
NS_IMETHOD
|
||||
DidReflow(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState* aReflowState,
|
||||
nsDidReflowStatus aStatus)
|
||||
nsDidReflowStatus aStatus) MOZ_OVERRIDE
|
||||
|
||||
{
|
||||
mPresentationData.flags &= ~NS_MATHML_STRETCH_DONE;
|
||||
@ -134,7 +134,7 @@ public:
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool UpdateOverflow();
|
||||
virtual bool UpdateOverflow() MOZ_OVERRIDE;
|
||||
|
||||
// Notification when an attribute is changed. The MathML module uses the
|
||||
// following paradigm:
|
||||
@ -156,7 +156,7 @@ public:
|
||||
NS_IMETHOD
|
||||
AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
// helper function to apply mirroring to a horizontal coordinate, if needed.
|
||||
nscoord
|
||||
@ -405,7 +405,7 @@ public:
|
||||
// cannot use mFrames{.FirstChild()|.etc} since the block code doesn't set mFrames
|
||||
NS_IMETHOD
|
||||
SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList)
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE
|
||||
{
|
||||
NS_ASSERTION(aListID == kPrincipalList, "unexpected frame list");
|
||||
nsresult rv = nsBlockFrame::SetInitialChildList(aListID, aChildList);
|
||||
@ -416,7 +416,7 @@ public:
|
||||
|
||||
NS_IMETHOD
|
||||
AppendFrames(ChildListID aListID,
|
||||
nsFrameList& aFrameList)
|
||||
nsFrameList& aFrameList) MOZ_OVERRIDE
|
||||
{
|
||||
NS_ASSERTION(aListID == kPrincipalList || aListID == kNoReflowPrincipalList,
|
||||
"unexpected frame list");
|
||||
@ -521,7 +521,7 @@ public:
|
||||
return rv;
|
||||
}
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const {
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE {
|
||||
return nsInlineFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eMathML | nsIFrame::eExcludesIgnorableWhitespace));
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ public:
|
||||
// nsIMathMLFrame ---
|
||||
|
||||
virtual bool
|
||||
IsSpaceLike() {
|
||||
IsSpaceLike() MOZ_OVERRIDE {
|
||||
return NS_MATHML_IS_SPACE_LIKE(mPresentationData.flags);
|
||||
}
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ public:
|
||||
friend nsIFrame* NS_NewMathMLTokenFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData() {
|
||||
TransmitAutomaticData() MOZ_OVERRIDE {
|
||||
// The REC defines the following elements to be space-like:
|
||||
// * an mtext, mspace, maligngroup, or malignmark element;
|
||||
if (mContent->Tag() == nsGkAtoms::mtext_) {
|
||||
@ -31,9 +31,9 @@ public:
|
||||
}
|
||||
|
||||
NS_IMETHOD
|
||||
InheritAutomaticData(nsIFrame* aParent);
|
||||
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
|
||||
virtual eMathMLFrameType GetMathMLFrameType();
|
||||
virtual eMathMLFrameType GetMathMLFrameType() MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
SetInitialChildList(ChildListID aListID,
|
||||
@ -59,7 +59,7 @@ public:
|
||||
bool aPlaceOrigin,
|
||||
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
|
||||
|
||||
virtual void MarkIntrinsicWidthsDirty();
|
||||
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
ChildListChanged(int32_t aModType) MOZ_OVERRIDE
|
||||
|
||||
@ -51,7 +51,7 @@ public:
|
||||
virtual nsresult
|
||||
Place(nsRenderingContext& aRenderingContext,
|
||||
bool aPlaceOrigin,
|
||||
nsHTMLReflowMetrics& aDesiredSize);
|
||||
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
MeasureForWidth(nsRenderingContext& aRenderingContext,
|
||||
@ -64,9 +64,9 @@ public:
|
||||
|
||||
virtual void
|
||||
SetAdditionalStyleContext(int32_t aIndex,
|
||||
nsStyleContext* aStyleContext);
|
||||
nsStyleContext* aStyleContext) MOZ_OVERRIDE;
|
||||
virtual nsStyleContext*
|
||||
GetAdditionalStyleContext(int32_t aIndex) const;
|
||||
GetAdditionalStyleContext(int32_t aIndex) const MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
|
||||
@ -22,9 +22,9 @@ public:
|
||||
|
||||
virtual void
|
||||
SetAdditionalStyleContext(int32_t aIndex,
|
||||
nsStyleContext* aStyleContext);
|
||||
nsStyleContext* aStyleContext) MOZ_OVERRIDE;
|
||||
virtual nsStyleContext*
|
||||
GetAdditionalStyleContext(int32_t aIndex) const;
|
||||
GetAdditionalStyleContext(int32_t aIndex) const MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
|
||||
@ -56,11 +56,11 @@ public:
|
||||
|
||||
friend nsIFrame* NS_NewMathMLmfracFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
virtual eMathMLFrameType GetMathMLFrameType();
|
||||
virtual eMathMLFrameType GetMathMLFrameType() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
MeasureForWidth(nsRenderingContext& aRenderingContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize);
|
||||
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
Place(nsRenderingContext& aRenderingContext,
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#ifndef nsMathMLmmultiscriptsFrame_h___
|
||||
#define nsMathMLmmultiscriptsFrame_h___
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsMathMLContainerFrame.h"
|
||||
|
||||
@ -20,12 +21,12 @@ public:
|
||||
friend nsIFrame* NS_NewMathMLmmultiscriptsFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData();
|
||||
TransmitAutomaticData() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
Place(nsRenderingContext& aRenderingContext,
|
||||
bool aPlaceOrigin,
|
||||
nsHTMLReflowMetrics& aDesiredSize);
|
||||
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
nsMathMLmmultiscriptsFrame(nsStyleContext* aContext) : nsMathMLContainerFrame(aContext) {}
|
||||
|
||||
@ -20,13 +20,13 @@ public:
|
||||
|
||||
friend nsIFrame* NS_NewMathMLmoFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
virtual eMathMLFrameType GetMathMLFrameType();
|
||||
virtual eMathMLFrameType GetMathMLFrameType() MOZ_OVERRIDE;
|
||||
|
||||
virtual void
|
||||
SetAdditionalStyleContext(int32_t aIndex,
|
||||
nsStyleContext* aStyleContext);
|
||||
nsStyleContext* aStyleContext) MOZ_OVERRIDE;
|
||||
virtual nsStyleContext*
|
||||
GetAdditionalStyleContext(int32_t aIndex) const;
|
||||
GetAdditionalStyleContext(int32_t aIndex) const MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
|
||||
@ -21,10 +21,10 @@ public:
|
||||
friend nsIFrame* NS_NewMathMLmpaddedFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD
|
||||
InheritAutomaticData(nsIFrame* aParent);
|
||||
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData() {
|
||||
TransmitAutomaticData() MOZ_OVERRIDE {
|
||||
return TransmitAutomaticDataForMrowLikeElement();
|
||||
}
|
||||
|
||||
|
||||
@ -21,10 +21,10 @@ public:
|
||||
friend nsIFrame* NS_NewMathMLmphantomFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD
|
||||
InheritAutomaticData(nsIFrame* aParent);
|
||||
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData() {
|
||||
TransmitAutomaticData() MOZ_OVERRIDE {
|
||||
return TransmitAutomaticDataForMrowLikeElement();
|
||||
}
|
||||
|
||||
|
||||
@ -22,9 +22,9 @@ public:
|
||||
|
||||
virtual void
|
||||
SetAdditionalStyleContext(int32_t aIndex,
|
||||
nsStyleContext* aStyleContext);
|
||||
nsStyleContext* aStyleContext) MOZ_OVERRIDE;
|
||||
virtual nsStyleContext*
|
||||
GetAdditionalStyleContext(int32_t aIndex) const;
|
||||
GetAdditionalStyleContext(int32_t aIndex) const MOZ_OVERRIDE;
|
||||
|
||||
virtual void
|
||||
Init(nsIContent* aContent,
|
||||
|
||||
@ -23,10 +23,10 @@ public:
|
||||
NS_IMETHOD
|
||||
AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
InheritAutomaticData(nsIFrame* aParent);
|
||||
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData() MOZ_OVERRIDE {
|
||||
|
||||
@ -21,14 +21,14 @@ public:
|
||||
friend nsIFrame* NS_NewMathMLmspaceFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData() {
|
||||
TransmitAutomaticData() MOZ_OVERRIDE {
|
||||
// The REC defines the following elements to be space-like:
|
||||
// * an mtext, mspace, maligngroup, or malignmark element;
|
||||
mPresentationData.flags |= NS_MATHML_SPACE_LIKE;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual bool IsLeaf() const;
|
||||
virtual bool IsLeaf() const MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
Reflow(nsPresContext* aPresContext,
|
||||
|
||||
@ -23,10 +23,10 @@ public:
|
||||
NS_IMETHOD
|
||||
AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
InheritAutomaticData(nsIFrame* aParent);
|
||||
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData() MOZ_OVERRIDE;
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#ifndef nsMathMLmsubFrame_h___
|
||||
#define nsMathMLmsubFrame_h___
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsMathMLContainerFrame.h"
|
||||
|
||||
@ -20,12 +21,12 @@ public:
|
||||
friend nsIFrame* NS_NewMathMLmsubFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData();
|
||||
TransmitAutomaticData() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
Place(nsRenderingContext& aRenderingContext,
|
||||
bool aPlaceOrigin,
|
||||
nsHTMLReflowMetrics& aDesiredSize);
|
||||
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
|
||||
|
||||
static nsresult
|
||||
PlaceSubScript (nsPresContext* aPresContext,
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#ifndef nsMathMLmsubsupFrame_h___
|
||||
#define nsMathMLmsubsupFrame_h___
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsMathMLContainerFrame.h"
|
||||
|
||||
@ -20,12 +21,12 @@ public:
|
||||
friend nsIFrame* NS_NewMathMLmsubsupFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData();
|
||||
TransmitAutomaticData() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
Place(nsRenderingContext& aRenderingContext,
|
||||
bool aPlaceOrigin,
|
||||
nsHTMLReflowMetrics& aDesiredSize);
|
||||
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
|
||||
|
||||
static nsresult
|
||||
PlaceSubSupScript(nsPresContext* aPresContext,
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#ifndef nsMathMLmsupFrame_h___
|
||||
#define nsMathMLmsupFrame_h___
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsMathMLContainerFrame.h"
|
||||
|
||||
@ -20,12 +21,12 @@ public:
|
||||
friend nsIFrame* NS_NewMathMLmsupFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData();
|
||||
TransmitAutomaticData() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
Place(nsRenderingContext& aRenderingContext,
|
||||
bool aPlaceOrigin,
|
||||
nsHTMLReflowMetrics& aDesiredSize);
|
||||
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
|
||||
|
||||
static nsresult
|
||||
PlaceSuperScript (nsPresContext* aPresContext,
|
||||
|
||||
@ -30,7 +30,7 @@ public:
|
||||
|
||||
NS_IMETHOD
|
||||
UpdatePresentationData(uint32_t aFlagsValues,
|
||||
uint32_t aWhichFlags);
|
||||
uint32_t aWhichFlags) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
UpdatePresentationDataFromChildAt(int32_t aFirstIndex,
|
||||
@ -49,9 +49,9 @@ public:
|
||||
NS_IMETHOD
|
||||
AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsTableOuterFrame::IsFrameOfType(aFlags & ~(nsIFrame::eMathML));
|
||||
}
|
||||
@ -81,11 +81,11 @@ public:
|
||||
|
||||
NS_IMETHOD
|
||||
SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList);
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
AppendFrames(ChildListID aListID,
|
||||
nsFrameList& aFrameList)
|
||||
nsFrameList& aFrameList) MOZ_OVERRIDE
|
||||
{
|
||||
nsresult rv = nsTableFrame::AppendFrames(aListID, aFrameList);
|
||||
RestyleTable();
|
||||
@ -95,7 +95,7 @@ public:
|
||||
NS_IMETHOD
|
||||
InsertFrames(ChildListID aListID,
|
||||
nsIFrame* aPrevFrame,
|
||||
nsFrameList& aFrameList)
|
||||
nsFrameList& aFrameList) MOZ_OVERRIDE
|
||||
{
|
||||
nsresult rv = nsTableFrame::InsertFrames(aListID, aPrevFrame, aFrameList);
|
||||
RestyleTable();
|
||||
@ -104,14 +104,14 @@ public:
|
||||
|
||||
NS_IMETHOD
|
||||
RemoveFrame(ChildListID aListID,
|
||||
nsIFrame* aOldFrame)
|
||||
nsIFrame* aOldFrame) MOZ_OVERRIDE
|
||||
{
|
||||
nsresult rv = nsTableFrame::RemoveFrame(aListID, aOldFrame);
|
||||
RestyleTable();
|
||||
return rv;
|
||||
}
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsTableFrame::IsFrameOfType(aFlags & ~(nsIFrame::eMathML));
|
||||
}
|
||||
@ -140,7 +140,7 @@ public:
|
||||
NS_IMETHOD
|
||||
AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
AppendFrames(ChildListID aListID,
|
||||
@ -170,7 +170,7 @@ public:
|
||||
return rv;
|
||||
}
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsTableRowFrame::IsFrameOfType(aFlags & ~(nsIFrame::eMathML));
|
||||
}
|
||||
@ -204,11 +204,11 @@ public:
|
||||
NS_IMETHOD
|
||||
AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual int32_t GetRowSpan() MOZ_OVERRIDE;
|
||||
virtual int32_t GetColSpan() MOZ_OVERRIDE;
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsTableCellFrame::IsFrameOfType(aFlags & ~(nsIFrame::eMathML));
|
||||
}
|
||||
@ -245,9 +245,9 @@ public:
|
||||
Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsBlockFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eMathML | nsIFrame::eExcludesIgnorableWhitespace));
|
||||
|
||||
@ -23,10 +23,10 @@ public:
|
||||
virtual nsresult
|
||||
Place(nsRenderingContext& aRenderingContext,
|
||||
bool aPlaceOrigin,
|
||||
nsHTMLReflowMetrics& aDesiredSize);
|
||||
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
InheritAutomaticData(nsIFrame* aParent);
|
||||
InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
TransmitAutomaticData() MOZ_OVERRIDE;
|
||||
|
||||
@ -37,7 +37,7 @@ public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// nsIStyleRuleProcessor (parts)
|
||||
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData);
|
||||
virtual nsRestyleHint HasStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
|
||||
virtual bool HasDocumentStateDependentStyle(StateRuleProcessorData* aData) MOZ_OVERRIDE;
|
||||
virtual nsRestyleHint
|
||||
HasAttributeDependentStyle(AttributeRuleProcessorData* aData) MOZ_OVERRIDE;
|
||||
@ -83,7 +83,7 @@ public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// nsIStyleRule implementation
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
|
||||
#ifdef DEBUG
|
||||
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
#ifndef mozilla_css_GroupRule_h__
|
||||
#define mozilla_css_GroupRule_h__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/css/Rule.h"
|
||||
#include "nsCOMArray.h"
|
||||
#include "nsAutoPtr.h"
|
||||
@ -43,7 +44,7 @@ public:
|
||||
|
||||
// to help implement nsIStyleRule
|
||||
#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
|
||||
|
||||
public:
|
||||
|
||||
@ -40,7 +40,7 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
|
||||
@ -41,7 +41,7 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
|
||||
@ -281,7 +281,7 @@ public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// nsIStyleRule interface
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
|
||||
#ifdef DEBUG
|
||||
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
@ -359,10 +359,10 @@ public:
|
||||
virtual nsIDOMCSSRule* GetExistingDOMRule();
|
||||
|
||||
// The new mapping function.
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) 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
|
||||
|
||||
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
|
||||
|
||||
@ -56,7 +56,7 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
@ -114,7 +114,7 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
@ -241,13 +241,13 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
DECL_STYLE_RULE_INHERIT
|
||||
|
||||
virtual int32_t GetType() const;
|
||||
virtual int32_t GetType() const MOZ_OVERRIDE;
|
||||
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
|
||||
|
||||
// nsIDOMCSSRule interface
|
||||
@ -362,7 +362,7 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
@ -404,7 +404,7 @@ public:
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsCSSKeyframeStyleDeclaration,
|
||||
nsICSSDeclaration)
|
||||
|
||||
virtual nsINode* GetParentObject();
|
||||
virtual nsINode* GetParentObject() MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
// This reference is not reference-counted. The rule object tells us
|
||||
@ -432,12 +432,12 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
DECL_STYLE_RULE_INHERIT
|
||||
virtual int32_t GetType() const;
|
||||
virtual int32_t GetType() const MOZ_OVERRIDE;
|
||||
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
|
||||
|
||||
// nsIDOMCSSRule interface
|
||||
@ -478,7 +478,7 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
@ -532,7 +532,7 @@ public:
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsCSSPageStyleDeclaration,
|
||||
nsICSSDeclaration)
|
||||
|
||||
virtual nsINode *GetParentObject();
|
||||
virtual nsINode *GetParentObject() MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
// This reference is not reference-counted. The rule object tells us
|
||||
@ -558,12 +558,12 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
DECL_STYLE_RULE_INHERIT
|
||||
virtual int32_t GetType() const;
|
||||
virtual int32_t GetType() const MOZ_OVERRIDE;
|
||||
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
|
||||
|
||||
// nsIDOMCSSRule interface
|
||||
@ -578,7 +578,7 @@ public:
|
||||
|
||||
mozilla::css::ImportantRule* GetImportantRule();
|
||||
|
||||
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
|
||||
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
|
||||
private:
|
||||
nsAutoPtr<mozilla::css::Declaration> mDeclaration;
|
||||
// lazily created when needed:
|
||||
@ -597,7 +597,7 @@ public:
|
||||
|
||||
// nsIStyleRule methods
|
||||
#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
|
||||
|
||||
// Rule methods
|
||||
|
||||
@ -118,7 +118,7 @@ public:
|
||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_CSS_STYLE_SHEET_IMPL_CID)
|
||||
|
||||
// nsIStyleSheet interface
|
||||
virtual nsIURI* GetSheetURI() const;
|
||||
virtual nsIURI* GetSheetURI() const MOZ_OVERRIDE;
|
||||
virtual nsIURI* GetBaseURI() const MOZ_OVERRIDE;
|
||||
virtual void GetTitle(nsString& aTitle) const MOZ_OVERRIDE;
|
||||
virtual void GetType(nsString& aType) const MOZ_OVERRIDE;
|
||||
@ -211,7 +211,7 @@ public:
|
||||
|
||||
// nsICSSLoaderObserver interface
|
||||
NS_IMETHOD StyleSheetLoaded(nsCSSStyleSheet* aSheet, bool aWasAlternate,
|
||||
nsresult aStatus);
|
||||
nsresult aStatus) MOZ_OVERRIDE;
|
||||
|
||||
enum EnsureUniqueInnerResult {
|
||||
// No work was needed to ensure a unique inner.
|
||||
|
||||
@ -45,7 +45,7 @@ public:
|
||||
GetPropertyCSSValue(const nsAString& aProp, mozilla::ErrorResult& aRv)
|
||||
MOZ_OVERRIDE;
|
||||
using nsICSSDeclaration::GetPropertyCSSValue;
|
||||
virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName);
|
||||
virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName) MOZ_OVERRIDE;
|
||||
|
||||
enum StyleType {
|
||||
eDefaultOnly, // Only includes UA and user sheets
|
||||
|
||||
@ -42,7 +42,7 @@ public:
|
||||
|
||||
// Require subclasses to implement |GetParentRule|.
|
||||
//NS_DECL_NSIDOMCSSSTYLEDECLARATION
|
||||
NS_IMETHOD GetCssText(nsAString & aCssText);
|
||||
NS_IMETHOD GetCssText(nsAString & aCssText) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetCssText(const nsAString & aCssText) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPropertyValue(const nsAString & propertyName,
|
||||
nsAString & _retval) MOZ_OVERRIDE;
|
||||
@ -51,7 +51,7 @@ public:
|
||||
mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
|
||||
using nsICSSDeclaration::GetPropertyCSSValue;
|
||||
NS_IMETHOD RemoveProperty(const nsAString & propertyName,
|
||||
nsAString & _retval);
|
||||
nsAString & _retval) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPropertyPriority(const nsAString & propertyName,
|
||||
nsAString & _retval) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetProperty(const nsAString & propertyName,
|
||||
@ -90,7 +90,7 @@ public:
|
||||
#undef CSS_PROP
|
||||
#undef CSS_PROP_PUBLIC_OR_PRIVATE
|
||||
|
||||
virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName);
|
||||
virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName) MOZ_OVERRIDE;
|
||||
|
||||
virtual JSObject* WrapObject(JSContext *cx,
|
||||
JS::Handle<JSObject*> scope) MOZ_OVERRIDE
|
||||
|
||||
@ -31,7 +31,7 @@ public:
|
||||
void Reset(nsIURI* aURL);
|
||||
|
||||
// nsIStyleSheet
|
||||
virtual nsIURI* GetSheetURI() const;
|
||||
virtual nsIURI* GetSheetURI() const MOZ_OVERRIDE;
|
||||
virtual nsIURI* GetBaseURI() const MOZ_OVERRIDE;
|
||||
virtual void GetTitle(nsString& aTitle) const MOZ_OVERRIDE;
|
||||
virtual void GetType(nsString& aType) const MOZ_OVERRIDE;
|
||||
|
||||
@ -32,7 +32,7 @@ public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// nsIStyleSheet api
|
||||
virtual nsIURI* GetSheetURI() const;
|
||||
virtual nsIURI* GetSheetURI() const MOZ_OVERRIDE;
|
||||
virtual nsIURI* GetBaseURI() const MOZ_OVERRIDE;
|
||||
virtual void GetTitle(nsString& aTitle) const MOZ_OVERRIDE;
|
||||
virtual void GetType(nsString& aType) const MOZ_OVERRIDE;
|
||||
@ -91,7 +91,7 @@ private:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// nsIStyleRule interface
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
|
||||
#ifdef DEBUG
|
||||
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
@ -112,7 +112,7 @@ private:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// nsIStyleRule interface
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) = 0;
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE = 0;
|
||||
#ifdef DEBUG
|
||||
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
@ -125,7 +125,7 @@ private:
|
||||
public:
|
||||
TableTHRule() {}
|
||||
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
// Rule to handle quirk table colors
|
||||
@ -133,7 +133,7 @@ private:
|
||||
public:
|
||||
TableQuirkColorRule() {}
|
||||
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
nsCOMPtr<nsIURI> mURL;
|
||||
|
||||
@ -37,7 +37,7 @@ struct TreeMatchContext;
|
||||
class nsEmptyStyleRule MOZ_FINAL : public nsIStyleRule
|
||||
{
|
||||
NS_DECL_ISUPPORTS
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
|
||||
#ifdef DEBUG
|
||||
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
@ -46,7 +46,7 @@ class nsEmptyStyleRule MOZ_FINAL : public nsIStyleRule
|
||||
class nsInitialStyleRule MOZ_FINAL : public nsIStyleRule
|
||||
{
|
||||
NS_DECL_ISUPPORTS
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
|
||||
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
|
||||
#ifdef DEBUG
|
||||
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
@ -166,7 +166,7 @@ public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
// nsISVGFilterProperty
|
||||
virtual void Invalidate() { DoUpdate(); }
|
||||
virtual void Invalidate() MOZ_OVERRIDE { DoUpdate(); }
|
||||
|
||||
private:
|
||||
// nsSVGRenderingObserver
|
||||
|
||||
@ -79,7 +79,7 @@ public:
|
||||
|
||||
// nsISVGChildFrame interface:
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext *aContext,
|
||||
const nsIntRect *aDirtyRect);
|
||||
const nsIntRect *aDirtyRect) MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsRect) GetCoveredRegion() MOZ_OVERRIDE;
|
||||
virtual void ReflowSVG() MOZ_OVERRIDE;
|
||||
|
||||
@ -229,7 +229,7 @@ public:
|
||||
// nsISVGChildFrame interface:
|
||||
// These four always use the global transform, even if NS_STATE_NONDISPLAY_CHILD
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext *aContext,
|
||||
const nsIntRect *aDirtyRect);
|
||||
const nsIntRect *aDirtyRect) MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
|
||||
virtual SVGBBox GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
@ -244,7 +244,7 @@ public:
|
||||
|
||||
// nsISVGGlyphFragmentNode interface:
|
||||
// These do not use the global transform if NS_STATE_NONDISPLAY_CHILD
|
||||
virtual uint32_t GetNumberOfChars();
|
||||
virtual uint32_t GetNumberOfChars() MOZ_OVERRIDE;
|
||||
virtual float GetComputedTextLength() MOZ_OVERRIDE;
|
||||
virtual float GetSubStringLength(uint32_t charnum, uint32_t fragmentChars) MOZ_OVERRIDE;
|
||||
virtual int32_t GetCharNumAtPosition(mozilla::nsISVGPoint *point) MOZ_OVERRIDE;
|
||||
|
||||
@ -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 "nsSVGContainerFrame.h"
|
||||
#include "nsISVGSVGFrame.h"
|
||||
#include "gfxMatrix.h"
|
||||
@ -61,7 +62,7 @@ public:
|
||||
virtual bool HasChildrenOnlyTransform(gfxMatrix *aTransform) const;
|
||||
|
||||
// nsISVGSVGFrame interface:
|
||||
virtual void NotifyViewportOrTransformChanged(uint32_t aFlags);
|
||||
virtual void NotifyViewportOrTransformChanged(uint32_t aFlags) MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGOUTERSVGFRAME_H__
|
||||
#define __NS_SVGOUTERSVGFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsISVGSVGFrame.h"
|
||||
#include "nsSVGContainerFrame.h"
|
||||
@ -103,7 +104,7 @@ public:
|
||||
}
|
||||
|
||||
// nsISVGSVGFrame interface:
|
||||
virtual void NotifyViewportOrTransformChanged(uint32_t aFlags);
|
||||
virtual void NotifyViewportOrTransformChanged(uint32_t aFlags) MOZ_OVERRIDE;
|
||||
|
||||
// nsISVGChildFrame methods:
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext* aContext,
|
||||
|
||||
@ -85,7 +85,7 @@ public:
|
||||
protected:
|
||||
// nsISVGChildFrame interface:
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext *aContext,
|
||||
const nsIntRect *aDirtyRect);
|
||||
const nsIntRect *aDirtyRect) MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsRect) GetCoveredRegion() MOZ_OVERRIDE;
|
||||
virtual void ReflowSVG() MOZ_OVERRIDE;
|
||||
|
||||
@ -68,7 +68,7 @@ public:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
|
||||
// nsISVGGlyphFragmentNode interface:
|
||||
virtual uint32_t GetNumberOfChars();
|
||||
virtual uint32_t GetNumberOfChars() MOZ_OVERRIDE;
|
||||
virtual float GetComputedTextLength() MOZ_OVERRIDE;
|
||||
virtual float GetSubStringLength(uint32_t charnum, uint32_t fragmentChars) MOZ_OVERRIDE;
|
||||
virtual int32_t GetCharNumAtPosition(mozilla::nsISVGPoint *point) MOZ_OVERRIDE;
|
||||
|
||||
@ -60,10 +60,10 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
/** @see nsIFrame::DidSetStyleContext */
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
// table cells contain a block frame which does most of the work, and
|
||||
// so these functions should never be called. They assert and return
|
||||
@ -76,13 +76,13 @@ public:
|
||||
NS_IMETHOD RemoveFrame(ChildListID aListID,
|
||||
nsIFrame* aOldFrame) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame() {
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
|
||||
return GetFirstPrincipalChild()->GetContentInsertionFrame();
|
||||
}
|
||||
|
||||
virtual nsMargin GetUsedMargin() const;
|
||||
virtual nsMargin GetUsedMargin() const MOZ_OVERRIDE;
|
||||
|
||||
virtual void NotifyPercentHeight(const nsHTMLReflowState& aReflowState);
|
||||
virtual void NotifyPercentHeight(const nsHTMLReflowState& aReflowState) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool NeedsToObserve(const nsHTMLReflowState& aReflowState) MOZ_OVERRIDE;
|
||||
|
||||
@ -101,25 +101,25 @@ public:
|
||||
const nsRect& aDirtyRect, nsPoint aPt,
|
||||
uint32_t aFlags);
|
||||
|
||||
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 IntrinsicWidthOffsetData
|
||||
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext);
|
||||
IntrinsicWidthOffsets(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 nsLayoutAtoms::tableCellFrame
|
||||
*/
|
||||
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 VerticallyAlignChild(nscoord aMaxAscent);
|
||||
@ -162,7 +162,7 @@ public:
|
||||
* for continued cell frames the row index is that of the cell's first-in-flow
|
||||
* and the column index (starting at 0 for the first column
|
||||
*/
|
||||
NS_IMETHOD GetCellIndexes(int32_t &aRowIndex, int32_t &aColIndex);
|
||||
NS_IMETHOD GetCellIndexes(int32_t &aRowIndex, int32_t &aColIndex) MOZ_OVERRIDE;
|
||||
|
||||
/** return the mapped cell's row index (starting at 0 for the first row) */
|
||||
virtual nsresult GetRowIndex(int32_t &aRowIndex) const MOZ_OVERRIDE;
|
||||
@ -209,9 +209,9 @@ public:
|
||||
void DecorateForSelection(nsRenderingContext& aRenderingContext,
|
||||
nsPoint aPt);
|
||||
|
||||
virtual bool UpdateOverflow();
|
||||
virtual bool UpdateOverflow() MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags & ~(nsIFrame::eTablePart));
|
||||
}
|
||||
@ -297,8 +297,8 @@ public:
|
||||
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual nsMargin GetUsedBorder() const;
|
||||
virtual bool GetBorderRadii(nscoord aRadii[8]) const;
|
||||
virtual nsMargin GetUsedBorder() const MOZ_OVERRIDE;
|
||||
virtual bool GetBorderRadii(nscoord aRadii[8]) const MOZ_OVERRIDE;
|
||||
|
||||
// Get the *inner half of the border only*, in twips.
|
||||
virtual nsMargin* GetBorderWidth(nsMargin& aBorder) const MOZ_OVERRIDE;
|
||||
|
||||
@ -264,7 +264,7 @@ public:
|
||||
return mFinalWidth;
|
||||
}
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsSplittableFrame::IsFrameOfType(aFlags & ~(nsIFrame::eTablePart));
|
||||
}
|
||||
|
||||
@ -197,7 +197,7 @@ public:
|
||||
void SetContinuousBCBorderWidth(uint8_t aForSide,
|
||||
BCPixelSize aPixelValue);
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags & ~(nsIFrame::eTablePart));
|
||||
}
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
#ifndef nsTableFrame_h__
|
||||
#define nsTableFrame_h__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "celldata.h"
|
||||
#include "nscore.h"
|
||||
#include "nsContainerFrame.h"
|
||||
@ -50,12 +51,12 @@ public:
|
||||
mPartHasFixedBackground(false) {}
|
||||
|
||||
virtual bool IsVaryingRelativeToMovingFrame(nsDisplayListBuilder* aBuilder,
|
||||
nsIFrame* aFrame);
|
||||
nsIFrame* aFrame) MOZ_OVERRIDE;
|
||||
// With collapsed borders, parts of the collapsed border can extend outside
|
||||
// the table part frames, so allow this display element to blow out to our
|
||||
// overflow rect. This is also useful for row frames that have spanning
|
||||
// cells extending outside them.
|
||||
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap);
|
||||
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE;
|
||||
|
||||
void UpdateForFrameBackground(nsIFrame* aFrame);
|
||||
|
||||
@ -155,22 +156,22 @@ public:
|
||||
nsIAtom* aAttribute);
|
||||
|
||||
/** @see nsIFrame::DestroyFrom */
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
/** @see nsIFrame::DidSetStyleContext */
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) 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 nsMargin GetUsedBorder() const;
|
||||
virtual nsMargin GetUsedPadding() const;
|
||||
virtual nsMargin GetUsedMargin() const;
|
||||
virtual nsMargin GetUsedBorder() const MOZ_OVERRIDE;
|
||||
virtual nsMargin GetUsedPadding() const MOZ_OVERRIDE;
|
||||
virtual nsMargin GetUsedMargin() const MOZ_OVERRIDE;
|
||||
|
||||
// Get the offset from the border box to the area where the row groups fit
|
||||
nsMargin GetChildAreaOffset(const nsHTMLReflowState* aReflowState) const;
|
||||
@ -218,10 +219,10 @@ public:
|
||||
* @see nsIFrame::SetInitialChildList
|
||||
*/
|
||||
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 const nsFrameList& GetChildList(ChildListID aListID) const MOZ_OVERRIDE;
|
||||
virtual void GetChildLists(nsTArray<ChildList>* aLists) const MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
@ -274,13 +275,13 @@ public:
|
||||
void PaintBCBorders(nsRenderingContext& aRenderingContext,
|
||||
const nsRect& aDirtyRect);
|
||||
|
||||
virtual void MarkIntrinsicWidthsDirty();
|
||||
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
|
||||
// For border-collapse tables, the caller must not add padding and
|
||||
// border to the results of these functions.
|
||||
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 IntrinsicWidthOffsetData
|
||||
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext);
|
||||
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
@ -289,7 +290,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;
|
||||
/**
|
||||
* A copy of nsFrame::ShrinkWidthToFit that calls a different
|
||||
* GetPrefWidth, since tables have two different ones.
|
||||
@ -315,7 +316,7 @@ public:
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
nsresult ReflowTable(nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
@ -325,16 +326,16 @@ public:
|
||||
|
||||
nsFrameList& GetColGroups();
|
||||
|
||||
virtual nsIFrame* GetParentStyleContextFrame() const;
|
||||
virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::tableFrame
|
||||
*/
|
||||
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
|
||||
{
|
||||
if (aFlags & eSupportsCSSTransforms) {
|
||||
return false;
|
||||
@ -344,7 +345,7 @@ public:
|
||||
|
||||
#ifdef DEBUG
|
||||
/** @see nsIFrame::GetFrameName */
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
/** return the width of the column at aColIndex */
|
||||
@ -487,7 +488,7 @@ public:
|
||||
const nsRect& aOrigVisualOverflow,
|
||||
bool aIsFirstReflow);
|
||||
|
||||
virtual bool UpdateOverflow();
|
||||
virtual bool UpdateOverflow() MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ public:
|
||||
NS_DECL_FRAMEARENA_HELPERS
|
||||
|
||||
// nsISupports
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
friend nsIFrame* NS_NewTableCaptionFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
|
||||
@ -68,12 +68,12 @@ public:
|
||||
|
||||
// nsIFrame overrides - see there for a description
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
|
||||
virtual const nsFrameList& GetChildList(ChildListID aListID) const;
|
||||
virtual const nsFrameList& GetChildList(ChildListID aListID) const MOZ_OVERRIDE;
|
||||
virtual void GetChildLists(nsTArray<ChildList>* aLists) const MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD AppendFrames(ChildListID aListID,
|
||||
@ -86,7 +86,7 @@ public:
|
||||
NS_IMETHOD RemoveFrame(ChildListID aListID,
|
||||
nsIFrame* aOldFrame) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame() {
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
|
||||
return GetFirstPrincipalChild()->GetContentInsertionFrame();
|
||||
}
|
||||
|
||||
@ -277,7 +277,7 @@ protected:
|
||||
nscoord aAvailableWidth,
|
||||
nsMargin& aMargin);
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags &
|
||||
(~eCanContainOverflowContainers));
|
||||
|
||||
@ -46,7 +46,7 @@ public:
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
/** @see nsIFrame::DidSetStyleContext */
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD AppendFrames(ChildListID aListID,
|
||||
nsFrameList& aFrameList) MOZ_OVERRIDE;
|
||||
@ -63,9 +63,9 @@ public:
|
||||
*/
|
||||
friend nsIFrame* NS_NewTableRowFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
virtual nsMargin GetUsedMargin() const;
|
||||
virtual nsMargin GetUsedBorder() const;
|
||||
virtual nsMargin GetUsedPadding() const;
|
||||
virtual nsMargin GetUsedMargin() const MOZ_OVERRIDE;
|
||||
virtual nsMargin GetUsedBorder() const MOZ_OVERRIDE;
|
||||
virtual nsMargin GetUsedPadding() const MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
@ -224,7 +224,7 @@ public:
|
||||
void SetContinuousBCBorderWidth(uint8_t aForSide,
|
||||
BCPixelSize aPixelValue);
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags & ~(nsIFrame::eTablePart));
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ public:
|
||||
friend nsIFrame* NS_NewTableRowGroupFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
virtual ~nsTableRowGroupFrame();
|
||||
/** @see nsIFrame::DidSetStyleContext */
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD AppendFrames(ChildListID aListID,
|
||||
nsFrameList& aFrameList) MOZ_OVERRIDE;
|
||||
@ -89,9 +89,9 @@ public:
|
||||
NS_IMETHOD RemoveFrame(ChildListID aListID,
|
||||
nsIFrame* aOldFrame) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsMargin GetUsedMargin() const;
|
||||
virtual nsMargin GetUsedBorder() const;
|
||||
virtual nsMargin GetUsedPadding() const;
|
||||
virtual nsMargin GetUsedMargin() const MOZ_OVERRIDE;
|
||||
virtual nsMargin GetUsedBorder() const MOZ_OVERRIDE;
|
||||
virtual nsMargin GetUsedPadding() const MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
@ -109,19 +109,19 @@ 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::tableRowGroupFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
nsTableRowFrame* GetFirstRow();
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
/** return the number of child rows (not necessarily == number of child frames) */
|
||||
@ -323,9 +323,9 @@ public:
|
||||
*/
|
||||
FrameCursorData* SetupRowCursor();
|
||||
|
||||
virtual nsILineIterator* GetLineIterator() { return this; }
|
||||
virtual nsILineIterator* GetLineIterator() MOZ_OVERRIDE { return this; }
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags & ~(nsIFrame::eTablePart));
|
||||
}
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#ifndef nsBox_h___
|
||||
#define nsBox_h___
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsIFrame.h"
|
||||
|
||||
class nsITheme;
|
||||
@ -22,34 +23,34 @@ public:
|
||||
|
||||
static void Shutdown();
|
||||
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize GetMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsCollapsed();
|
||||
virtual bool IsCollapsed() MOZ_OVERRIDE;
|
||||
|
||||
virtual void SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect& aRect,
|
||||
bool aRemoveOverflowAreas = false);
|
||||
bool aRemoveOverflowAreas = false) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetBorder(nsMargin& aBorderAndPadding);
|
||||
NS_IMETHOD GetPadding(nsMargin& aBorderAndPadding);
|
||||
NS_IMETHOD GetMargin(nsMargin& aMargin);
|
||||
NS_IMETHOD GetBorder(nsMargin& aBorderAndPadding) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetPadding(nsMargin& aBorderAndPadding) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetMargin(nsMargin& aMargin) MOZ_OVERRIDE;
|
||||
|
||||
virtual Valignment GetVAlign() const { return vAlign_Top; }
|
||||
virtual Halignment GetHAlign() const { return hAlign_Left; }
|
||||
virtual Valignment GetVAlign() const MOZ_OVERRIDE { return vAlign_Top; }
|
||||
virtual Halignment GetHAlign() const MOZ_OVERRIDE { return hAlign_Left; }
|
||||
|
||||
NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild);
|
||||
NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG_LAYOUT
|
||||
NS_IMETHOD GetDebugBoxAt(const nsPoint& aPoint, nsIFrame** aBox);
|
||||
NS_IMETHOD GetDebug(bool& aDebug);
|
||||
NS_IMETHOD SetDebug(nsBoxLayoutState& aState, bool aDebug);
|
||||
NS_IMETHOD GetDebug(bool& aDebug) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetDebug(nsBoxLayoutState& aState, bool aDebug) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD DumpBox(FILE* out);
|
||||
NS_IMETHOD DumpBox(FILE* out) MOZ_OVERRIDE;
|
||||
NS_HIDDEN_(void) PropagateDebug(nsBoxLayoutState& aState);
|
||||
#endif
|
||||
|
||||
|
||||
@ -59,23 +59,23 @@ public:
|
||||
// gets the rect inside our border and debug border. If you wish to paint inside a box
|
||||
// call this method to get the rect so you don't draw on the debug border or outer border.
|
||||
|
||||
virtual void SetLayoutManager(nsBoxLayout* aLayout) { mLayoutManager = aLayout; }
|
||||
virtual nsBoxLayout* GetLayoutManager() { return mLayoutManager; }
|
||||
virtual void SetLayoutManager(nsBoxLayout* aLayout) MOZ_OVERRIDE { mLayoutManager = aLayout; }
|
||||
virtual nsBoxLayout* GetLayoutManager() MOZ_OVERRIDE { return mLayoutManager; }
|
||||
|
||||
NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild);
|
||||
NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetFlex(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
#ifdef DEBUG_LAYOUT
|
||||
NS_IMETHOD SetDebug(nsBoxLayoutState& aBoxLayoutState, bool aDebug);
|
||||
NS_IMETHOD SetDebug(nsBoxLayoutState& aBoxLayoutState, bool aDebug) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetDebug(bool& aDebug) MOZ_OVERRIDE;
|
||||
#endif
|
||||
virtual Valignment GetVAlign() const MOZ_OVERRIDE { return mValign; }
|
||||
virtual Halignment GetHAlign() const MOZ_OVERRIDE { return mHalign; }
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool ComputesOwnOverflowArea() MOZ_OVERRIDE { return false; }
|
||||
|
||||
@ -111,7 +111,7 @@ public:
|
||||
NS_IMETHOD RemoveFrame(ChildListID aListID,
|
||||
nsIFrame* aOldFrame) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame();
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
@ -120,7 +120,7 @@ public:
|
||||
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
// record that children that are ignorable whitespace should be excluded
|
||||
// (When content was loaded via the XUL content sink, it's already
|
||||
@ -145,7 +145,7 @@ public:
|
||||
const nsHTMLReflowState* aReflowState,
|
||||
nsDidReflowStatus aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool HonorPrintBackgroundSettings();
|
||||
virtual bool HonorPrintBackgroundSettings() MOZ_OVERRIDE;
|
||||
|
||||
virtual ~nsBoxFrame();
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ public:
|
||||
virtual ~nsBoxObject();
|
||||
|
||||
// nsPIBoxObject
|
||||
virtual nsresult Init(nsIContent* aContent);
|
||||
virtual nsresult Init(nsIContent* aContent) MOZ_OVERRIDE;
|
||||
virtual void Clear() MOZ_OVERRIDE;
|
||||
virtual void ClearCachedValues() MOZ_OVERRIDE;
|
||||
|
||||
|
||||
@ -44,8 +44,8 @@ public:
|
||||
friend class nsDisplayXULImage;
|
||||
NS_DECL_FRAMEARENA_HELPERS
|
||||
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
|
||||
|
||||
@ -63,7 +63,7 @@ public:
|
||||
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
#ifdef DEBUG
|
||||
@ -140,7 +140,7 @@ public:
|
||||
virtual already_AddRefed<ImageContainer> GetContainer(LayerManager* aManager,
|
||||
nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
|
||||
virtual void ConfigureLayer(ImageLayer* aLayer, const nsIntPoint& aOffset) MOZ_OVERRIDE;
|
||||
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
|
||||
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
|
||||
{
|
||||
*aSnap = true;
|
||||
return nsRect(ToReferenceFrame(), Frame()->GetSize());
|
||||
@ -149,7 +149,7 @@ public:
|
||||
// Doesn't handle HitTest because nsLeafBoxFrame already creates an
|
||||
// event receiver for us
|
||||
virtual void Paint(nsDisplayListBuilder* aBuilder,
|
||||
nsRenderingContext* aCtx);
|
||||
nsRenderingContext* aCtx) MOZ_OVERRIDE;
|
||||
NS_DISPLAY_DECL_NAME("XULImage", TYPE_XUL_IMAGE)
|
||||
};
|
||||
|
||||
|
||||
@ -18,8 +18,8 @@ public:
|
||||
|
||||
friend nsIFrame* NS_NewLeafBoxFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aState);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aState);
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(nsBoxLayoutState& aState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetFlex(nsBoxLayoutState& aState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aState) MOZ_OVERRIDE;
|
||||
|
||||
@ -56,7 +56,7 @@ public:
|
||||
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 PositionChanged(nsScrollbarFrame* aScrollbar, int32_t aOldIndex, int32_t& aNewIndex) MOZ_OVERRIDE;
|
||||
NS_IMETHOD ScrollbarButtonPressed(nsScrollbarFrame* aScrollbar, int32_t aOldIndex, int32_t aNewIndex) MOZ_OVERRIDE;
|
||||
NS_IMETHOD VisibilityChanged(bool aVisible) MOZ_OVERRIDE;
|
||||
|
||||
@ -64,11 +64,11 @@ public:
|
||||
virtual bool ReflowFinished() MOZ_OVERRIDE;
|
||||
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize GetMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
// size calculation
|
||||
int32_t GetRowCount();
|
||||
|
||||
@ -21,7 +21,7 @@ public:
|
||||
// nsBoxLayout
|
||||
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 GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
|
||||
@ -40,9 +40,9 @@ public:
|
||||
NS_IMETHOD SetActive(bool aActiveFlag) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsMenuBar() MOZ_OVERRIDE { return true; }
|
||||
virtual bool IsContextMenu() { return false; }
|
||||
virtual bool IsContextMenu() MOZ_OVERRIDE { return false; }
|
||||
virtual bool IsActive() MOZ_OVERRIDE { return mIsActive; }
|
||||
virtual bool IsMenu() { return false; }
|
||||
virtual bool IsMenu() MOZ_OVERRIDE { return false; }
|
||||
virtual bool IsOpen() MOZ_OVERRIDE { return true; } // menubars are considered always open
|
||||
|
||||
bool IsMenuOpen() { return mCurrentMenu && mCurrentMenu->IsOpen(); }
|
||||
|
||||
@ -99,8 +99,8 @@ public:
|
||||
virtual const nsFrameList& GetChildList(ChildListID aList) const MOZ_OVERRIDE;
|
||||
virtual void GetChildLists(nsTArray<ChildList>* aLists) const MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
// Overridden to prevent events from going to children of the menu.
|
||||
virtual void BuildDisplayListForChildren(nsDisplayListBuilder* aBuilder,
|
||||
@ -126,7 +126,7 @@ public:
|
||||
|
||||
NS_IMETHOD SelectMenu(bool aActivateFlag);
|
||||
|
||||
virtual nsIScrollableFrame* GetScrollTargetFrame();
|
||||
virtual nsIScrollableFrame* GetScrollTargetFrame() MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* NOTE: OpenMenu will open the menu asynchronously.
|
||||
@ -146,7 +146,7 @@ public:
|
||||
// otherwise null will be returned.
|
||||
nsMenuFrame* Enter(nsGUIEvent* aEvent);
|
||||
|
||||
virtual void SetParent(nsIFrame* aParent);
|
||||
virtual void SetParent(nsIFrame* aParent) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsMenuParent *GetMenuParent() { return mMenuParent; }
|
||||
const nsAString& GetRadioGroupName() { return mGroupName; }
|
||||
|
||||
@ -120,7 +120,7 @@ public:
|
||||
nsMenuPopupFrame(nsIPresShell* aShell, nsStyleContext* aContext);
|
||||
|
||||
// nsMenuParent interface
|
||||
virtual nsMenuFrame* GetCurrentMenuItem();
|
||||
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;
|
||||
@ -130,7 +130,7 @@ public:
|
||||
nsPopupState PopupState() { return mPopupState; }
|
||||
void SetPopupState(nsPopupState aPopupState) { mPopupState = aPopupState; }
|
||||
|
||||
NS_IMETHOD SetActive(bool aActiveFlag) { return NS_OK; } // We don't care.
|
||||
NS_IMETHOD SetActive(bool aActiveFlag) MOZ_OVERRIDE { return NS_OK; } // We don't care.
|
||||
virtual bool IsActive() MOZ_OVERRIDE { return false; }
|
||||
virtual bool IsMenuBar() MOZ_OVERRIDE { return false; }
|
||||
|
||||
@ -192,7 +192,7 @@ public:
|
||||
NS_IMETHOD SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsLeaf() const;
|
||||
virtual bool IsLeaf() const MOZ_OVERRIDE;
|
||||
|
||||
// layout, position and display the popup as needed
|
||||
void LayoutPopup(nsBoxLayoutState& aState, nsIFrame* aParentMenu, bool aSizedToPopup);
|
||||
@ -218,7 +218,7 @@ public:
|
||||
nsMenuFrame* Enter(nsGUIEvent* aEvent);
|
||||
|
||||
nsPopupType PopupType() const { return mPopupType; }
|
||||
bool IsMenu() { return mPopupType == ePopupTypeMenu; }
|
||||
bool IsMenu() MOZ_OVERRIDE { return mPopupType == ePopupTypeMenu; }
|
||||
bool IsOpen() MOZ_OVERRIDE { return mPopupState == ePopupOpen || mPopupState == ePopupOpenAndVisible; }
|
||||
|
||||
bool IsDragPopup() { return mIsDragPopup; }
|
||||
@ -342,7 +342,7 @@ protected:
|
||||
nsPopupLevel PopupLevel(bool aIsNoAutoHide) const;
|
||||
|
||||
// redefine to tell the box system not to move the views.
|
||||
virtual void GetLayoutFlags(uint32_t& aFlags);
|
||||
virtual void GetLayoutFlags(uint32_t& aFlags) MOZ_OVERRIDE;
|
||||
|
||||
void InitPositionFromAnchorAlign(const nsAString& aAnchor,
|
||||
const nsAString& aAlign);
|
||||
|
||||
@ -27,7 +27,7 @@ public:
|
||||
|
||||
friend nsIFrame* NS_NewProgressMeterFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
|
||||
@ -26,7 +26,7 @@ public:
|
||||
NS_DECL_QUERYFRAME_TARGET(nsScrollbarFrame)
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const {
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
|
||||
return MakeFrameName(NS_LITERAL_STRING("ScrollbarFrame"), aResult);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -68,12 +68,12 @@ public:
|
||||
friend nsresult NS_NewSprocketLayout(nsIPresShell* aPresShell, nsCOMPtr<nsBoxLayout>& aNewLayout);
|
||||
static void Shutdown();
|
||||
|
||||
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aState);
|
||||
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 nscoord GetAscent(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetAscent(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
nsSprocketLayout();
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ public:
|
||||
|
||||
nsStackLayout();
|
||||
|
||||
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aState);
|
||||
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) MOZ_OVERRIDE;
|
||||
|
||||
@ -33,9 +33,9 @@ public:
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual void IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual void IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsGridRowGroupLayout* CastToRowGroupLayout() { return nullptr; }
|
||||
virtual nsGridRowGroupLayout* CastToRowGroupLayout() MOZ_OVERRIDE { return nullptr; }
|
||||
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 {
|
||||
@ -51,15 +51,15 @@ public:
|
||||
virtual Type GetType() MOZ_OVERRIDE { return eGrid; }
|
||||
virtual void ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
|
||||
nsIFrame* aPrevBox,
|
||||
const nsFrameList::Slice& aNewChildren);
|
||||
const nsFrameList::Slice& aNewChildren) MOZ_OVERRIDE;
|
||||
virtual void ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
|
||||
const nsFrameList::Slice& aNewChildren);
|
||||
const nsFrameList::Slice& aNewChildren) MOZ_OVERRIDE;
|
||||
virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState,
|
||||
nsIFrame* aChildList);
|
||||
nsIFrame* aChildList) MOZ_OVERRIDE;
|
||||
virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState,
|
||||
nsIFrame* aChildList);
|
||||
nsIFrame* aChildList) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIGridPart* AsGridPart() { return this; }
|
||||
virtual nsIGridPart* AsGridPart() MOZ_OVERRIDE { return this; }
|
||||
|
||||
static void AddOffset(nsBoxLayoutState& aState, nsIFrame* aChild, nsSize& aSize);
|
||||
|
||||
|
||||
@ -25,10 +25,10 @@ public:
|
||||
|
||||
friend already_AddRefed<nsBoxLayout> NS_NewGridRowGroupLayout();
|
||||
|
||||
virtual nsGridRowGroupLayout* CastToRowGroupLayout() { return this; }
|
||||
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsGridRowGroupLayout* CastToRowGroupLayout() MOZ_OVERRIDE { return this; }
|
||||
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(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;
|
||||
|
||||
@ -34,20 +34,20 @@ class nsGridRowLayout : public nsSprocketLayout,
|
||||
public:
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
virtual nsGridRowGroupLayout* CastToRowGroupLayout() { return nullptr; }
|
||||
virtual nsGridRowGroupLayout* CastToRowGroupLayout() MOZ_OVERRIDE { return nullptr; }
|
||||
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);
|
||||
const nsFrameList::Slice& aNewChildren) MOZ_OVERRIDE;
|
||||
virtual void ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
|
||||
const nsFrameList::Slice& aNewChildren);
|
||||
virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList);
|
||||
virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList);
|
||||
const nsFrameList::Slice& aNewChildren) MOZ_OVERRIDE;
|
||||
virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList) MOZ_OVERRIDE;
|
||||
virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList) MOZ_OVERRIDE;
|
||||
virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIGridPart* AsGridPart() { return this; }
|
||||
virtual nsIGridPart* AsGridPart() MOZ_OVERRIDE { return this; }
|
||||
|
||||
protected:
|
||||
virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState)=0;
|
||||
|
||||
@ -45,7 +45,7 @@ public:
|
||||
nsBoxLayout* aLayoutManager):
|
||||
nsBoxFrame(aPresShell, aContext, aIsRoot, aLayoutManager) {}
|
||||
|
||||
NS_IMETHOD GetBorderAndPadding(nsMargin& aBorderAndPadding);
|
||||
NS_IMETHOD GetBorderAndPadding(nsMargin& aBorderAndPadding) MOZ_OVERRIDE;
|
||||
|
||||
}; // class nsGridRowLeafFrame
|
||||
|
||||
|
||||
@ -28,10 +28,10 @@ public:
|
||||
|
||||
friend already_AddRefed<nsBoxLayout> NS_NewGridRowLeafLayout();
|
||||
|
||||
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState);
|
||||
virtual nsSize GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMaxSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual void ChildAddedOrRemoved(nsIFrame* aBox, nsBoxLayoutState& aState) MOZ_OVERRIDE;
|
||||
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;
|
||||
|
||||
@ -120,9 +120,9 @@ public:
|
||||
nsresult EndUpdateBatch();
|
||||
nsresult ClearStyleAndImageCaches();
|
||||
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual void SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect& aRect,
|
||||
bool aRemoveOverflowArea = false);
|
||||
bool aRemoveOverflowArea = false) MOZ_OVERRIDE;
|
||||
|
||||
// nsIReflowCallback
|
||||
virtual bool ReflowFinished() MOZ_OVERRIDE;
|
||||
@ -132,7 +132,7 @@ public:
|
||||
virtual bool PseudoMatches(nsCSSSelector* aSelector) MOZ_OVERRIDE;
|
||||
|
||||
// nsIScrollbarMediator
|
||||
NS_IMETHOD PositionChanged(nsScrollbarFrame* aScrollbar, int32_t aOldIndex, int32_t& aNewIndex);
|
||||
NS_IMETHOD PositionChanged(nsScrollbarFrame* aScrollbar, int32_t aOldIndex, int32_t& aNewIndex) MOZ_OVERRIDE;
|
||||
NS_IMETHOD ScrollbarButtonPressed(nsScrollbarFrame* aScrollbar, int32_t aOldIndex, int32_t aNewIndex) MOZ_OVERRIDE;
|
||||
NS_IMETHOD VisibilityChanged(bool aVisible) MOZ_OVERRIDE { Invalidate(); return NS_OK; }
|
||||
|
||||
@ -146,20 +146,20 @@ public:
|
||||
virtual void Init(nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetCursor(const nsPoint& aPoint,
|
||||
nsIFrame::Cursor& aCursor);
|
||||
nsIFrame::Cursor& aCursor) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
|
||||
nsGUIEvent* aEvent,
|
||||
nsEventStatus* aEventStatus);
|
||||
nsEventStatus* aEventStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
friend nsIFrame* NS_NewTreeBodyFrame(nsIPresShell* aPresShell);
|
||||
friend class nsTreeColumn;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user