Bug 330300. Move mFrame from nsDisplayItem subclasses up to nsDisplayItem itself, and make GetUnderlyingFrame an inline non-virtual function. Patch by Alfred Peng, r+sr=roc

git-svn-id: svn://10.0.0.236/trunk@192331 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2006-03-14 20:43:18 +00:00
parent 9db7aac075
commit c469d694c3
26 changed files with 119 additions and 182 deletions

View File

@@ -171,7 +171,7 @@ MOZ_DECL_CTOR_COUNTER(nsDisplayCheckMark)
class nsDisplayCheckMark : public nsDisplayItem {
public:
nsDisplayCheckMark(nsGfxCheckboxControlFrame* aFrame)
: mFrame(aFrame) {
: nsDisplayItem(aFrame) {
MOZ_COUNT_CTOR(nsDisplayCheckMark);
}
#ifdef NS_BUILD_REFCNT_LOGGING
@@ -180,19 +180,16 @@ public:
}
#endif
virtual nsIFrame* GetUnderlyingFrame() { return mFrame; }
virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx,
const nsRect& aDirtyRect);
NS_DISPLAY_DECL_NAME("CheckMark")
private:
nsGfxCheckboxControlFrame* mFrame;
};
void
nsDisplayCheckMark::Paint(nsDisplayListBuilder* aBuilder,
nsIRenderingContext* aCtx, const nsRect& aDirtyRect) {
mFrame->PaintCheckBox(*aCtx, aBuilder->ToReferenceFrame(mFrame),
aDirtyRect);
NS_STATIC_CAST(nsGfxCheckboxControlFrame*, mFrame)->
PaintCheckBox(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect);
}