corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 974687 - Part 2: Fix more than 80cols issues caused by MOZ_OVERRIDE annotation. r=dholbert

Browse Source
This commit is contained in:
Arnaud Sourioux
2014-02-24 09:41:56 -05:00
parent fe6152ac7a
commit a7fb7f5ece
21 changed files with 78 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
layout/base/nsDisplayList.h
View File

@@ -1731,7 +1731,8 @@ public:
} }
#endif #endif
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE { virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE {
mPaint(mFrame, aCtx, mVisibleRect, ToReferenceFrame()); mPaint(mFrame, aCtx, mVisibleRect, ToReferenceFrame());
} }
NS_DISPLAY_DECL_NAME(mName, mType) NS_DISPLAY_DECL_NAME(mName, mType)
@@ -2596,7 +2597,8 @@ public:
virtual ~nsDisplayMixBlendMode(); virtual ~nsDisplayMixBlendMode();
#endif #endif
nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE; nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE;
virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder, virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager, LayerManager* aManager,
@@ -2923,15 +2925,18 @@ public:
virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder, virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE; bool* aSnap) MOZ_OVERRIDE;
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE; HitTestState* aState,
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE { nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE {
*aSnap = false; *aSnap = false;
return mEffectsBounds + ToReferenceFrame(); return mEffectsBounds + ToReferenceFrame();
} }
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder, virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion, nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE; const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) MOZ_OVERRIDE; virtual bool TryMerge(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("SVGEffects", TYPE_SVG_EFFECTS) NS_DISPLAY_DECL_NAME("SVGEffects", TYPE_SVG_EFFECTS)
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder, virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,

9
layout/forms/nsButtonFrameRenderer.cpp
View File

@@ -74,7 +74,8 @@ public:
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE; nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE; virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("ButtonBoxShadowOuter", TYPE_BUTTON_BOX_SHADOW_OUTER) NS_DISPLAY_DECL_NAME("ButtonBoxShadowOuter", TYPE_BUTTON_BOX_SHADOW_OUTER)
private: private:
nsButtonFrameRenderer* mBFR; nsButtonFrameRenderer* mBFR;
@@ -112,12 +113,14 @@ public:
#endif #endif
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE { HitTestState* aState,
nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE {
aOutFrames->AppendElement(mFrame); aOutFrames->AppendElement(mFrame);
} }
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE; nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE; virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE;
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder, virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry, const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE; nsRegion *aInvalidRegion) MOZ_OVERRIDE;

3
layout/forms/nsFieldSetFrame.cpp
View File

@@ -106,7 +106,8 @@ public:
#endif #endif
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE; HitTestState* aState,
nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE; nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder, virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,

3
layout/generic/TextOverflow.cpp
View File

@@ -167,7 +167,8 @@ public:
MOZ_COUNT_DTOR(nsDisplayTextOverflowMarker); MOZ_COUNT_DTOR(nsDisplayTextOverflowMarker);
} }
#endif #endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE { virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE {
*aSnap = false; *aSnap = false;
nsRect shadowRect = nsRect shadowRect =
nsLayoutUtils::GetTextShadowRectsUnion(mRect, mFrame); nsLayoutUtils::GetTextShadowRectsUnion(mRect, mFrame);

5
layout/generic/nsBRFrame.cpp
View File

@@ -31,8 +31,9 @@ public:
virtual bool PeekOffsetNoAmount(bool aForward, int32_t* aOffset) MOZ_OVERRIDE; virtual bool PeekOffsetNoAmount(bool aForward, int32_t* aOffset) MOZ_OVERRIDE;
virtual bool PeekOffsetCharacter(bool aForward, int32_t* aOffset, virtual bool PeekOffsetCharacter(bool aForward, int32_t* aOffset,
bool aRespectClusters = true) MOZ_OVERRIDE; bool aRespectClusters = true) MOZ_OVERRIDE;
virtual bool PeekOffsetWord(bool aForward, bool aWordSelectEatSpace, bool aIsKeyboardSelect, virtual bool PeekOffsetWord(bool aForward, bool aWordSelectEatSpace,
int32_t* aOffset, PeekWordState* aState) MOZ_OVERRIDE; bool aIsKeyboardSelect, int32_t* aOffset,
PeekWordState* aState) MOZ_OVERRIDE;
virtual nsresult Reflow(nsPresContext* aPresContext, virtual nsresult Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,

6
layout/generic/nsBulletFrame.cpp
View File

@@ -206,13 +206,15 @@ public:
} }
#endif #endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE
{ {
*aSnap = false; *aSnap = false;
return mFrame->GetVisualOverflowRectRelativeToSelf() + ToReferenceFrame(); return mFrame->GetVisualOverflowRectRelativeToSelf() + ToReferenceFrame();
} }
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE { HitTestState* aState,
nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE {
aOutFrames->AppendElement(mFrame); aOutFrames->AppendElement(mFrame);
} }
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,

3
layout/generic/nsCanvasFrame.cpp
View File

@@ -301,7 +301,8 @@ public:
MOZ_COUNT_DTOR(nsDisplayCanvasFocus); MOZ_COUNT_DTOR(nsDisplayCanvasFocus);
} }
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE
{ {
*aSnap = false; *aSnap = false;
// This is an overestimate, but that's not a problem. // This is an overestimate, but that's not a problem.

6
layout/generic/nsFrameSetFrame.cpp
View File

@@ -1470,7 +1470,8 @@ public:
// REVIEW: see old GetFrameForPoint // REVIEW: see old GetFrameForPoint
// Receives events in its bounds // Receives events in its bounds
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE { HitTestState* aState,
nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE {
aOutFrames->AppendElement(mFrame); aOutFrames->AppendElement(mFrame);
} }
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,
@@ -1673,7 +1674,8 @@ public:
} }
#endif #endif
virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) MOZ_OVERRIDE; virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("FramesetBlank", TYPE_FRAMESET_BLANK) NS_DISPLAY_DECL_NAME("FramesetBlank", TYPE_FRAMESET_BLANK)
}; };

3
layout/generic/nsHTMLCanvasFrame.cpp
View File

@@ -48,7 +48,8 @@ public:
return result; return result;
} }
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE { virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE {
*aSnap = true; *aSnap = true;
nsHTMLCanvasFrame* f = static_cast<nsHTMLCanvasFrame*>(Frame()); nsHTMLCanvasFrame* f = static_cast<nsHTMLCanvasFrame*>(Frame());
return f->GetInnerArea() + ToReferenceFrame(); return f->GetInnerArea() + ToReferenceFrame();

6
layout/generic/nsImageFrame.cpp
View File

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

6
layout/generic/nsObjectFrame.cpp
View File

@@ -855,7 +855,8 @@ public:
} }
#endif #endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE; virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder, virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion, nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE; const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;
@@ -925,7 +926,8 @@ public:
} }
#endif #endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE; virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE;
virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder, virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
nsRegion* aVisibleRegion, nsRegion* aVisibleRegion,
const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE; const nsRect& aAllowVisibleRegionExpansion) MOZ_OVERRIDE;

14
layout/generic/nsTextFrame.cpp
View File

@@ -3938,7 +3938,9 @@ public:
mPrevContinuation = aPrevContinuation; mPrevContinuation = aPrevContinuation;
RemoveStateBits(NS_FRAME_IS_FLUID_CONTINUATION); RemoveStateBits(NS_FRAME_IS_FLUID_CONTINUATION);
} }
virtual nsIFrame* GetPrevInFlowVirtual() const MOZ_OVERRIDE { return GetPrevInFlow(); } virtual nsIFrame* GetPrevInFlowVirtual() const MOZ_OVERRIDE {
return GetPrevInFlow();
}
nsIFrame* GetPrevInFlow() const { nsIFrame* GetPrevInFlow() const {
return (GetStateBits() & NS_FRAME_IS_FLUID_CONTINUATION) ? mPrevContinuation : nullptr; return (GetStateBits() & NS_FRAME_IS_FLUID_CONTINUATION) ? mPrevContinuation : nullptr;
} }
@@ -4478,7 +4480,8 @@ public:
} }
#endif #endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE { virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE {
*aSnap = false; *aSnap = false;
nsRect temp = mFrame->GetVisualOverflowRectRelativeToSelf() + ToReferenceFrame(); nsRect temp = mFrame->GetVisualOverflowRectRelativeToSelf() + ToReferenceFrame();
// Bug 748228 // Bug 748228
@@ -4486,7 +4489,8 @@ public:
return temp; return temp;
} }
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE { HitTestState* aState,
nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE {
if (nsRect(ToReferenceFrame(), mFrame->GetSize()).Intersects(aRect)) { if (nsRect(ToReferenceFrame(), mFrame->GetSize()).Intersects(aRect)) {
aOutFrames->AppendElement(mFrame); aOutFrames->AppendElement(mFrame);
} }
@@ -4526,7 +4530,9 @@ public:
} }
} }
virtual void DisableComponentAlpha() MOZ_OVERRIDE { mDisableSubpixelAA = true; } virtual void DisableComponentAlpha() MOZ_OVERRIDE {
mDisableSubpixelAA = true;
}
bool mDisableSubpixelAA; bool mDisableSubpixelAA;
}; };

3
layout/mathml/nsMathMLmfracFrame.cpp
View File

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

3
layout/svg/SVGTextFrame.cpp
View File

@@ -3086,7 +3086,8 @@ public:
mDisableSubpixelAA = true; mDisableSubpixelAA = true;
} }
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE; HitTestState* aState,
nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE; nsRenderingContext* aCtx) MOZ_OVERRIDE;
private: private:

3
layout/svg/nsSVGIntegrationUtils.cpp
View File

@@ -384,7 +384,8 @@ public:
mOffset(aOffset) {} mOffset(aOffset) {}
virtual void Paint(nsRenderingContext *aContext, nsIFrame *aTarget, virtual void Paint(nsRenderingContext *aContext, nsIFrame *aTarget,
const nsIntRect* aDirtyRect, nsIFrame* aTransformRoot) MOZ_OVERRIDE const nsIntRect* aDirtyRect,
nsIFrame* aTransformRoot) MOZ_OVERRIDE
{ {
BasicLayerManager* basic = static_cast<BasicLayerManager*>(mLayerManager); BasicLayerManager* basic = static_cast<BasicLayerManager*>(mLayerManager);
basic->SetTarget(aContext->ThebesContext()); basic->SetTarget(aContext->ThebesContext());

3
layout/svg/nsSVGOuterSVGFrame.cpp
View File

@@ -507,7 +507,8 @@ public:
#endif #endif
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE; HitTestState* aState,
nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE; nsRenderingContext* aCtx) MOZ_OVERRIDE;

3
layout/svg/nsSVGUtils.cpp
View File

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

6
layout/tables/nsTableCellFrame.cpp
View File

@@ -385,12 +385,14 @@ public:
#endif #endif
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE { HitTestState* aState,
nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE {
aOutFrames->AppendElement(mFrame); aOutFrames->AppendElement(mFrame);
} }
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE; nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE; virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE;
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder, virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry, const nsDisplayItemGeometry* aGeometry,
nsRegion *aInvalidRegion) MOZ_OVERRIDE; nsRegion *aInvalidRegion) MOZ_OVERRIDE;

6
layout/xul/nsBoxFrame.cpp
View File

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

7
layout/xul/nsTextBoxFrame.cpp
View File

@@ -294,12 +294,15 @@ public:
virtual void Paint(nsDisplayListBuilder* aBuilder, virtual void Paint(nsDisplayListBuilder* aBuilder,
nsRenderingContext* aCtx) MOZ_OVERRIDE; nsRenderingContext* aCtx) MOZ_OVERRIDE;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE; virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("XULTextBox", TYPE_XUL_TEXT_BOX) NS_DISPLAY_DECL_NAME("XULTextBox", TYPE_XUL_TEXT_BOX)
virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE; virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
virtual void DisableComponentAlpha() MOZ_OVERRIDE { mDisableSubpixelAA = true; } virtual void DisableComponentAlpha() MOZ_OVERRIDE {
mDisableSubpixelAA = true;
}
void PaintTextToContext(nsRenderingContext* aCtx, void PaintTextToContext(nsRenderingContext* aCtx,
nsPoint aOffset, nsPoint aOffset,

3
layout/xul/tree/nsTreeColFrame.cpp
View File

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