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

14
layout/generic/nsTextFrame.cpp
View File

@@ -3938,7 +3938,9 @@ public:
mPrevContinuation = aPrevContinuation;
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 {
return (GetStateBits() & NS_FRAME_IS_FLUID_CONTINUATION) ? mPrevContinuation : nullptr;
}
@@ -4478,7 +4480,8 @@ public:
}
#endif
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE {
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) MOZ_OVERRIDE {
*aSnap = false;
nsRect temp = mFrame->GetVisualOverflowRectRelativeToSelf() + ToReferenceFrame();
// Bug 748228
@@ -4486,7 +4489,8 @@ public:
return temp;
}
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)) {
aOutFrames->AppendElement(mFrame);
}
@@ -4526,7 +4530,9 @@ public:
}
}
virtual void DisableComponentAlpha() MOZ_OVERRIDE { mDisableSubpixelAA = true; }
virtual void DisableComponentAlpha() MOZ_OVERRIDE {
mDisableSubpixelAA = true;
}
bool mDisableSubpixelAA;
};