mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 875367: Annotate ~280 more methods with MOZ_OVERRIDE in /layout. r=dholbert
This commit is contained in:
parent
ea39a53fef
commit
c6d0c9ac5d
@ -2072,7 +2072,7 @@ public:
|
||||
|
||||
NS_DISPLAY_DECL_NAME("BackgroundColor", TYPE_BACKGROUND_COLOR)
|
||||
#ifdef MOZ_DUMP_PAINTING
|
||||
virtual void WriteDebugInfo(FILE *aOutput) {
|
||||
virtual void WriteDebugInfo(FILE *aOutput) MOZ_OVERRIDE {
|
||||
fprintf(aOutput, "(rgba %d,%d,%d,%d)",
|
||||
NS_GET_R(mColor), NS_GET_G(mColor),
|
||||
NS_GET_B(mColor), NS_GET_A(mColor));
|
||||
@ -2407,7 +2407,7 @@ public:
|
||||
}
|
||||
NS_DISPLAY_DECL_NAME("Opacity", TYPE_OPACITY)
|
||||
#ifdef MOZ_DUMP_PAINTING
|
||||
virtual void WriteDebugInfo(FILE *aOutput) {
|
||||
virtual void WriteDebugInfo(FILE *aOutput) MOZ_OVERRIDE {
|
||||
fprintf(aOutput, "(opacity %f)", mFrame->StyleDisplay()->mOpacity);
|
||||
}
|
||||
#endif
|
||||
|
@ -1435,7 +1435,7 @@ protected:
|
||||
public:
|
||||
RunWillPaintObservers(nsRootPresContext* aPresContext) : mPresContext(aPresContext) {}
|
||||
void Revoke() { mPresContext = nullptr; }
|
||||
NS_IMETHOD Run()
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE
|
||||
{
|
||||
if (mPresContext) {
|
||||
mPresContext->FlushWillPaintObservers();
|
||||
|
@ -78,8 +78,8 @@ public:
|
||||
NS_IMETHOD GetSelection(SelectionType aType, nsISelection** aSelection);
|
||||
virtual mozilla::Selection* GetCurrentSelection(SelectionType aType) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetDisplaySelection(int16_t aToggle);
|
||||
NS_IMETHOD GetDisplaySelection(int16_t *aToggle);
|
||||
NS_IMETHOD SetDisplaySelection(int16_t aToggle) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetDisplaySelection(int16_t *aToggle) MOZ_OVERRIDE;
|
||||
NS_IMETHOD ScrollSelectionIntoView(SelectionType aType, SelectionRegion aRegion,
|
||||
int16_t aFlags);
|
||||
NS_IMETHOD RepaintSelection(SelectionType aType);
|
||||
@ -150,7 +150,7 @@ public:
|
||||
virtual NS_HIDDEN_(already_AddRefed<nsIContent>) GetEventTargetContent(nsEvent* aEvent) MOZ_OVERRIDE;
|
||||
|
||||
|
||||
virtual nsresult ReconstructFrames(void);
|
||||
virtual nsresult ReconstructFrames(void) MOZ_OVERRIDE;
|
||||
virtual void Freeze() MOZ_OVERRIDE;
|
||||
virtual void Thaw() MOZ_OVERRIDE;
|
||||
virtual void FireOrClearDelayedEvents(bool aFireEvents) MOZ_OVERRIDE;
|
||||
@ -204,36 +204,36 @@ public:
|
||||
// caret handling
|
||||
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);
|
||||
NS_IMETHOD SetCaretEnabled(bool aInEnable) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetCaretReadOnly(bool aReadOnly) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetCaretEnabled(bool *aOutEnabled) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetCaretVisibilityDuringSelection(bool aVisibility) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetCaretVisible(bool *_retval) MOZ_OVERRIDE;
|
||||
virtual void SetCaret(nsCaret *aNewCaret) MOZ_OVERRIDE;
|
||||
virtual void RestoreCaret() MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD SetSelectionFlags(int16_t aInEnable) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetSelectionFlags(int16_t *aOutEnable);
|
||||
NS_IMETHOD GetSelectionFlags(int16_t *aOutEnable) MOZ_OVERRIDE;
|
||||
|
||||
// nsISelectionController
|
||||
|
||||
NS_IMETHOD CharacterMove(bool aForward, bool aExtend);
|
||||
NS_IMETHOD CharacterExtendForDelete();
|
||||
NS_IMETHOD CharacterExtendForBackspace();
|
||||
NS_IMETHOD WordMove(bool aForward, bool aExtend);
|
||||
NS_IMETHOD WordExtendForDelete(bool aForward);
|
||||
NS_IMETHOD LineMove(bool aForward, bool aExtend);
|
||||
NS_IMETHOD IntraLineMove(bool aForward, bool aExtend);
|
||||
NS_IMETHOD PageMove(bool aForward, bool aExtend);
|
||||
NS_IMETHOD ScrollPage(bool aForward);
|
||||
NS_IMETHOD ScrollLine(bool aForward);
|
||||
NS_IMETHOD ScrollCharacter(bool aRight);
|
||||
NS_IMETHOD CompleteScroll(bool aForward);
|
||||
NS_IMETHOD CompleteMove(bool aForward, bool aExtend);
|
||||
NS_IMETHOD SelectAll();
|
||||
NS_IMETHOD CheckVisibility(nsIDOMNode *node, int16_t startOffset, int16_t EndOffset, bool *_retval);
|
||||
NS_IMETHOD CharacterMove(bool aForward, bool aExtend) MOZ_OVERRIDE;
|
||||
NS_IMETHOD CharacterExtendForDelete() MOZ_OVERRIDE;
|
||||
NS_IMETHOD CharacterExtendForBackspace() MOZ_OVERRIDE;
|
||||
NS_IMETHOD WordMove(bool aForward, bool aExtend) MOZ_OVERRIDE;
|
||||
NS_IMETHOD WordExtendForDelete(bool aForward) MOZ_OVERRIDE;
|
||||
NS_IMETHOD LineMove(bool aForward, bool aExtend) MOZ_OVERRIDE;
|
||||
NS_IMETHOD IntraLineMove(bool aForward, bool aExtend) MOZ_OVERRIDE;
|
||||
NS_IMETHOD PageMove(bool aForward, bool aExtend) MOZ_OVERRIDE;
|
||||
NS_IMETHOD ScrollPage(bool aForward) MOZ_OVERRIDE;
|
||||
NS_IMETHOD ScrollLine(bool aForward) MOZ_OVERRIDE;
|
||||
NS_IMETHOD ScrollCharacter(bool aRight) MOZ_OVERRIDE;
|
||||
NS_IMETHOD CompleteScroll(bool aForward) MOZ_OVERRIDE;
|
||||
NS_IMETHOD CompleteMove(bool aForward, bool aExtend) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SelectAll() MOZ_OVERRIDE;
|
||||
NS_IMETHOD CheckVisibility(nsIDOMNode *node, int16_t startOffset, int16_t EndOffset, bool *_retval) MOZ_OVERRIDE;
|
||||
virtual nsresult CheckVisibilityContent(nsIContent* aNode, int16_t aStartOffset,
|
||||
int16_t aEndOffset, bool* aRetval);
|
||||
int16_t aEndOffset, bool* aRetval) MOZ_OVERRIDE;
|
||||
|
||||
// nsIDocumentObserver
|
||||
NS_DECL_NSIDOCUMENTOBSERVER_BEGINUPDATE
|
||||
@ -260,7 +260,7 @@ public:
|
||||
NS_DECL_NSIOBSERVER
|
||||
|
||||
#ifdef MOZ_REFLOW_PERF
|
||||
virtual NS_HIDDEN_(void) DumpReflows();
|
||||
virtual NS_HIDDEN_(void) DumpReflows() MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) CountReflows(const char * aName, nsIFrame * aFrame) MOZ_OVERRIDE;
|
||||
virtual NS_HIDDEN_(void) PaintCount(const char * aName,
|
||||
nsRenderingContext* aRenderingContext,
|
||||
|
@ -167,30 +167,30 @@ public:
|
||||
* Hide the dropdown menu and stop capturing mouse events.
|
||||
* @note This method might destroy |this|.
|
||||
*/
|
||||
virtual bool Rollup(uint32_t aCount, nsIContent** aLastRolledUp);
|
||||
virtual void NotifyGeometryChange();
|
||||
virtual bool Rollup(uint32_t aCount, nsIContent** aLastRolledUp) MOZ_OVERRIDE;
|
||||
virtual void NotifyGeometryChange() MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* A combobox should roll up if a mousewheel event happens outside of
|
||||
* the popup area.
|
||||
*/
|
||||
virtual bool ShouldRollupOnMouseWheelEvent()
|
||||
virtual bool ShouldRollupOnMouseWheelEvent() MOZ_OVERRIDE
|
||||
{ return true; }
|
||||
|
||||
virtual bool ShouldConsumeOnMouseWheelEvent()
|
||||
virtual bool ShouldConsumeOnMouseWheelEvent() MOZ_OVERRIDE
|
||||
{ return false; }
|
||||
|
||||
/**
|
||||
* A combobox should not roll up if activated by a mouse activate message
|
||||
* (eg. X-mouse).
|
||||
*/
|
||||
virtual bool ShouldRollupOnMouseActivate()
|
||||
virtual bool ShouldRollupOnMouseActivate() MOZ_OVERRIDE
|
||||
{ return false; }
|
||||
|
||||
virtual uint32_t GetSubmenuWidgetChain(nsTArray<nsIWidget*> *aWidgetChain)
|
||||
virtual uint32_t GetSubmenuWidgetChain(nsTArray<nsIWidget*> *aWidgetChain) MOZ_OVERRIDE
|
||||
{ return 0; }
|
||||
|
||||
virtual nsIWidget* GetRollupWidget();
|
||||
virtual nsIWidget* GetRollupWidget() MOZ_OVERRIDE;
|
||||
|
||||
//nsIStatefulFrame
|
||||
NS_IMETHOD SaveState(nsPresState** aState) MOZ_OVERRIDE;
|
||||
|
@ -96,7 +96,7 @@ protected:
|
||||
: mFrame(aFrame)
|
||||
{}
|
||||
|
||||
NS_IMETHOD Run() {
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE {
|
||||
nsFileControlFrame* frame = static_cast<nsFileControlFrame*>(mFrame.GetFrame());
|
||||
NS_ENSURE_STATE(frame);
|
||||
|
||||
|
@ -243,7 +243,7 @@ protected:
|
||||
EditorInitializer(nsTextControlFrame* aFrame) :
|
||||
mFrame(aFrame) {}
|
||||
|
||||
NS_IMETHOD Run();
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE;
|
||||
|
||||
// avoids use of nsWeakFrame
|
||||
void Revoke() {
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef ScrollbarActivity_h___
|
||||
#define ScrollbarActivity_h___
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIDOMEventListener.h"
|
||||
#include "mozilla/TimeStamp.h"
|
||||
@ -78,7 +79,7 @@ public:
|
||||
void ActivityStarted();
|
||||
void ActivityStopped();
|
||||
|
||||
virtual void WillRefresh(TimeStamp aTime);
|
||||
virtual void WillRefresh(TimeStamp aTime) MOZ_OVERRIDE;
|
||||
|
||||
static void FadeBeginTimerFired(nsITimer* aTimer, void* aSelf) {
|
||||
reinterpret_cast<ScrollbarActivity*>(aSelf)->BeginFade();
|
||||
|
@ -169,7 +169,7 @@ public:
|
||||
NS_IMETHOD GetContentForEvent(nsEvent* aEvent,
|
||||
nsIContent** aContent) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetCursor(const nsPoint& aPoint,
|
||||
nsIFrame::Cursor& aCursor);
|
||||
nsIFrame::Cursor& aCursor) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetPointFromOffset(int32_t inOffset,
|
||||
nsPoint* outPoint) MOZ_OVERRIDE;
|
||||
|
@ -53,9 +53,9 @@ public:
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const 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
|
||||
{
|
||||
if (aFlags & eSupportsCSSTransforms) {
|
||||
return false;
|
||||
@ -64,8 +64,8 @@ public:
|
||||
~(nsIFrame::eBidiInlineContainer | nsIFrame::eLineParticipant));
|
||||
}
|
||||
|
||||
virtual void InvalidateFrame(uint32_t aDisplayItemKey = 0);
|
||||
virtual void InvalidateFrameWithRect(const nsRect& aRect, uint32_t aDisplayItemKey = 0);
|
||||
virtual void InvalidateFrame(uint32_t aDisplayItemKey = 0) MOZ_OVERRIDE;
|
||||
virtual void InvalidateFrameWithRect(const nsRect& aRect, uint32_t aDisplayItemKey = 0) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsEmpty() MOZ_OVERRIDE;
|
||||
virtual bool IsSelfEmpty() MOZ_OVERRIDE;
|
||||
@ -82,7 +82,7 @@ public:
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
nsSize aMargin, nsSize aBorder, nsSize aPadding,
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
virtual nsRect ComputeTightBounds(gfxContext* aContext) const;
|
||||
virtual nsRect ComputeTightBounds(gfxContext* aContext) const MOZ_OVERRIDE;
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
@ -90,7 +90,7 @@ public:
|
||||
|
||||
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
|
||||
|
||||
virtual void PullOverflowsFromPrevInFlow();
|
||||
virtual void PullOverflowsFromPrevInFlow() MOZ_OVERRIDE;
|
||||
virtual nscoord GetBaseline() const MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
|
@ -93,7 +93,7 @@ public:
|
||||
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
|
||||
NS_METHOD GetPluginInstance(nsNPAPIPluginInstance** aPluginInstance);
|
||||
NS_METHOD GetPluginInstance(nsNPAPIPluginInstance** aPluginInstance) MOZ_OVERRIDE;
|
||||
|
||||
virtual void SetIsDocumentActive(bool aIsActive) MOZ_OVERRIDE;
|
||||
|
||||
@ -258,7 +258,7 @@ private:
|
||||
PluginEventNotifier(const nsString &aEventType) :
|
||||
mEventType(aEventType) {}
|
||||
|
||||
NS_IMETHOD Run();
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE;
|
||||
private:
|
||||
nsString mEventType;
|
||||
};
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef nsTextFrame_h__
|
||||
#define nsTextFrame_h__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsFrame.h"
|
||||
#include "nsSplittableFrame.h"
|
||||
#include "nsLineBox.h"
|
||||
@ -59,19 +60,19 @@ public:
|
||||
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 CharacterDataChanged(CharacterDataChangeInfo* aInfo);
|
||||
NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE;
|
||||
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetNextContinuation() const {
|
||||
virtual nsIFrame* GetNextContinuation() const MOZ_OVERRIDE {
|
||||
return mNextContinuation;
|
||||
}
|
||||
NS_IMETHOD SetNextContinuation(nsIFrame* aNextContinuation) {
|
||||
NS_IMETHOD SetNextContinuation(nsIFrame* aNextContinuation) MOZ_OVERRIDE {
|
||||
NS_ASSERTION (!aNextContinuation || GetType() == aNextContinuation->GetType(),
|
||||
"setting a next continuation with incorrect type!");
|
||||
NS_ASSERTION (!nsSplittableFrame::IsInNextContinuationChain(aNextContinuation, this),
|
||||
@ -81,12 +82,12 @@ public:
|
||||
aNextContinuation->RemoveStateBits(NS_FRAME_IS_FLUID_CONTINUATION);
|
||||
return NS_OK;
|
||||
}
|
||||
virtual nsIFrame* GetNextInFlowVirtual() const { return GetNextInFlow(); }
|
||||
virtual nsIFrame* GetNextInFlowVirtual() const MOZ_OVERRIDE { return GetNextInFlow(); }
|
||||
nsIFrame* GetNextInFlow() const {
|
||||
return mNextContinuation && (mNextContinuation->GetStateBits() & NS_FRAME_IS_FLUID_CONTINUATION) ?
|
||||
mNextContinuation : nullptr;
|
||||
}
|
||||
NS_IMETHOD SetNextInFlow(nsIFrame* aNextInFlow) {
|
||||
NS_IMETHOD SetNextInFlow(nsIFrame* aNextInFlow) MOZ_OVERRIDE {
|
||||
NS_ASSERTION (!aNextInFlow || GetType() == aNextInFlow->GetType(),
|
||||
"setting a next in flow with incorrect type!");
|
||||
NS_ASSERTION (!nsSplittableFrame::IsInNextContinuationChain(aNextInFlow, this),
|
||||
@ -96,10 +97,10 @@ public:
|
||||
aNextInFlow->AddStateBits(NS_FRAME_IS_FLUID_CONTINUATION);
|
||||
return NS_OK;
|
||||
}
|
||||
virtual nsIFrame* GetLastInFlow() const;
|
||||
virtual nsIFrame* GetLastContinuation() const;
|
||||
virtual nsIFrame* GetLastInFlow() const MOZ_OVERRIDE;
|
||||
virtual nsIFrame* GetLastContinuation() const MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSplittableType GetSplittableType() const {
|
||||
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE {
|
||||
return NS_FRAME_SPLITTABLE;
|
||||
}
|
||||
|
||||
@ -108,9 +109,9 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::textFrame
|
||||
*/
|
||||
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
|
||||
{
|
||||
// Set the frame state bit for text frames to mark them as replaced.
|
||||
// XXX kipp: temporary
|
||||
@ -118,16 +119,16 @@ public:
|
||||
nsIFrame::eLineParticipant));
|
||||
}
|
||||
|
||||
virtual void InvalidateFrame(uint32_t aDisplayItemKey = 0);
|
||||
virtual void InvalidateFrameWithRect(const nsRect& aRect, uint32_t aDisplayItemKey = 0);
|
||||
virtual void InvalidateFrame(uint32_t aDisplayItemKey = 0) MOZ_OVERRIDE;
|
||||
virtual void InvalidateFrameWithRect(const nsRect& aRect, uint32_t aDisplayItemKey = 0) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
void List(FILE* out, int32_t aIndent, uint32_t aFlags = 0) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
NS_IMETHOD_(nsFrameState) GetDebugStateBits() const ;
|
||||
void List(FILE* out, int32_t aIndent, uint32_t aFlags = 0) const MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsFrameState) GetDebugStateBits() const MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
virtual ContentOffsets CalcContentOffsetsFromFramePoint(nsPoint aPoint);
|
||||
virtual ContentOffsets CalcContentOffsetsFromFramePoint(nsPoint aPoint) MOZ_OVERRIDE;
|
||||
ContentOffsets GetCharacterOffsetAtFramePoint(const nsPoint &aPoint);
|
||||
|
||||
/**
|
||||
@ -142,13 +143,13 @@ public:
|
||||
void SetSelectedRange(uint32_t aStart, uint32_t aEnd, bool aSelected,
|
||||
SelectionType aType);
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
// Flags for aSetLengthFlags
|
||||
enum { ALLOW_FRAME_CREATION_AND_DESTRUCTION = 0x01 };
|
||||
@ -157,29 +158,29 @@ public:
|
||||
void SetLength(int32_t aLength, nsLineLayout* aLineLayout,
|
||||
uint32_t aSetLengthFlags = 0);
|
||||
|
||||
NS_IMETHOD GetOffsets(int32_t &start, int32_t &end)const;
|
||||
NS_IMETHOD GetOffsets(int32_t &start, int32_t &end)const MOZ_OVERRIDE;
|
||||
|
||||
virtual void AdjustOffsetsForBidi(int32_t start, int32_t end);
|
||||
virtual void AdjustOffsetsForBidi(int32_t start, int32_t end) MOZ_OVERRIDE;
|
||||
|
||||
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;
|
||||
|
||||
virtual bool IsVisibleInSelection(nsISelection* aSelection);
|
||||
virtual bool IsVisibleInSelection(nsISelection* aSelection) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsEmpty();
|
||||
virtual bool IsSelfEmpty() { return IsEmpty(); }
|
||||
virtual bool IsEmpty() MOZ_OVERRIDE;
|
||||
virtual bool IsSelfEmpty() MOZ_OVERRIDE { return IsEmpty(); }
|
||||
virtual nscoord GetBaseline() const MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* @return true if this text frame ends with a newline character. It
|
||||
* should return false if this is not a text frame.
|
||||
*/
|
||||
virtual bool HasTerminalNewline() const;
|
||||
virtual bool HasTerminalNewline() const MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Returns true if this text frame is logically adjacent to the end of the
|
||||
@ -206,23 +207,23 @@ public:
|
||||
}
|
||||
void SetFontSizeInflation(float aInflation);
|
||||
|
||||
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 nsSize ComputeSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
nsSize aMargin, nsSize aBorder, nsSize aPadding,
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
virtual nsRect ComputeTightBounds(gfxContext* aContext) const;
|
||||
virtual nsRect ComputeTightBounds(gfxContext* aContext) const MOZ_OVERRIDE;
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aMetrics,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
virtual bool CanContinueTextRun() const;
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
|
||||
// Method that is called for a text frame that is logically
|
||||
// adjacent to the end of the line (i.e. followed only by empty text frames,
|
||||
// placeholders or inlines containing such).
|
||||
@ -242,7 +243,7 @@ public:
|
||||
gfxSkipChars* aSkipChars = nullptr,
|
||||
gfxSkipCharsIterator* aSkipIter = nullptr,
|
||||
uint32_t aSkippedStartOffset = 0,
|
||||
uint32_t aSkippedMaxLength = UINT32_MAX);
|
||||
uint32_t aSkippedMaxLength = UINT32_MAX) MOZ_OVERRIDE;
|
||||
|
||||
nsOverflowAreas
|
||||
RecomputeOverflow(const nsHTMLReflowState& aBlockReflowState);
|
||||
@ -420,7 +421,7 @@ public:
|
||||
SelectionType aSelectionType,
|
||||
DrawPathCallbacks* aCallbacks);
|
||||
|
||||
virtual nscolor GetCaretColorAt(int32_t aOffset);
|
||||
virtual nscolor GetCaretColorAt(int32_t aOffset) MOZ_OVERRIDE;
|
||||
|
||||
int16_t GetSelectionStatus(int16_t* aSelectionFlags);
|
||||
|
||||
@ -542,7 +543,7 @@ protected:
|
||||
* Return true if the frame is part of a Selection.
|
||||
* Helper method to implement the public IsSelected() API.
|
||||
*/
|
||||
virtual bool IsFrameSelected() const;
|
||||
virtual bool IsFrameSelected() const MOZ_OVERRIDE;
|
||||
|
||||
// The caller of this method must call DestroySelectionDetails() on the
|
||||
// return value, if that return value is not null. Calling
|
||||
@ -696,7 +697,7 @@ protected:
|
||||
|
||||
void ClearFrameOffsetCache();
|
||||
|
||||
virtual bool HasAnyNoncollapsedCharacters();
|
||||
virtual bool HasAnyNoncollapsedCharacters() MOZ_OVERRIDE;
|
||||
|
||||
void ClearMetrics(nsHTMLReflowMetrics& aMetrics);
|
||||
};
|
||||
|
@ -475,7 +475,7 @@ public:
|
||||
|
||||
NS_IMETHOD
|
||||
SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList)
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE
|
||||
{
|
||||
NS_ASSERTION(aListID == kPrincipalList, "unexpected frame list");
|
||||
nsresult rv = nsInlineFrame::SetInitialChildList(aListID, aChildList);
|
||||
|
@ -28,15 +28,15 @@ public:
|
||||
|
||||
NS_IMETHOD
|
||||
SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList);
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult
|
||||
ChildListChanged(int32_t aModType);
|
||||
ChildListChanged(int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD
|
||||
AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
private:
|
||||
void MouseClick();
|
||||
@ -66,7 +66,7 @@ private:
|
||||
|
||||
// helper to return the frame for the attribute selection="number"
|
||||
nsIFrame*
|
||||
GetSelectedFrame();
|
||||
GetSelectedFrame() MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif /* nsMathMLmactionFrame_h___ */
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef nsMathMLsemanticsFrame_h___
|
||||
#define nsMathMLsemanticsFrame_h___
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsMathMLSelectedFrame.h"
|
||||
|
||||
//
|
||||
@ -24,7 +25,7 @@ protected:
|
||||
nsMathMLSelectedFrame(aContext) {}
|
||||
virtual ~nsMathMLsemanticsFrame();
|
||||
|
||||
nsIFrame* GetSelectedFrame();
|
||||
nsIFrame* GetSelectedFrame() MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif /* nsMathMLsemanticsFrame_h___ */
|
||||
|
@ -44,7 +44,7 @@ public:
|
||||
|
||||
nsresult Start(nsPrintObject* aPO);
|
||||
|
||||
NS_IMETHOD Run();
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE;
|
||||
|
||||
void Stop();
|
||||
|
||||
|
@ -330,7 +330,7 @@ public:
|
||||
return mFeatureValues;
|
||||
}
|
||||
|
||||
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
|
||||
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
|
||||
|
||||
static bool PrefEnabled()
|
||||
{
|
||||
@ -373,8 +373,8 @@ public:
|
||||
NS_DECL_NSIDOMCSSRULE
|
||||
|
||||
// nsIDOMCSSCharsetRule methods
|
||||
NS_IMETHOD GetEncoding(nsAString& aEncoding);
|
||||
NS_IMETHOD SetEncoding(const nsAString& aEncoding);
|
||||
NS_IMETHOD GetEncoding(nsAString& aEncoding) MOZ_OVERRIDE;
|
||||
NS_IMETHOD SetEncoding(const nsAString& aEncoding) MOZ_OVERRIDE;
|
||||
|
||||
virtual size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
|
||||
|
||||
@ -501,7 +501,7 @@ public:
|
||||
|
||||
// rest of GroupRule
|
||||
virtual bool UseForPresentation(nsPresContext* aPresContext,
|
||||
nsMediaQueryResultCacheKey& aKey);
|
||||
nsMediaQueryResultCacheKey& aKey) MOZ_OVERRIDE;
|
||||
|
||||
const nsString& GetName() { return mName; }
|
||||
|
||||
|
@ -29,13 +29,13 @@ class nsDOMCSSDeclaration : public nsICSSDeclaration
|
||||
public:
|
||||
// Only implement QueryInterface; subclasses have the responsibility
|
||||
// of implementing AddRef/Release.
|
||||
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
|
||||
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) MOZ_OVERRIDE;
|
||||
|
||||
// Declare addref and release so they can be called on us, but don't
|
||||
// implement them. Our subclasses must handle their own
|
||||
// refcounting.
|
||||
NS_IMETHOD_(nsrefcnt) AddRef() = 0;
|
||||
NS_IMETHOD_(nsrefcnt) Release() = 0;
|
||||
NS_IMETHOD_(nsrefcnt) AddRef() MOZ_OVERRIDE = 0;
|
||||
NS_IMETHOD_(nsrefcnt) Release() MOZ_OVERRIDE = 0;
|
||||
|
||||
NS_DECL_NSICSSDECLARATION
|
||||
using nsICSSDeclaration::GetLength;
|
||||
|
@ -19,6 +19,7 @@
|
||||
* consumers should continue to use nsIDOMCSSStyleDeclaration.
|
||||
*/
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsIDOMCSSStyleDeclaration.h"
|
||||
#include "nsCSSProperty.h"
|
||||
#include "CSSValue.h"
|
||||
@ -61,14 +62,14 @@ public:
|
||||
|
||||
// Also have to declare all the nsIDOMCSSStyleDeclaration methods,
|
||||
// since we want to be able to call them from the WebIDL versions.
|
||||
NS_IMETHOD GetCssText(nsAString& aCssText) = 0;
|
||||
NS_IMETHOD SetCssText(const nsAString& aCssText) = 0;
|
||||
NS_IMETHOD GetCssText(nsAString& aCssText) MOZ_OVERRIDE = 0;
|
||||
NS_IMETHOD SetCssText(const nsAString& aCssText) MOZ_OVERRIDE = 0;
|
||||
NS_IMETHOD GetPropertyValue(const nsAString& aPropName,
|
||||
nsAString& aValue) = 0;
|
||||
nsAString& aValue) MOZ_OVERRIDE = 0;
|
||||
virtual already_AddRefed<mozilla::dom::CSSValue>
|
||||
GetPropertyCSSValue(const nsAString& aPropertyName,
|
||||
mozilla::ErrorResult& aRv) = 0;
|
||||
NS_IMETHOD GetPropertyCSSValue(const nsAString& aProp, nsIDOMCSSValue** aVal)
|
||||
NS_IMETHOD GetPropertyCSSValue(const nsAString& aProp, nsIDOMCSSValue** aVal) MOZ_OVERRIDE
|
||||
{
|
||||
mozilla::ErrorResult error;
|
||||
nsRefPtr<mozilla::dom::CSSValue> val = GetPropertyCSSValue(aProp, error);
|
||||
@ -81,14 +82,14 @@ public:
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD RemoveProperty(const nsAString& aPropertyName,
|
||||
nsAString& aReturn) = 0;
|
||||
nsAString& aReturn) MOZ_OVERRIDE = 0;
|
||||
NS_IMETHOD GetPropertyPriority(const nsAString& aPropertyName,
|
||||
nsAString& aReturn) = 0;
|
||||
nsAString& aReturn) MOZ_OVERRIDE = 0;
|
||||
NS_IMETHOD SetProperty(const nsAString& aPropertyName,
|
||||
const nsAString& aValue,
|
||||
const nsAString& aPriority) = 0;
|
||||
NS_IMETHOD GetLength(uint32_t* aLength) = 0;
|
||||
NS_IMETHOD Item(uint32_t aIndex, nsAString& aReturn)
|
||||
const nsAString& aPriority) MOZ_OVERRIDE = 0;
|
||||
NS_IMETHOD GetLength(uint32_t* aLength) MOZ_OVERRIDE = 0;
|
||||
NS_IMETHOD Item(uint32_t aIndex, nsAString& aReturn) MOZ_OVERRIDE
|
||||
{
|
||||
bool found;
|
||||
IndexedGetter(aIndex, found, aReturn);
|
||||
@ -97,7 +98,7 @@ public:
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD GetParentRule(nsIDOMCSSRule * *aParentRule) = 0;
|
||||
NS_IMETHOD GetParentRule(nsIDOMCSSRule * *aParentRule) MOZ_OVERRIDE = 0;
|
||||
|
||||
// WebIDL interface for CSSStyleDeclaration
|
||||
void SetCssText(const nsAString& aString, mozilla::ErrorResult& rv) {
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGCLIPPATHFRAME_H__
|
||||
#define __NS_SVGCLIPPATHFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsSVGContainerFrame.h"
|
||||
#include "nsSVGUtils.h"
|
||||
@ -54,7 +55,7 @@ public:
|
||||
// nsIFrame interface:
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual void Init(nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
@ -65,10 +66,10 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgClipPathFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGClipPath"), aResult);
|
||||
}
|
||||
@ -100,7 +101,7 @@ public:
|
||||
bool mInUse;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -124,7 +124,7 @@ protected:
|
||||
public:
|
||||
SourceReference(nsSVGIDRenderingObserver* aContainer) : mContainer(aContainer) {}
|
||||
protected:
|
||||
virtual void ElementChanged(Element* aFrom, Element* aTo) {
|
||||
virtual void ElementChanged(Element* aFrom, Element* aTo) MOZ_OVERRIDE {
|
||||
mContainer->StopListening();
|
||||
nsReferencedElement::ElementChanged(aFrom, aTo);
|
||||
mContainer->StartListening();
|
||||
@ -134,7 +134,7 @@ protected:
|
||||
* Override IsPersistent because we want to keep tracking the element
|
||||
* for the ID even when it changes.
|
||||
*/
|
||||
virtual bool IsPersistent() { return true; }
|
||||
virtual bool IsPersistent() MOZ_OVERRIDE { return true; }
|
||||
private:
|
||||
nsSVGIDRenderingObserver* mContainer;
|
||||
};
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGFILTERFRAME_H__
|
||||
#define __NS_SVGFILTERFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsFrame.h"
|
||||
#include "nsQueryFrame.h"
|
||||
#include "nsRect.h"
|
||||
@ -53,7 +54,7 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Paint the given filtered frame.
|
||||
@ -107,7 +108,7 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgFilterFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
private:
|
||||
// Parse our xlink:href and set up our nsSVGPaintingProperty if we
|
||||
|
@ -34,19 +34,19 @@ 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 AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame() {
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
|
||||
return GetFirstPrincipalChild()->GetContentInsertionFrame();
|
||||
}
|
||||
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
@ -57,19 +57,19 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgForeignObjectFrame
|
||||
*/
|
||||
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 nsSVGForeignObjectFrameBase::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eSVG | nsIFrame::eSVGForeignObject));
|
||||
}
|
||||
|
||||
virtual bool IsSVGTransformed(gfxMatrix *aOwnTransform,
|
||||
gfxMatrix *aFromParentTransform) const;
|
||||
gfxMatrix *aFromParentTransform) const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGForeignObject"), aResult);
|
||||
}
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef NSSVGGFRAME_H
|
||||
#define NSSVGGFRAME_H
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsSVGContainerFrame.h"
|
||||
|
||||
@ -33,10 +34,10 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgGFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGG"), aResult);
|
||||
}
|
||||
@ -45,13 +46,13 @@ public:
|
||||
// nsIFrame interface:
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
// nsISVGChildFrame interface:
|
||||
virtual void NotifySVGChanged(uint32_t aFlags);
|
||||
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
nsAutoPtr<gfxMatrix> mCanvasTM;
|
||||
};
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGGENERICCONTAINERFRAME_H__
|
||||
#define __NS_SVGGENERICCONTAINERFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsFrame.h"
|
||||
#include "nsLiteralString.h"
|
||||
@ -32,23 +33,23 @@ public:
|
||||
// nsIFrame:
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::svgGenericContainerFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGGenericContainer"), aResult);
|
||||
}
|
||||
#endif
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif // __NS_SVGGENERICCONTAINERFRAME_H__
|
||||
|
@ -7,6 +7,7 @@
|
||||
#ifndef __NS_SVGGEOMETRYFRAME_H__
|
||||
#define __NS_SVGGEOMETRYFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "gfxTypes.h"
|
||||
#include "nsFrame.h"
|
||||
@ -46,7 +47,7 @@ public:
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsSVGGeometryFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG | nsIFrame::eSVGGeometry));
|
||||
}
|
||||
|
@ -35,15 +35,15 @@ class SVGIRect;
|
||||
// Slightly horrible callback for deferring application of opacity
|
||||
struct SVGTextObjectPaint : public gfxTextObjectPaint {
|
||||
already_AddRefed<gfxPattern> GetFillPattern(float aOpacity,
|
||||
const gfxMatrix& aCTM);
|
||||
const gfxMatrix& aCTM) MOZ_OVERRIDE;
|
||||
already_AddRefed<gfxPattern> GetStrokePattern(float aOpacity,
|
||||
const gfxMatrix& aCTM);
|
||||
const gfxMatrix& aCTM) MOZ_OVERRIDE;
|
||||
|
||||
void SetFillOpacity(float aOpacity) { mFillOpacity = aOpacity; }
|
||||
float GetFillOpacity() { return mFillOpacity; }
|
||||
float GetFillOpacity() MOZ_OVERRIDE { return mFillOpacity; }
|
||||
|
||||
void SetStrokeOpacity(float aOpacity) { mStrokeOpacity = aOpacity; }
|
||||
float GetStrokeOpacity() { return mStrokeOpacity; }
|
||||
float GetStrokeOpacity() MOZ_OVERRIDE { return mStrokeOpacity; }
|
||||
|
||||
struct Paint {
|
||||
Paint() {
|
||||
@ -192,9 +192,9 @@ public:
|
||||
bool IsAllWhitespace() const;
|
||||
|
||||
// nsIFrame interface:
|
||||
NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo);
|
||||
NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE;
|
||||
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
|
||||
|
||||
virtual void Init(nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
@ -205,9 +205,9 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgGlyphFrame
|
||||
*/
|
||||
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
|
||||
{
|
||||
// Set the frame state bit for text frames to mark them as replaced.
|
||||
// XXX kipp: temporary
|
||||
@ -216,7 +216,7 @@ public:
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGGlyph"), aResult);
|
||||
}
|
||||
@ -240,7 +240,7 @@ public:
|
||||
NS_IMETHOD_(bool) IsDisplayContainer() MOZ_OVERRIDE { return false; }
|
||||
|
||||
// nsSVGGeometryFrame methods
|
||||
gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
// nsISVGGlyphFragmentNode interface:
|
||||
// These do not use the global transform if NS_STATE_NONDISPLAY_CHILD
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGGRADIENTFRAME_H__
|
||||
#define __NS_SVGGRADIENTFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsFrame.h"
|
||||
@ -50,15 +51,15 @@ public:
|
||||
const gfxMatrix& aContextMatrix,
|
||||
nsStyleSVGPaint nsStyleSVG::*aFillOrStroke,
|
||||
float aGraphicOpacity,
|
||||
const gfxRect *aOverrideBounds);
|
||||
const gfxRect *aOverrideBounds) MOZ_OVERRIDE;
|
||||
|
||||
// nsIFrame interface:
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGGradient"), aResult);
|
||||
}
|
||||
@ -142,14 +143,14 @@ public:
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
virtual nsIAtom* GetType() const; // frame type: nsGkAtoms::svgLinearGradientFrame
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE; // frame type: nsGkAtoms::svgLinearGradientFrame
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGLinearGradient"), aResult);
|
||||
}
|
||||
@ -158,9 +159,9 @@ public:
|
||||
protected:
|
||||
float GetLengthValue(uint32_t aIndex);
|
||||
virtual mozilla::dom::SVGLinearGradientElement* GetLinearGradientWithLength(
|
||||
uint32_t aIndex, mozilla::dom::SVGLinearGradientElement* aDefault);
|
||||
virtual bool GradientVectorLengthIsZero();
|
||||
virtual already_AddRefed<gfxPattern> CreateGradient();
|
||||
uint32_t aIndex, mozilla::dom::SVGLinearGradientElement* aDefault) MOZ_OVERRIDE;
|
||||
virtual bool GradientVectorLengthIsZero() MOZ_OVERRIDE;
|
||||
virtual already_AddRefed<gfxPattern> CreateGradient() MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
@ -187,14 +188,14 @@ public:
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
virtual nsIAtom* GetType() const; // frame type: nsGkAtoms::svgRadialGradientFrame
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE; // frame type: nsGkAtoms::svgRadialGradientFrame
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGRadialGradient"), aResult);
|
||||
}
|
||||
@ -206,9 +207,9 @@ protected:
|
||||
float GetLengthValueFromElement(uint32_t aIndex,
|
||||
mozilla::dom::SVGRadialGradientElement& aElement);
|
||||
virtual mozilla::dom::SVGRadialGradientElement* GetRadialGradientWithLength(
|
||||
uint32_t aIndex, mozilla::dom::SVGRadialGradientElement* aDefault);
|
||||
virtual bool GradientVectorLengthIsZero();
|
||||
virtual already_AddRefed<gfxPattern> CreateGradient();
|
||||
uint32_t aIndex, mozilla::dom::SVGRadialGradientElement* aDefault) MOZ_OVERRIDE;
|
||||
virtual bool GradientVectorLengthIsZero() MOZ_OVERRIDE;
|
||||
virtual already_AddRefed<gfxPattern> CreateGradient() MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif // __NS_SVGGRADIENTFRAME_H__
|
||||
|
@ -37,10 +37,10 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgInnerSVGFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGInnerSVG"), aResult);
|
||||
}
|
||||
@ -48,18 +48,18 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
// nsISVGChildFrame interface:
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext *aContext, const nsIntRect *aDirtyRect);
|
||||
virtual void ReflowSVG();
|
||||
virtual void NotifySVGChanged(uint32_t aFlags);
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint);
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext *aContext, const nsIntRect *aDirtyRect) MOZ_OVERRIDE;
|
||||
virtual void ReflowSVG() MOZ_OVERRIDE;
|
||||
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint &aPoint) MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool HasChildrenOnlyTransform(gfxMatrix *aTransform) const;
|
||||
virtual bool HasChildrenOnlyTransform(gfxMatrix *aTransform) const MOZ_OVERRIDE;
|
||||
|
||||
// nsISVGSVGFrame interface:
|
||||
virtual void NotifyViewportOrTransformChanged(uint32_t aFlags) MOZ_OVERRIDE;
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGMARKERFRAME_H__
|
||||
#define __NS_SVGMARKERFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "gfxRect.h"
|
||||
#include "nsFrame.h"
|
||||
@ -62,16 +63,16 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::svgMarkerFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGMarker"), aResult);
|
||||
}
|
||||
@ -95,7 +96,7 @@ private:
|
||||
float mStrokeWidth, mX, mY, mAutoAngle;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
// A helper class to allow us to paint markers safely. The helper
|
||||
// automatically sets and clears the mInUse flag on the marker frame (to
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGMASKFRAME_H__
|
||||
#define __NS_SVGMASKFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxPattern.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsSVGContainerFrame.h"
|
||||
@ -39,7 +40,7 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
virtual void Init(nsIContent* aContent,
|
||||
@ -56,10 +57,10 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgMaskFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGMask"), aResult);
|
||||
}
|
||||
@ -91,7 +92,7 @@ private:
|
||||
bool mInUse;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -38,11 +38,11 @@ public:
|
||||
#endif
|
||||
|
||||
// nsIFrame:
|
||||
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 ComputeSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
@ -52,11 +52,11 @@ 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;
|
||||
|
||||
virtual bool UpdateOverflow() MOZ_OVERRIDE;
|
||||
|
||||
@ -68,17 +68,17 @@ public:
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSplittableType GetSplittableType() const;
|
||||
virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::svgOuterSVGFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGOuterSVG"), aResult);
|
||||
}
|
||||
@ -86,9 +86,9 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame() {
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE {
|
||||
// Any children must be added to our single anonymous inner frame kid.
|
||||
NS_ABORT_IF_FALSE(GetFirstPrincipalChild() &&
|
||||
GetFirstPrincipalChild()->GetType() ==
|
||||
@ -98,7 +98,7 @@ public:
|
||||
}
|
||||
|
||||
virtual bool IsSVGTransformed(gfxMatrix *aOwnTransform,
|
||||
gfxMatrix *aFromParentTransform) const {
|
||||
gfxMatrix *aFromParentTransform) const MOZ_OVERRIDE {
|
||||
// Our anonymous wrapper performs the transforms. We simply
|
||||
// return whether we are transformed here but don't apply the transforms
|
||||
// themselves.
|
||||
@ -110,13 +110,13 @@ public:
|
||||
|
||||
// nsISVGChildFrame methods:
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext* aContext,
|
||||
const nsIntRect *aDirtyRect);
|
||||
const nsIntRect *aDirtyRect) MOZ_OVERRIDE;
|
||||
|
||||
virtual SVGBBox GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
|
||||
uint32_t aFlags);
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
/* Methods to allow descendant nsSVGForeignObjectFrame frames to register and
|
||||
* unregister themselves with their nearest nsSVGOuterSVGFrame ancestor. This
|
||||
@ -130,7 +130,7 @@ public:
|
||||
void RegisterForeignObject(nsSVGForeignObjectFrame* aFrame);
|
||||
void UnregisterForeignObject(nsSVGForeignObjectFrame* aFrame);
|
||||
|
||||
virtual bool HasChildrenOnlyTransform(gfxMatrix *aTransform) const {
|
||||
virtual bool HasChildrenOnlyTransform(gfxMatrix *aTransform) const MOZ_OVERRIDE {
|
||||
// Our anonymous wrapper child must claim our children-only transforms as
|
||||
// its own so that our real children (the frames it wraps) are transformed
|
||||
// by them, and we must pretend we don't have any children-only transforms
|
||||
@ -247,7 +247,7 @@ public:
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aPrevInFlow) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const {
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGOuterSVGAnonChild"), aResult);
|
||||
}
|
||||
#endif
|
||||
@ -257,17 +257,17 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgOuterSVGAnonChildFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) {
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE {
|
||||
// GetCanvasTM returns the transform from an SVG frame to the frame's
|
||||
// nsSVGOuterSVGFrame's content box, so we do not include any x/y offset
|
||||
// set on us for any CSS border or padding on our nsSVGOuterSVGFrame.
|
||||
return static_cast<nsSVGOuterSVGFrame*>(mParent)->GetCanvasTM(aFor);
|
||||
}
|
||||
|
||||
virtual bool HasChildrenOnlyTransform(gfxMatrix *aTransform) const;
|
||||
virtual bool HasChildrenOnlyTransform(gfxMatrix *aTransform) const MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGPAINTSERVERFRAME_H__
|
||||
#define __NS_SVGPAINTSERVERFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsFrame.h"
|
||||
#include "nsIFrame.h"
|
||||
@ -63,7 +64,7 @@ public:
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE {}
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsSVGPaintServerFrameBase::IsFrameOfType(aFlags & ~nsIFrame::eSVGPaintServer);
|
||||
}
|
||||
|
@ -54,20 +54,20 @@ public:
|
||||
// nsIFrame interface:
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::svgPathGeometryFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsSVGTransformed(gfxMatrix *aOwnTransforms = nullptr,
|
||||
gfxMatrix *aFromParentTransforms = nullptr) const;
|
||||
gfxMatrix *aFromParentTransforms = nullptr) const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGPathGeometry"), aResult);
|
||||
}
|
||||
@ -78,7 +78,7 @@ public:
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGGeometryFrame methods
|
||||
gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
// nsISVGChildFrame interface:
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef __NS_SVGPATTERNFRAME_H__
|
||||
#define __NS_SVGPATTERNFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsSVGPaintServerFrame.h"
|
||||
|
||||
@ -43,18 +44,18 @@ public:
|
||||
const gfxMatrix& aContextMatrix,
|
||||
nsStyleSVGPaint nsStyleSVG::*aFillOrStroke,
|
||||
float aOpacity,
|
||||
const gfxRect *aOverrideBounds);
|
||||
const gfxRect *aOverrideBounds) MOZ_OVERRIDE;
|
||||
|
||||
public:
|
||||
typedef mozilla::SVGAnimatedPreserveAspectRatio SVGAnimatedPreserveAspectRatio;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
// nsIFrame interface:
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
virtual void Init(nsIContent* aContent,
|
||||
@ -67,10 +68,10 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgPatternFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGPattern"), aResult);
|
||||
}
|
||||
|
@ -49,23 +49,23 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::svgTSpanFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGTSpan"), aResult);
|
||||
}
|
||||
#endif
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
// nsISVGGlyphFragmentNode interface:
|
||||
virtual uint32_t GetNumberOfChars() MOZ_OVERRIDE;
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef NS_SVGTEXTFRAME_H
|
||||
#define NS_SVGTEXTFRAME_H
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "gfxRect.h"
|
||||
#include "nsSVGTextContainerFrame.h"
|
||||
@ -41,17 +42,17 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::svgTextFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGText"), aResult);
|
||||
}
|
||||
@ -62,29 +63,29 @@ public:
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
// nsISVGChildFrame interface:
|
||||
virtual void NotifySVGChanged(uint32_t aFlags);
|
||||
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
|
||||
// Override these four to ensure that UpdateGlyphPositioning is called
|
||||
// to bring glyph positions up to date
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext* aContext,
|
||||
const nsIntRect *aDirtyRect);
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint & aPoint);
|
||||
virtual void ReflowSVG();
|
||||
const nsIntRect *aDirtyRect) MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint & aPoint) MOZ_OVERRIDE;
|
||||
virtual void ReflowSVG() MOZ_OVERRIDE;
|
||||
virtual SVGBBox GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
|
||||
uint32_t aFlags);
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGTextContainerFrame methods:
|
||||
virtual uint32_t GetNumberOfChars();
|
||||
virtual float GetComputedTextLength();
|
||||
virtual float GetSubStringLength(uint32_t charnum, uint32_t nchars);
|
||||
virtual int32_t GetCharNumAtPosition(mozilla::nsISVGPoint *point);
|
||||
virtual uint32_t GetNumberOfChars() MOZ_OVERRIDE;
|
||||
virtual float GetComputedTextLength() MOZ_OVERRIDE;
|
||||
virtual float GetSubStringLength(uint32_t charnum, uint32_t nchars) MOZ_OVERRIDE;
|
||||
virtual int32_t GetCharNumAtPosition(mozilla::nsISVGPoint *point) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD GetStartPositionOfChar(uint32_t charnum, nsISupports **_retval);
|
||||
NS_IMETHOD GetEndPositionOfChar(uint32_t charnum, nsISupports **_retval);
|
||||
NS_IMETHOD GetExtentOfChar(uint32_t charnum, mozilla::dom::SVGIRect **_retval);
|
||||
NS_IMETHOD GetRotationOfChar(uint32_t charnum, float *_retval);
|
||||
NS_IMETHOD GetStartPositionOfChar(uint32_t charnum, nsISupports **_retval) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetEndPositionOfChar(uint32_t charnum, nsISupports **_retval) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetExtentOfChar(uint32_t charnum, mozilla::dom::SVGIRect **_retval) MOZ_OVERRIDE;
|
||||
NS_IMETHOD GetRotationOfChar(uint32_t charnum, float *_retval) MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGTextFrame
|
||||
void NotifyGlyphMetricsChange();
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef NS_SVGTEXTFRAME2_H
|
||||
#define NS_SVGTEXTFRAME2_H
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxFont.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "gfxRect.h"
|
||||
@ -206,9 +207,9 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNamespaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsIFrame* GetContentInsertionFrame()
|
||||
virtual nsIFrame* GetContentInsertionFrame() MOZ_OVERRIDE
|
||||
{
|
||||
return GetFirstPrincipalChild()->GetContentInsertionFrame();
|
||||
}
|
||||
@ -216,7 +217,7 @@ public:
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
@ -227,10 +228,10 @@ public:
|
||||
*
|
||||
* @see nsGkAtoms::svgTextFrame2
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGText2"), aResult);
|
||||
}
|
||||
@ -240,21 +241,21 @@ public:
|
||||
* Finds the nsTextFrame for the closest rendered run to the specified point.
|
||||
*/
|
||||
virtual void FindCloserFrameForSelection(nsPoint aPoint,
|
||||
FrameWithDistance* aCurrentBestFrame);
|
||||
FrameWithDistance* aCurrentBestFrame) MOZ_OVERRIDE;
|
||||
|
||||
|
||||
// nsISVGChildFrame interface:
|
||||
virtual void NotifySVGChanged(uint32_t aFlags);
|
||||
virtual void NotifySVGChanged(uint32_t aFlags) MOZ_OVERRIDE;
|
||||
NS_IMETHOD PaintSVG(nsRenderingContext* aContext,
|
||||
const nsIntRect* aDirtyRect);
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint& aPoint);
|
||||
virtual void ReflowSVG();
|
||||
NS_IMETHOD_(nsRect) GetCoveredRegion();
|
||||
const nsIntRect* aDirtyRect) MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsIFrame*) GetFrameForPoint(const nsPoint& aPoint) MOZ_OVERRIDE;
|
||||
virtual void ReflowSVG() MOZ_OVERRIDE;
|
||||
NS_IMETHOD_(nsRect) GetCoveredRegion() MOZ_OVERRIDE;
|
||||
virtual SVGBBox GetBBoxContribution(const gfxMatrix& aToBBoxUserspace,
|
||||
uint32_t aFlags);
|
||||
uint32_t aFlags) MOZ_OVERRIDE;
|
||||
|
||||
// nsSVGContainerFrame methods:
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor);
|
||||
virtual gfxMatrix GetCanvasTM(uint32_t aFor) MOZ_OVERRIDE;
|
||||
|
||||
// SVG DOM text methods:
|
||||
uint32_t GetNumberOfChars(nsIContent* aContent);
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef NSSVGTEXTPATHFRAME_H
|
||||
#define NSSVGTEXTPATHFRAME_H
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxTypes.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsFrame.h"
|
||||
@ -48,16 +49,16 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::svgGFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const;
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGTextPath"), aResult);
|
||||
}
|
||||
@ -83,9 +84,9 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
virtual void GetXY(SVGUserUnitList *aX, SVGUserUnitList *aY);
|
||||
virtual void GetDxDy(SVGUserUnitList *aDx, SVGUserUnitList *aDy);
|
||||
virtual const SVGNumberList *GetRotate();
|
||||
virtual void GetXY(SVGUserUnitList *aX, SVGUserUnitList *aY) MOZ_OVERRIDE;
|
||||
virtual void GetDxDy(SVGUserUnitList *aDx, SVGUserUnitList *aDy) MOZ_OVERRIDE;
|
||||
virtual const SVGNumberList *GetRotate() MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -191,7 +191,7 @@ public:
|
||||
NS_ASSERTION(aPopup, "null popup supplied to nsXULPopupShowingEvent constructor");
|
||||
}
|
||||
|
||||
NS_IMETHOD Run();
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE;
|
||||
|
||||
private:
|
||||
nsCOMPtr<nsIContent> mPopup;
|
||||
@ -218,7 +218,7 @@ public:
|
||||
// aNextPopup and aLastPopup may be null
|
||||
}
|
||||
|
||||
NS_IMETHOD Run();
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE;
|
||||
|
||||
private:
|
||||
nsCOMPtr<nsIContent> mPopup;
|
||||
@ -253,7 +253,7 @@ public:
|
||||
NS_ASSERTION(aMenu, "null menu supplied to nsXULMenuCommandEvent constructor");
|
||||
}
|
||||
|
||||
NS_IMETHOD Run();
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE;
|
||||
|
||||
void SetCloseMenuMode(CloseMenuMode aCloseMenuMode) { mCloseMenuMode = aCloseMenuMode; }
|
||||
|
||||
@ -286,13 +286,13 @@ public:
|
||||
NS_DECL_NSIDOMEVENTLISTENER
|
||||
|
||||
// nsIRollupListener
|
||||
virtual bool Rollup(uint32_t aCount, nsIContent** aLastRolledUp);
|
||||
virtual bool ShouldRollupOnMouseWheelEvent();
|
||||
virtual bool ShouldConsumeOnMouseWheelEvent();
|
||||
virtual bool ShouldRollupOnMouseActivate();
|
||||
virtual uint32_t GetSubmenuWidgetChain(nsTArray<nsIWidget*> *aWidgetChain);
|
||||
virtual void NotifyGeometryChange() {}
|
||||
virtual nsIWidget* GetRollupWidget();
|
||||
virtual bool Rollup(uint32_t aCount, nsIContent** aLastRolledUp) MOZ_OVERRIDE;
|
||||
virtual bool ShouldRollupOnMouseWheelEvent() MOZ_OVERRIDE;
|
||||
virtual bool ShouldConsumeOnMouseWheelEvent() MOZ_OVERRIDE;
|
||||
virtual bool ShouldRollupOnMouseActivate() MOZ_OVERRIDE;
|
||||
virtual uint32_t GetSubmenuWidgetChain(nsTArray<nsIWidget*> *aWidgetChain) MOZ_OVERRIDE;
|
||||
virtual void NotifyGeometryChange() MOZ_OVERRIDE {}
|
||||
virtual nsIWidget* GetRollupWidget() MOZ_OVERRIDE;
|
||||
|
||||
static nsXULPopupManager* sInstance;
|
||||
|
||||
|
@ -135,7 +135,7 @@ protected:
|
||||
mFrame(aFrame), mUp(aUp), mDelta(aDelta)
|
||||
{}
|
||||
|
||||
NS_IMETHOD Run()
|
||||
NS_IMETHOD Run() MOZ_OVERRIDE
|
||||
{
|
||||
if (!mFrame) {
|
||||
return NS_OK;
|
||||
|
@ -5,6 +5,7 @@
|
||||
#ifndef nsMenuBarListener_h__
|
||||
#define nsMenuBarListener_h__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsIDOMEventListener.h"
|
||||
|
||||
// X.h defines KeyPress
|
||||
@ -27,7 +28,7 @@ public:
|
||||
*/
|
||||
virtual ~nsMenuBarListener();
|
||||
|
||||
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
|
||||
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE;
|
||||
|
||||
nsresult KeyUp(nsIDOMEvent* aMouseEvent);
|
||||
nsresult KeyDown(nsIDOMEvent* aMouseEvent);
|
||||
|
@ -33,7 +33,7 @@ public:
|
||||
|
||||
virtual void SetSlider(nsSliderFrame* aSlider) { mSlider = aSlider; }
|
||||
|
||||
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
|
||||
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE;
|
||||
};
|
||||
|
||||
class nsSliderFrame : public nsBoxFrame
|
||||
|
@ -5,6 +5,7 @@
|
||||
#ifndef nsTextBoxFrame_h___
|
||||
#define nsTextBoxFrame_h___
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsLeafBoxFrame.h"
|
||||
|
||||
class nsAccessKeyInfo;
|
||||
@ -18,11 +19,11 @@ public:
|
||||
NS_DECL_QUERYFRAME
|
||||
NS_DECL_FRAMEARENA_HELPERS
|
||||
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState);
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
|
||||
virtual void MarkIntrinsicWidthsDirty();
|
||||
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
|
||||
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
|
||||
|
||||
enum CroppingStyle { CropNone, CropLeft, CropRight, CropCenter };
|
||||
|
||||
@ -32,14 +33,14 @@ public:
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* asPrevInFlow) MOZ_OVERRIDE;
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot);
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const;
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
|
||||
#endif
|
||||
|
||||
void UpdateAttributes(nsIAtom* aAttribute,
|
||||
@ -59,7 +60,7 @@ public:
|
||||
|
||||
nsRect GetComponentAlphaBounds();
|
||||
|
||||
virtual bool ComputesOwnOverflowArea();
|
||||
virtual bool ComputesOwnOverflowArea() MOZ_OVERRIDE;
|
||||
|
||||
void GetCroppedTitle(nsString& aTitle) const { aTitle = mCroppedTitle; }
|
||||
|
||||
|
@ -37,7 +37,7 @@ class nsTreeContentView MOZ_FINAL : public nsINativeTreeView,
|
||||
|
||||
NS_DECL_NSITREEVIEW
|
||||
// nsINativeTreeView: Untrusted code can use us
|
||||
NS_IMETHOD EnsureNative() { return NS_OK; }
|
||||
NS_IMETHOD EnsureNative() MOZ_OVERRIDE { return NS_OK; }
|
||||
|
||||
NS_DECL_NSITREECONTENTVIEW
|
||||
|
||||
|
@ -27,7 +27,7 @@ public:
|
||||
NS_DECL_NSITREESELECTION
|
||||
|
||||
// nsINativeTreeSelection: Untrusted code can use us
|
||||
NS_IMETHOD EnsureNative() { return NS_OK; }
|
||||
NS_IMETHOD EnsureNative() MOZ_OVERRIDE { return NS_OK; }
|
||||
|
||||
friend struct nsTreeRange;
|
||||
|
||||
|
@ -6,6 +6,7 @@
|
||||
#ifndef nsTreeStyleCache_h__
|
||||
#define nsTreeStyleCache_h__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsHashtable.h"
|
||||
#include "nsIAtom.h"
|
||||
#include "nsCOMArray.h"
|
||||
@ -23,16 +24,16 @@ public:
|
||||
|
||||
uint32_t GetStateID() { return mStateID; }
|
||||
|
||||
uint32_t HashCode(void) const {
|
||||
uint32_t HashCode(void) const MOZ_OVERRIDE {
|
||||
return mStateID;
|
||||
}
|
||||
|
||||
bool Equals(const nsHashKey *aKey) const {
|
||||
bool Equals(const nsHashKey *aKey) const MOZ_OVERRIDE {
|
||||
nsDFAState* key = (nsDFAState*)aKey;
|
||||
return key->mStateID == mStateID;
|
||||
}
|
||||
|
||||
nsHashKey *Clone(void) const {
|
||||
nsHashKey *Clone(void) const MOZ_OVERRIDE {
|
||||
return new nsDFAState(mStateID);
|
||||
}
|
||||
};
|
||||
@ -45,19 +46,19 @@ public:
|
||||
|
||||
nsTransitionKey(uint32_t aState, nsIAtom* aSymbol) :mState(aState), mInputSymbol(aSymbol) {}
|
||||
|
||||
uint32_t HashCode(void) const {
|
||||
uint32_t HashCode(void) const MOZ_OVERRIDE {
|
||||
// Make a 32-bit integer that combines the low-order 16 bits of the state and the input symbol.
|
||||
int32_t hb = mState << 16;
|
||||
int32_t lb = (NS_PTR_TO_INT32(mInputSymbol.get()) << 16) >> 16;
|
||||
return hb+lb;
|
||||
}
|
||||
|
||||
bool Equals(const nsHashKey *aKey) const {
|
||||
bool Equals(const nsHashKey *aKey) const MOZ_OVERRIDE {
|
||||
nsTransitionKey* key = (nsTransitionKey*)aKey;
|
||||
return key->mState == mState && key->mInputSymbol == mInputSymbol;
|
||||
}
|
||||
|
||||
nsHashKey *Clone(void) const {
|
||||
nsHashKey *Clone(void) const MOZ_OVERRIDE {
|
||||
return new nsTransitionKey(mState, mInputSymbol);
|
||||
}
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user