diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index 803cb975d48..29668d8f9ec 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -608,7 +608,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) = 0; + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0) = 0; /** * Event handling of GUI events. diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 62be4c11a29..2b76ef78619 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -2585,10 +2585,11 @@ nsComboboxControlFrame::RestoreState(nsIPresContext* aPresContext, nsIPresState* } NS_METHOD -nsComboboxControlFrame::Paint(nsIPresContext* aPresContext, +nsComboboxControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/forms/nsComboboxControlFrame.h b/mozilla/layout/forms/nsComboboxControlFrame.h index 2af2a8d30c9..5a60ec2a922 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.h +++ b/mozilla/layout/forms/nsComboboxControlFrame.h @@ -107,10 +107,11 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); #ifdef NS_DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const; #endif diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp index fc1998f81a1..fcc2cf16952 100644 --- a/mozilla/layout/forms/nsFieldSetFrame.cpp +++ b/mozilla/layout/forms/nsFieldSetFrame.cpp @@ -63,10 +63,11 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_METHOD Paint(nsIPresContext* aPresContext, + NS_METHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD AppendFrames(nsIPresContext* aPresContext, nsIPresShell& aPresShell, @@ -149,10 +150,11 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext* aPresContext, // this is identical to nsHTMLContainerFrame::Paint except for the background and border. NS_IMETHODIMP -nsFieldSetFrame::Paint(nsIPresContext* aPresContext, +nsFieldSetFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { // Paint our background and border diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index 086ef334263..56798d88eea 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -674,10 +674,11 @@ NS_IMETHODIMP nsFileControlFrame::GetProperty(nsIAtom* aName, nsAWritableString& NS_METHOD -nsFileControlFrame::Paint(nsIPresContext* aPresContext, +nsFileControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/forms/nsFileControlFrame.h b/mozilla/layout/forms/nsFileControlFrame.h index f5536bf327b..d79c19f2b18 100644 --- a/mozilla/layout/forms/nsFileControlFrame.h +++ b/mozilla/layout/forms/nsFileControlFrame.h @@ -64,10 +64,11 @@ public: virtual void SetFormFrame(nsFormFrame* aFormFrame) { mFormFrame = aFormFrame; } virtual nsFormFrame* GetFromFrame() { return mFormFrame; } - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); // nsIFormControlFrame NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAReadableString& aValue); diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp index a799515641a..a3ca48cd240 100644 --- a/mozilla/layout/forms/nsFormControlFrame.cpp +++ b/mozilla/layout/forms/nsFormControlFrame.cpp @@ -400,10 +400,11 @@ nsFormControlFrame::SetClickPoint(nscoord aX, nscoord aY) // XXX it would be cool if form element used our rendering sw, then // they could be blended, and bordered, and so on... NS_METHOD -nsFormControlFrame::Paint(nsIPresContext* aPresContext, +nsFormControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/forms/nsFormControlFrame.h b/mozilla/layout/forms/nsFormControlFrame.h index 114b39f5083..70d19b4470b 100644 --- a/mozilla/layout/forms/nsFormControlFrame.h +++ b/mozilla/layout/forms/nsFormControlFrame.h @@ -96,10 +96,11 @@ public: * Draw this frame within the context of a presentation context and rendering context * @see nsIFrame::Paint */ - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext, nsIAtom* aListName, diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp index 7239a058198..e02f3df2a94 100644 --- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp @@ -381,10 +381,11 @@ nsGfxCheckboxControlFrame::PaintMixedMark ( nsIRenderingContext& aRenderingConte //------------------------------------------------------------ NS_METHOD -nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext, +nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.h b/mozilla/layout/forms/nsGfxCheckboxControlFrame.h index 0cfa9e9bc6e..a6bd1b29efe 100644 --- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.h +++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.h @@ -67,10 +67,11 @@ public: PRInt32 aModType, PRInt32 aHint) ; - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); #ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp index d682b2a570c..21e26a6900e 100644 --- a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp @@ -331,10 +331,11 @@ nsGfxRadioControlFrame::PaintRadioButton(nsIPresContext* aPresContext, //-------------------------------------------------------------- NS_METHOD -nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext, +nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.h b/mozilla/layout/forms/nsGfxRadioControlFrame.h index 42f1e19b837..b09327d975d 100644 --- a/mozilla/layout/forms/nsGfxRadioControlFrame.h +++ b/mozilla/layout/forms/nsGfxRadioControlFrame.h @@ -78,10 +78,11 @@ public: // Expect this code to repackaged and moved to a new location in the future. // - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); virtual void PaintRadioButton(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index ba28dc5224c..1888f17f4f3 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -473,10 +473,11 @@ nsHTMLButtonControlFrame::SetInitialChildList(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext, +nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.h b/mozilla/layout/forms/nsHTMLButtonControlFrame.h index 7ce5100c85b..f6549f3a291 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.h +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.h @@ -64,10 +64,11 @@ public: NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index d2668aea130..f2c4265adee 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -105,10 +105,11 @@ nsIsIndexFrame::~nsIsIndexFrame() } NS_IMETHODIMP -nsIsIndexFrame::Paint(nsIPresContext* aPresContext, +nsIsIndexFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/forms/nsIsIndexFrame.h b/mozilla/layout/forms/nsIsIndexFrame.h index f1a2e82cd1d..9517348b075 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.h +++ b/mozilla/layout/forms/nsIsIndexFrame.h @@ -47,10 +47,11 @@ public: nsIsIndexFrame(); virtual ~nsIsIndexFrame(); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); // XXX Hack so we can squirrel away the pres context pointer for the KeyPress method NS_IMETHOD Init(nsIPresContext* aPresContext, diff --git a/mozilla/layout/forms/nsLegendFrame.cpp b/mozilla/layout/forms/nsLegendFrame.cpp index 6b069ff1c5b..30847877ded 100644 --- a/mozilla/layout/forms/nsLegendFrame.cpp +++ b/mozilla/layout/forms/nsLegendFrame.cpp @@ -105,10 +105,11 @@ nsLegendFrame::Reflow(nsIPresContext* aPresContext, NS_IMETHODIMP -nsLegendFrame::Paint(nsIPresContext* aPresContext, +nsLegendFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/forms/nsLegendFrame.h b/mozilla/layout/forms/nsLegendFrame.h index 76d38bd88f7..df76aaa4937 100644 --- a/mozilla/layout/forms/nsLegendFrame.h +++ b/mozilla/layout/forms/nsLegendFrame.h @@ -52,10 +52,11 @@ public: NS_IMETHOD Destroy(nsIPresContext *aPresContext); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); #ifdef NS_DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const; diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index 9e539fa5c04..0b308a9b751 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -458,10 +458,11 @@ nsListControlFrame::Destroy(nsIPresContext *aPresContext) } NS_IMETHODIMP -nsListControlFrame::Paint(nsIPresContext* aPresContext, +nsListControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIStyleContext* sc = mStyleContext; const nsStyleVisibility* vis = diff --git a/mozilla/layout/forms/nsListControlFrame.h b/mozilla/layout/forms/nsListControlFrame.h index dffdfa25fb7..faa9e847378 100644 --- a/mozilla/layout/forms/nsListControlFrame.h +++ b/mozilla/layout/forms/nsListControlFrame.h @@ -194,10 +194,11 @@ public: NS_IMETHOD MoveTo(nsIPresContext* aPresContext, nscoord aX, nscoord aY); NS_IMETHOD Destroy(nsIPresContext *aPresContext); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Get the "type" of the frame diff --git a/mozilla/layout/generic/nsBRFrame.cpp b/mozilla/layout/generic/nsBRFrame.cpp index af65d51fef3..259f4d67e4b 100644 --- a/mozilla/layout/generic/nsBRFrame.cpp +++ b/mozilla/layout/generic/nsBRFrame.cpp @@ -41,10 +41,11 @@ class BRFrame : public nsFrame { public: // nsIFrame #ifdef NS_DEBUG - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); #endif NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX, const nsPoint& aPoint, @@ -86,10 +87,11 @@ BRFrame::~BRFrame() #ifdef NS_DEBUG NS_IMETHODIMP -BRFrame::Paint(nsIPresContext* aPresContext, +BRFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) { float p2t; diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 2e98e4abac8..8fb3f81429f 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -4969,7 +4969,8 @@ NS_IMETHODIMP nsBlockFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_IS_UNFLOWABLE & mState) { return NS_OK; @@ -5119,10 +5120,11 @@ nsBlockFrame::PaintFloaters(nsIPresContext* aPresContext, } void -nsBlockFrame::PaintChildren(nsIPresContext* aPresContext, +nsBlockFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { #ifdef DEBUG PRInt32 depth = 0; diff --git a/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h index 3c38ecd964d..72977723788 100644 --- a/mozilla/layout/generic/nsBlockFrame.h +++ b/mozilla/layout/generic/nsBlockFrame.h @@ -95,7 +95,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameType(nsIAtom** aType) const; #ifdef DEBUG NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; @@ -386,10 +387,11 @@ protected: //---------------------------------------- //XXX - virtual void PaintChildren(nsIPresContext* aPresContext, + virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); void PaintFloaters(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index 194e71a80d2..418cb5dcfe1 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -158,7 +158,8 @@ NS_IMETHODIMP nsBulletFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; diff --git a/mozilla/layout/generic/nsBulletFrame.h b/mozilla/layout/generic/nsBulletFrame.h index e95fbb7ca65..cfda9123376 100644 --- a/mozilla/layout/generic/nsBulletFrame.h +++ b/mozilla/layout/generic/nsBulletFrame.h @@ -45,10 +45,11 @@ public: nsIStyleContext* aContext, nsIFrame* aPrevInFlow); NS_IMETHOD Destroy(nsIPresContext* aPresContext); - NS_IMETHOD Paint(nsIPresContext* aCX, + NS_IMETHOD Paint(nsIPresContext* aCX, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameType(nsIAtom** aType) const; #ifdef NS_DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const; diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index 61926a561c5..e36368e717a 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/layout/generic/nsContainerFrame.cpp @@ -150,9 +150,10 @@ NS_IMETHODIMP nsContainerFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { - PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags); return NS_OK; } @@ -166,11 +167,12 @@ void nsContainerFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIFrame* kid = mFrames.FirstChild(); while (nsnull != kid) { - PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer); + PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer, aFlags); kid->GetNextSibling(&kid); } } @@ -181,7 +183,8 @@ nsContainerFrame::PaintChild(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIView *pView; aFrame->GetView(aPresContext, &pView); @@ -225,7 +228,7 @@ nsContainerFrame::PaintChild(nsIPresContext* aPresContext, aRenderingContext.Translate(kidRect.x, kidRect.y); // Paint the kid - aFrame->Paint(aPresContext, aRenderingContext, damageArea, aWhichLayer); + aFrame->Paint(aPresContext, aRenderingContext, damageArea, aWhichLayer, aFlags); // don't use PushState and PopState, because they're slow aRenderingContext.Translate(-kidRect.x, -kidRect.y); diff --git a/mozilla/layout/generic/nsContainerFrame.h b/mozilla/layout/generic/nsContainerFrame.h index 0baa4849bef..09030881f8d 100644 --- a/mozilla/layout/generic/nsContainerFrame.h +++ b/mozilla/layout/generic/nsContainerFrame.h @@ -54,7 +54,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, nsFramePaintLayer aWhichLayer, @@ -165,13 +166,15 @@ protected: virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); virtual void PaintChild(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Get the frames on the overflow list diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 14410a2af71..b3759ee4769 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -699,7 +699,8 @@ NS_IMETHODIMP nsFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (aWhichLayer != NS_FRAME_PAINT_LAYER_FOREGROUND) return NS_OK; diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index bf978af3073..753c5e710fb 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -196,7 +196,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, nsGUIEvent* aEvent, nsEventStatus* aEventStatus); diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index e7c261fe045..a49f9364882 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -141,10 +141,11 @@ public: NS_IMETHOD GetFrameType(nsIAtom** aType) const; - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD Init(nsIPresContext* aPresContext, nsIContent* aContent, @@ -206,10 +207,11 @@ public: /** * @see nsIFrame::Paint */ - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); /** * @see nsIFrame::Reflow @@ -410,10 +412,11 @@ PRBool nsHTMLFrameOuterFrame::IsInline() } NS_IMETHODIMP -nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext, +nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { @@ -905,7 +908,8 @@ NS_IMETHODIMP nsHTMLFrameInnerFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { //printf("inner paint %X (%d,%d,%d,%d) \n", this, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height); // if there is not web shell paint based on our background color, diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index ea36a1aff76..7c249db0734 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -122,10 +122,11 @@ public: nsPoint& aPoint, PRInt32& aCursor); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, @@ -166,7 +167,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, @@ -648,7 +650,8 @@ NS_IMETHODIMP nsHTMLFramesetFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { //printf("frameset paint %X (%d,%d,%d,%d) \n", this, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height); return nsHTMLContainerFrame::Paint(aPresContext, aRenderingContext, @@ -1671,7 +1674,8 @@ NS_METHOD nsHTMLFramesetBorderFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; @@ -1855,7 +1859,8 @@ NS_METHOD nsHTMLFramesetBlankFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; diff --git a/mozilla/layout/generic/nsFrameSetFrame.h b/mozilla/layout/generic/nsFrameSetFrame.h index b6df0394200..72ff4cff42b 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.h +++ b/mozilla/layout/generic/nsFrameSetFrame.h @@ -139,7 +139,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index c0d0fa392d2..c914ddfcf17 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -558,10 +558,11 @@ nsGfxScrollFrame::GetPadding(nsMargin& aMargin) } NS_IMETHODIMP -nsGfxScrollFrame::Paint(nsIPresContext* aPresContext, +nsGfxScrollFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // Paint our children return nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, diff --git a/mozilla/layout/generic/nsGfxScrollFrame.h b/mozilla/layout/generic/nsGfxScrollFrame.h index 4580d9baabf..0a2ac38554a 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.h +++ b/mozilla/layout/generic/nsGfxScrollFrame.h @@ -97,7 +97,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX, const nsPoint& aPoint, diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index 69fc7c95ac8..61bbe9f537c 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -52,10 +52,11 @@ static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); NS_IMETHODIMP -nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, +nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_IS_UNFLOWABLE & mState) { return NS_OK; @@ -93,8 +94,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, // an image to represent this "hidden" element. if (!mFrames.FirstChild()) { - nsFrame::Paint(aPresContext, - aRenderingContext, aDirtyRect, aWhichLayer); + nsFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags); } } } @@ -117,7 +117,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, // override the visibility property and display even if their parent is // hidden - PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags); return NS_OK; } diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.h b/mozilla/layout/generic/nsHTMLContainerFrame.h index 655fed445b2..f59a981486b 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.h +++ b/mozilla/layout/generic/nsHTMLContainerFrame.h @@ -45,10 +45,11 @@ struct nsStylePosition; // functionality. class nsHTMLContainerFrame : public nsContainerFrame { public: - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Helper method to create next-in-flows if necessary. If aFrame diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index fefa6855f73..0a928227aa1 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -114,10 +114,11 @@ public: return NS_OK; } - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); // nsIScrollPositionListener NS_IMETHOD ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY); @@ -386,10 +387,11 @@ CanvasFrame::DrawDottedRect(nsIRenderingContext& aRenderingContext, nsRect& aRec NS_IMETHODIMP -CanvasFrame::Paint(nsIPresContext* aPresContext, +CanvasFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { SetDefaultBackgroundColor(aPresContext); diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 803cb975d48..29668d8f9ec 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -608,7 +608,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) = 0; + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0) = 0; /** * Event handling of GUI events. diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 4efcad16ddc..7e30680dd33 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -936,10 +936,11 @@ nsImageFrame::DisplayAltFeedback(nsIPresContext* aPresContext, } NS_METHOD -nsImageFrame::Paint(nsIPresContext* aPresContext, +nsImageFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && diff --git a/mozilla/layout/generic/nsImageFrame.h b/mozilla/layout/generic/nsImageFrame.h index f33473db4d1..897b3a1cc3d 100644 --- a/mozilla/layout/generic/nsImageFrame.h +++ b/mozilla/layout/generic/nsImageFrame.h @@ -74,10 +74,11 @@ public: nsIFrame* aParent, nsIStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/mozilla/layout/generic/nsLeafFrame.cpp b/mozilla/layout/generic/nsLeafFrame.cpp index 79cdcfd38ec..82ae8533ba7 100644 --- a/mozilla/layout/generic/nsLeafFrame.cpp +++ b/mozilla/layout/generic/nsLeafFrame.cpp @@ -34,10 +34,11 @@ nsLeafFrame::~nsLeafFrame() } NS_IMETHODIMP -nsLeafFrame::Paint(nsIPresContext* aPresContext, +nsLeafFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { PRBool isVisible; diff --git a/mozilla/layout/generic/nsLeafFrame.h b/mozilla/layout/generic/nsLeafFrame.h index 59a2c60cf5d..84e21a2fd98 100644 --- a/mozilla/layout/generic/nsLeafFrame.h +++ b/mozilla/layout/generic/nsLeafFrame.h @@ -34,10 +34,11 @@ class nsLeafFrame : public nsFrame { public: // nsIFrame replacements - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 34173f35ba0..cc5da3ca1bc 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -1514,10 +1514,11 @@ nsObjectFrame::DidReflow(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsObjectFrame::Paint(nsIPresContext* aPresContext, +nsObjectFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* vis = (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); if ((vis != nsnull) && !vis->IsVisibleOrCollapsed()) { diff --git a/mozilla/layout/generic/nsObjectFrame.h b/mozilla/layout/generic/nsObjectFrame.h index ae16ef9162c..a0858dc1739 100644 --- a/mozilla/layout/generic/nsObjectFrame.h +++ b/mozilla/layout/generic/nsObjectFrame.h @@ -53,10 +53,11 @@ public: nsReflowStatus& aStatus); NS_IMETHOD DidReflow(nsIPresContext* aPresContext, nsDidReflowStatus aStatus); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, nsGUIEvent* aEvent, diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp index 00ba09f1f16..f011f41daa9 100644 --- a/mozilla/layout/generic/nsPageFrame.cpp +++ b/mozilla/layout/generic/nsPageFrame.cpp @@ -358,7 +358,8 @@ NS_IMETHODIMP nsPageFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { aRenderingContext.PushState(); PRBool clipEmpty; diff --git a/mozilla/layout/generic/nsPageFrame.h b/mozilla/layout/generic/nsPageFrame.h index a046c118566..9f5be457fa7 100644 --- a/mozilla/layout/generic/nsPageFrame.h +++ b/mozilla/layout/generic/nsPageFrame.h @@ -39,7 +39,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD IsPercentageBase(PRBool& aBase) const; diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp index 1957c72ebc8..018ce3ed703 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.cpp +++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp @@ -74,10 +74,11 @@ nsPlaceholderFrame::GetFrameType(nsIAtom** aType) const #ifdef DEBUG NS_IMETHODIMP -nsPlaceholderFrame::Paint(nsIPresContext* aPresContext, +nsPlaceholderFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) { float p2t; diff --git a/mozilla/layout/generic/nsPlaceholderFrame.h b/mozilla/layout/generic/nsPlaceholderFrame.h index 1cc76ca4fa0..e56c7d59cbb 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.h +++ b/mozilla/layout/generic/nsPlaceholderFrame.h @@ -47,10 +47,11 @@ public: // nsIFrame overrides #ifdef DEBUG - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; #endif diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index eeb8ea76098..567238561eb 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -368,10 +368,11 @@ public: NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtrResult); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD GetCursor(nsIPresContext* aPresContext, nsPoint& aPoint, @@ -1350,10 +1351,11 @@ nsTextFrame::ContentChanged(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsTextFrame::Paint(nsIPresContext* aPresContext, +nsTextFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; diff --git a/mozilla/layout/html/base/src/nsBRFrame.cpp b/mozilla/layout/html/base/src/nsBRFrame.cpp index af65d51fef3..259f4d67e4b 100644 --- a/mozilla/layout/html/base/src/nsBRFrame.cpp +++ b/mozilla/layout/html/base/src/nsBRFrame.cpp @@ -41,10 +41,11 @@ class BRFrame : public nsFrame { public: // nsIFrame #ifdef NS_DEBUG - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); #endif NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX, const nsPoint& aPoint, @@ -86,10 +87,11 @@ BRFrame::~BRFrame() #ifdef NS_DEBUG NS_IMETHODIMP -BRFrame::Paint(nsIPresContext* aPresContext, +BRFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) { float p2t; diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 2e98e4abac8..8fb3f81429f 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -4969,7 +4969,8 @@ NS_IMETHODIMP nsBlockFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_IS_UNFLOWABLE & mState) { return NS_OK; @@ -5119,10 +5120,11 @@ nsBlockFrame::PaintFloaters(nsIPresContext* aPresContext, } void -nsBlockFrame::PaintChildren(nsIPresContext* aPresContext, +nsBlockFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { #ifdef DEBUG PRInt32 depth = 0; diff --git a/mozilla/layout/html/base/src/nsBlockFrame.h b/mozilla/layout/html/base/src/nsBlockFrame.h index 3c38ecd964d..72977723788 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.h +++ b/mozilla/layout/html/base/src/nsBlockFrame.h @@ -95,7 +95,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameType(nsIAtom** aType) const; #ifdef DEBUG NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; @@ -386,10 +387,11 @@ protected: //---------------------------------------- //XXX - virtual void PaintChildren(nsIPresContext* aPresContext, + virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); void PaintFloaters(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp index 194e71a80d2..418cb5dcfe1 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.cpp +++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp @@ -158,7 +158,8 @@ NS_IMETHODIMP nsBulletFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; diff --git a/mozilla/layout/html/base/src/nsBulletFrame.h b/mozilla/layout/html/base/src/nsBulletFrame.h index e95fbb7ca65..cfda9123376 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.h +++ b/mozilla/layout/html/base/src/nsBulletFrame.h @@ -45,10 +45,11 @@ public: nsIStyleContext* aContext, nsIFrame* aPrevInFlow); NS_IMETHOD Destroy(nsIPresContext* aPresContext); - NS_IMETHOD Paint(nsIPresContext* aCX, + NS_IMETHOD Paint(nsIPresContext* aCX, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameType(nsIAtom** aType) const; #ifdef NS_DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const; diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp index 61926a561c5..e36368e717a 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsContainerFrame.cpp @@ -150,9 +150,10 @@ NS_IMETHODIMP nsContainerFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { - PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags); return NS_OK; } @@ -166,11 +167,12 @@ void nsContainerFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIFrame* kid = mFrames.FirstChild(); while (nsnull != kid) { - PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer); + PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer, aFlags); kid->GetNextSibling(&kid); } } @@ -181,7 +183,8 @@ nsContainerFrame::PaintChild(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIView *pView; aFrame->GetView(aPresContext, &pView); @@ -225,7 +228,7 @@ nsContainerFrame::PaintChild(nsIPresContext* aPresContext, aRenderingContext.Translate(kidRect.x, kidRect.y); // Paint the kid - aFrame->Paint(aPresContext, aRenderingContext, damageArea, aWhichLayer); + aFrame->Paint(aPresContext, aRenderingContext, damageArea, aWhichLayer, aFlags); // don't use PushState and PopState, because they're slow aRenderingContext.Translate(-kidRect.x, -kidRect.y); diff --git a/mozilla/layout/html/base/src/nsContainerFrame.h b/mozilla/layout/html/base/src/nsContainerFrame.h index 0baa4849bef..09030881f8d 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.h +++ b/mozilla/layout/html/base/src/nsContainerFrame.h @@ -54,7 +54,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, nsFramePaintLayer aWhichLayer, @@ -165,13 +166,15 @@ protected: virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); virtual void PaintChild(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Get the frames on the overflow list diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 14410a2af71..b3759ee4769 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -699,7 +699,8 @@ NS_IMETHODIMP nsFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (aWhichLayer != NS_FRAME_PAINT_LAYER_FOREGROUND) return NS_OK; diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index bf978af3073..753c5e710fb 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -196,7 +196,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, nsGUIEvent* aEvent, nsEventStatus* aEventStatus); diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp index c0d0fa392d2..c914ddfcf17 100644 --- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp @@ -558,10 +558,11 @@ nsGfxScrollFrame::GetPadding(nsMargin& aMargin) } NS_IMETHODIMP -nsGfxScrollFrame::Paint(nsIPresContext* aPresContext, +nsGfxScrollFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // Paint our children return nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.h b/mozilla/layout/html/base/src/nsGfxScrollFrame.h index 4580d9baabf..0a2ac38554a 100644 --- a/mozilla/layout/html/base/src/nsGfxScrollFrame.h +++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.h @@ -97,7 +97,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX, const nsPoint& aPoint, diff --git a/mozilla/layout/html/base/src/nsHRFrame.cpp b/mozilla/layout/html/base/src/nsHRFrame.cpp index abe03f48108..a734ac47944 100644 --- a/mozilla/layout/html/base/src/nsHRFrame.cpp +++ b/mozilla/layout/html/base/src/nsHRFrame.cpp @@ -50,10 +50,11 @@ public: nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD GetFrameType(nsIAtom** aType) const; #ifdef DEBUG NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const; @@ -89,7 +90,8 @@ NS_METHOD HRuleFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index 69fc7c95ac8..61bbe9f537c 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -52,10 +52,11 @@ static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); NS_IMETHODIMP -nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, +nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_IS_UNFLOWABLE & mState) { return NS_OK; @@ -93,8 +94,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, // an image to represent this "hidden" element. if (!mFrames.FirstChild()) { - nsFrame::Paint(aPresContext, - aRenderingContext, aDirtyRect, aWhichLayer); + nsFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags); } } } @@ -117,7 +117,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, // override the visibility property and display even if their parent is // hidden - PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags); return NS_OK; } diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.h b/mozilla/layout/html/base/src/nsHTMLContainerFrame.h index 655fed445b2..f59a981486b 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.h +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.h @@ -45,10 +45,11 @@ struct nsStylePosition; // functionality. class nsHTMLContainerFrame : public nsContainerFrame { public: - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Helper method to create next-in-flows if necessary. If aFrame diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index fefa6855f73..0a928227aa1 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -114,10 +114,11 @@ public: return NS_OK; } - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); // nsIScrollPositionListener NS_IMETHOD ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY); @@ -386,10 +387,11 @@ CanvasFrame::DrawDottedRect(nsIRenderingContext& aRenderingContext, nsRect& aRec NS_IMETHODIMP -CanvasFrame::Paint(nsIPresContext* aPresContext, +CanvasFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { SetDefaultBackgroundColor(aPresContext); diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 4efcad16ddc..7e30680dd33 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -936,10 +936,11 @@ nsImageFrame::DisplayAltFeedback(nsIPresContext* aPresContext, } NS_METHOD -nsImageFrame::Paint(nsIPresContext* aPresContext, +nsImageFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && diff --git a/mozilla/layout/html/base/src/nsImageFrame.h b/mozilla/layout/html/base/src/nsImageFrame.h index f33473db4d1..897b3a1cc3d 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.h +++ b/mozilla/layout/html/base/src/nsImageFrame.h @@ -74,10 +74,11 @@ public: nsIFrame* aParent, nsIStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/mozilla/layout/html/base/src/nsLeafFrame.cpp b/mozilla/layout/html/base/src/nsLeafFrame.cpp index 79cdcfd38ec..82ae8533ba7 100644 --- a/mozilla/layout/html/base/src/nsLeafFrame.cpp +++ b/mozilla/layout/html/base/src/nsLeafFrame.cpp @@ -34,10 +34,11 @@ nsLeafFrame::~nsLeafFrame() } NS_IMETHODIMP -nsLeafFrame::Paint(nsIPresContext* aPresContext, +nsLeafFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { PRBool isVisible; diff --git a/mozilla/layout/html/base/src/nsLeafFrame.h b/mozilla/layout/html/base/src/nsLeafFrame.h index 59a2c60cf5d..84e21a2fd98 100644 --- a/mozilla/layout/html/base/src/nsLeafFrame.h +++ b/mozilla/layout/html/base/src/nsLeafFrame.h @@ -34,10 +34,11 @@ class nsLeafFrame : public nsFrame { public: // nsIFrame replacements - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 34173f35ba0..cc5da3ca1bc 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -1514,10 +1514,11 @@ nsObjectFrame::DidReflow(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsObjectFrame::Paint(nsIPresContext* aPresContext, +nsObjectFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* vis = (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); if ((vis != nsnull) && !vis->IsVisibleOrCollapsed()) { diff --git a/mozilla/layout/html/base/src/nsObjectFrame.h b/mozilla/layout/html/base/src/nsObjectFrame.h index ae16ef9162c..a0858dc1739 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.h +++ b/mozilla/layout/html/base/src/nsObjectFrame.h @@ -53,10 +53,11 @@ public: nsReflowStatus& aStatus); NS_IMETHOD DidReflow(nsIPresContext* aPresContext, nsDidReflowStatus aStatus); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, nsGUIEvent* aEvent, diff --git a/mozilla/layout/html/base/src/nsPageFrame.cpp b/mozilla/layout/html/base/src/nsPageFrame.cpp index 00ba09f1f16..f011f41daa9 100644 --- a/mozilla/layout/html/base/src/nsPageFrame.cpp +++ b/mozilla/layout/html/base/src/nsPageFrame.cpp @@ -358,7 +358,8 @@ NS_IMETHODIMP nsPageFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { aRenderingContext.PushState(); PRBool clipEmpty; diff --git a/mozilla/layout/html/base/src/nsPageFrame.h b/mozilla/layout/html/base/src/nsPageFrame.h index a046c118566..9f5be457fa7 100644 --- a/mozilla/layout/html/base/src/nsPageFrame.h +++ b/mozilla/layout/html/base/src/nsPageFrame.h @@ -39,7 +39,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD IsPercentageBase(PRBool& aBase) const; diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp index 1957c72ebc8..018ce3ed703 100644 --- a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp +++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp @@ -74,10 +74,11 @@ nsPlaceholderFrame::GetFrameType(nsIAtom** aType) const #ifdef DEBUG NS_IMETHODIMP -nsPlaceholderFrame::Paint(nsIPresContext* aPresContext, +nsPlaceholderFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) { float p2t; diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.h b/mozilla/layout/html/base/src/nsPlaceholderFrame.h index 1cc76ca4fa0..e56c7d59cbb 100644 --- a/mozilla/layout/html/base/src/nsPlaceholderFrame.h +++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.h @@ -47,10 +47,11 @@ public: // nsIFrame overrides #ifdef DEBUG - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; #endif diff --git a/mozilla/layout/html/base/src/nsScrollFrame.cpp b/mozilla/layout/html/base/src/nsScrollFrame.cpp index 8d8d867cf72..a725eb1ee5d 100644 --- a/mozilla/layout/html/base/src/nsScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsScrollFrame.cpp @@ -973,7 +973,8 @@ NS_IMETHODIMP nsScrollFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { // Only paint the border and background if we're visible diff --git a/mozilla/layout/html/base/src/nsScrollFrame.h b/mozilla/layout/html/base/src/nsScrollFrame.h index 1c04d97700a..60a0ba98cc2 100644 --- a/mozilla/layout/html/base/src/nsScrollFrame.h +++ b/mozilla/layout/html/base/src/nsScrollFrame.h @@ -84,7 +84,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index eeb8ea76098..567238561eb 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -368,10 +368,11 @@ public: NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtrResult); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD GetCursor(nsIPresContext* aPresContext, nsPoint& aPoint, @@ -1350,10 +1351,11 @@ nsTextFrame::ContentChanged(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsTextFrame::Paint(nsIPresContext* aPresContext, +nsTextFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index e7c261fe045..a49f9364882 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -141,10 +141,11 @@ public: NS_IMETHOD GetFrameType(nsIAtom** aType) const; - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD Init(nsIPresContext* aPresContext, nsIContent* aContent, @@ -206,10 +207,11 @@ public: /** * @see nsIFrame::Paint */ - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); /** * @see nsIFrame::Reflow @@ -410,10 +412,11 @@ PRBool nsHTMLFrameOuterFrame::IsInline() } NS_IMETHODIMP -nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext, +nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { @@ -905,7 +908,8 @@ NS_IMETHODIMP nsHTMLFrameInnerFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { //printf("inner paint %X (%d,%d,%d,%d) \n", this, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height); // if there is not web shell paint based on our background color, diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index ea36a1aff76..7c249db0734 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -122,10 +122,11 @@ public: nsPoint& aPoint, PRInt32& aCursor); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, @@ -166,7 +167,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, @@ -648,7 +650,8 @@ NS_IMETHODIMP nsHTMLFramesetFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { //printf("frameset paint %X (%d,%d,%d,%d) \n", this, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height); return nsHTMLContainerFrame::Paint(aPresContext, aRenderingContext, @@ -1671,7 +1674,8 @@ NS_METHOD nsHTMLFramesetBorderFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; @@ -1855,7 +1859,8 @@ NS_METHOD nsHTMLFramesetBlankFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { return NS_OK; diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.h b/mozilla/layout/html/document/src/nsFrameSetFrame.h index b6df0394200..72ff4cff42b 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.h +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.h @@ -139,7 +139,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 62be4c11a29..2b76ef78619 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -2585,10 +2585,11 @@ nsComboboxControlFrame::RestoreState(nsIPresContext* aPresContext, nsIPresState* } NS_METHOD -nsComboboxControlFrame::Paint(nsIPresContext* aPresContext, +nsComboboxControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.h b/mozilla/layout/html/forms/src/nsComboboxControlFrame.h index 2af2a8d30c9..5a60ec2a922 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.h +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.h @@ -107,10 +107,11 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); #ifdef NS_DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const; #endif diff --git a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp index fc1998f81a1..fcc2cf16952 100644 --- a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp @@ -63,10 +63,11 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_METHOD Paint(nsIPresContext* aPresContext, + NS_METHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); NS_IMETHOD AppendFrames(nsIPresContext* aPresContext, nsIPresShell& aPresShell, @@ -149,10 +150,11 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext* aPresContext, // this is identical to nsHTMLContainerFrame::Paint except for the background and border. NS_IMETHODIMP -nsFieldSetFrame::Paint(nsIPresContext* aPresContext, +nsFieldSetFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { // Paint our background and border diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp index 086ef334263..56798d88eea 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp @@ -674,10 +674,11 @@ NS_IMETHODIMP nsFileControlFrame::GetProperty(nsIAtom* aName, nsAWritableString& NS_METHOD -nsFileControlFrame::Paint(nsIPresContext* aPresContext, +nsFileControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.h b/mozilla/layout/html/forms/src/nsFileControlFrame.h index f5536bf327b..d79c19f2b18 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.h +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.h @@ -64,10 +64,11 @@ public: virtual void SetFormFrame(nsFormFrame* aFormFrame) { mFormFrame = aFormFrame; } virtual nsFormFrame* GetFromFrame() { return mFormFrame; } - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); // nsIFormControlFrame NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAReadableString& aValue); diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp index a799515641a..a3ca48cd240 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp @@ -400,10 +400,11 @@ nsFormControlFrame::SetClickPoint(nscoord aX, nscoord aY) // XXX it would be cool if form element used our rendering sw, then // they could be blended, and bordered, and so on... NS_METHOD -nsFormControlFrame::Paint(nsIPresContext* aPresContext, +nsFormControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.h b/mozilla/layout/html/forms/src/nsFormControlFrame.h index 114b39f5083..70d19b4470b 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.h +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.h @@ -96,10 +96,11 @@ public: * Draw this frame within the context of a presentation context and rendering context * @see nsIFrame::Paint */ - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext, nsIAtom* aListName, diff --git a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp index 7239a058198..e02f3df2a94 100644 --- a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp @@ -381,10 +381,11 @@ nsGfxCheckboxControlFrame::PaintMixedMark ( nsIRenderingContext& aRenderingConte //------------------------------------------------------------ NS_METHOD -nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext, +nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h index 0cfa9e9bc6e..a6bd1b29efe 100644 --- a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h +++ b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h @@ -67,10 +67,11 @@ public: PRInt32 aModType, PRInt32 aHint) ; - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); #ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp index d682b2a570c..21e26a6900e 100644 --- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp @@ -331,10 +331,11 @@ nsGfxRadioControlFrame::PaintRadioButton(nsIPresContext* aPresContext, //-------------------------------------------------------------- NS_METHOD -nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext, +nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h index 42f1e19b837..b09327d975d 100644 --- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h +++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h @@ -78,10 +78,11 @@ public: // Expect this code to repackaged and moved to a new location in the future. // - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); virtual void PaintRadioButton(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp index d2253ae70b2..07abf7befd1 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp @@ -2238,10 +2238,11 @@ nsGfxTextControlFrame2::Reflow(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext, +nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h index 3ab33acab55..66615ddc9ba 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h @@ -71,10 +71,11 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); NS_IMETHOD GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp index ba28dc5224c..1888f17f4f3 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp @@ -473,10 +473,11 @@ nsHTMLButtonControlFrame::SetInitialChildList(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext, +nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h index 7ce5100c85b..f6549f3a291 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h @@ -64,10 +64,11 @@ public: NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp index d2668aea130..f2c4265adee 100644 --- a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp +++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp @@ -105,10 +105,11 @@ nsIsIndexFrame::~nsIsIndexFrame() } NS_IMETHODIMP -nsIsIndexFrame::Paint(nsIPresContext* aPresContext, +nsIsIndexFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.h b/mozilla/layout/html/forms/src/nsIsIndexFrame.h index f1a2e82cd1d..9517348b075 100644 --- a/mozilla/layout/html/forms/src/nsIsIndexFrame.h +++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.h @@ -47,10 +47,11 @@ public: nsIsIndexFrame(); virtual ~nsIsIndexFrame(); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); // XXX Hack so we can squirrel away the pres context pointer for the KeyPress method NS_IMETHOD Init(nsIPresContext* aPresContext, diff --git a/mozilla/layout/html/forms/src/nsLegendFrame.cpp b/mozilla/layout/html/forms/src/nsLegendFrame.cpp index 6b069ff1c5b..30847877ded 100644 --- a/mozilla/layout/html/forms/src/nsLegendFrame.cpp +++ b/mozilla/layout/html/forms/src/nsLegendFrame.cpp @@ -105,10 +105,11 @@ nsLegendFrame::Reflow(nsIPresContext* aPresContext, NS_IMETHODIMP -nsLegendFrame::Paint(nsIPresContext* aPresContext, +nsLegendFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/forms/src/nsLegendFrame.h b/mozilla/layout/html/forms/src/nsLegendFrame.h index 76d38bd88f7..df76aaa4937 100644 --- a/mozilla/layout/html/forms/src/nsLegendFrame.h +++ b/mozilla/layout/html/forms/src/nsLegendFrame.h @@ -52,10 +52,11 @@ public: NS_IMETHOD Destroy(nsIPresContext *aPresContext); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); #ifdef NS_DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const; diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp index 9e539fa5c04..0b308a9b751 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp @@ -458,10 +458,11 @@ nsListControlFrame::Destroy(nsIPresContext *aPresContext) } NS_IMETHODIMP -nsListControlFrame::Paint(nsIPresContext* aPresContext, +nsListControlFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIStyleContext* sc = mStyleContext; const nsStyleVisibility* vis = diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.h b/mozilla/layout/html/forms/src/nsListControlFrame.h index dffdfa25fb7..faa9e847378 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.h +++ b/mozilla/layout/html/forms/src/nsListControlFrame.h @@ -194,10 +194,11 @@ public: NS_IMETHOD MoveTo(nsIPresContext* aPresContext, nscoord aX, nscoord aY); NS_IMETHOD Destroy(nsIPresContext *aPresContext); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Get the "type" of the frame diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index e9536eff086..94c56307510 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -295,10 +295,12 @@ nsTableCellFrame::DecorateForSelection(nsIPresContext* aPresContext, return NS_OK; } -NS_METHOD nsTableCellFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableCellFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.h b/mozilla/layout/html/table/src/nsTableCellFrame.h index 728f0b84eb0..b6ea98f0b3b 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.h +++ b/mozilla/layout/html/table/src/nsTableCellFrame.h @@ -105,10 +105,11 @@ public: friend nsresult NS_NewTableCellFrame(nsIPresShell* aPresShell, nsIFrame** aResult); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/html/table/src/nsTableColFrame.cpp b/mozilla/layout/html/table/src/nsTableColFrame.cpp index bfb9b19b45f..9a90aad6225 100644 --- a/mozilla/layout/html/table/src/nsTableColFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColFrame.cpp @@ -101,10 +101,12 @@ void nsTableColFrame::ResetSizingInfo() mConstrainingCell = nsnull; } -NS_METHOD nsTableColFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableColFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/table/src/nsTableColFrame.h b/mozilla/layout/html/table/src/nsTableColFrame.h index c055b49629d..c6a4f643736 100644 --- a/mozilla/layout/html/table/src/nsTableColFrame.h +++ b/mozilla/layout/html/table/src/nsTableColFrame.h @@ -94,10 +94,11 @@ public: nsIStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp index b50114c9ce3..c2357cfae4e 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp @@ -411,10 +411,12 @@ nsTableColGroupFrame::RemoveFrame(nsIPresContext* aPresContext, return NS_OK; } -NS_METHOD nsTableColGroupFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableColGroupFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.h b/mozilla/layout/html/table/src/nsTableColGroupFrame.h index a73f9ecdba8..c9ae0dd9564 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.h +++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.h @@ -97,10 +97,11 @@ public: void RemoveChildrenAtEnd(nsIPresContext& aPresContext, PRInt32 aNumChildrenToRemove); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index 45e0b15b35c..f83fee98042 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -1432,10 +1432,12 @@ nsTableFrame::GetAdditionalChildListName(PRInt32 aIndex, } /* SEC: TODO: adjust the rect for captions */ -NS_METHOD nsTableFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // table paint code is concerned primarily with borders and bg color if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { diff --git a/mozilla/layout/html/table/src/nsTableFrame.h b/mozilla/layout/html/table/src/nsTableFrame.h index 8bd6d3d56db..29c02cb4715 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.h +++ b/mozilla/layout/html/table/src/nsTableFrame.h @@ -266,10 +266,11 @@ public: nsIAtom** aListName) const; /** @see nsIFrame::Paint */ - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp index 747448d2cef..94a4f54497a 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp @@ -315,10 +315,12 @@ nsTableOuterFrame::RemoveFrame(nsIPresContext* aPresContext, return NS_OK; } -NS_METHOD nsTableOuterFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableOuterFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { #ifdef DEBUG // for debug... diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.h b/mozilla/layout/html/table/src/nsTableOuterFrame.h index 4a649b249a0..b4ba23ecce3 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.h +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.h @@ -112,10 +112,11 @@ public: #endif /** @see nsIFrame::Paint */ - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index badae03ada1..20e6fb80fc9 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -452,16 +452,18 @@ PRBool IsFirstRow(nsIPresContext* aPresContext, } #endif -NS_METHOD nsTableRowFrame::Paint(nsIPresContext* aPresContext, +NS_METHOD nsTableRowFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { return NS_OK; } - if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { + if ((NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + !(aFlags && (NS_ROW_FRAME_PAINT_SKIP_ROW == aFlags))) { nsCompatibility mode; aPresContext->GetCompatibilityMode(&mode); if (eCompatibility_Standard == mode) { @@ -487,7 +489,9 @@ NS_METHOD nsTableRowFrame::Paint(nsIPresContext* aPresContext, } #endif - PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + if (!(aFlags && (NS_ROW_FRAME_PAINT_SKIP_CELLS == aFlags))) { + PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + } return NS_OK; } @@ -511,7 +515,8 @@ nsTableRowFrame::GetSkipSides() const void nsTableRowFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIFrame* kid = mFrames.FirstChild(); while (nsnull != kid) { diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.h b/mozilla/layout/html/table/src/nsTableRowFrame.h index a36d08aeec3..1e1b155659e 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.h +++ b/mozilla/layout/html/table/src/nsTableRowFrame.h @@ -33,6 +33,8 @@ class nsReflowTimer; #endif #define NS_TABLE_MAX_ROW_INDEX (1<<19) +#define NS_ROW_FRAME_PAINT_SKIP_ROW 0x00000001 +#define NS_ROW_FRAME_PAINT_SKIP_CELLS 0x00000002 /** * nsTableRowFrame is the frame that maps table rows @@ -83,7 +85,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** ask all children to paint themselves, without clipping (for cells with rowspan>1) @@ -92,7 +95,8 @@ public: virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index e4bf3b57691..916bfbe7056 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -190,33 +190,29 @@ nsTableRowGroupFrame::InitRepeatedFrame(nsIPresContext* aPresContext, NS_METHOD nsTableRowGroupFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { return NS_OK; } - nsresult rv; - if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { - nsCompatibility mode; - aPresContext->GetCompatibilityMode(&mode); - if (eCompatibility_Standard == mode) { - const nsStyleVisibility* vis = - (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); - if (vis->IsVisibleOrCollapsed()) { - const nsStyleBorder* border = - (const nsStyleBorder*)mStyleContext->GetStyleData(eStyleStruct_Border); - const nsStyleBackground* color = - (const nsStyleBackground*)mStyleContext->GetStyleData(eStyleStruct_Background); - nsTableFrame* tableFrame = nsnull; - rv = nsTableFrame::GetTableFrame(this, tableFrame); - if (NS_FAILED(rv) || (nsnull == tableFrame)) { - return rv; - } - nsRect rect(0,0,mRect.width, mRect.height); - nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, - aDirtyRect, rect, *color, *border, 0, 0); - } + + nsCompatibility mode; + aPresContext->GetCompatibilityMode(&mode); + + if ((NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + (eCompatibility_Standard == mode)) { + const nsStyleVisibility* vis = + (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); + if (vis->IsVisibleOrCollapsed()) { + const nsStyleBorder* border = + (const nsStyleBorder*)mStyleContext->GetStyleData(eStyleStruct_Border); + const nsStyleBackground* color = + (const nsStyleBackground*)mStyleContext->GetStyleData(eStyleStruct_Background); + nsRect rect(0,0,mRect.width, mRect.height); + nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, + aDirtyRect, rect, *color, *border, 0, 0); } } @@ -228,7 +224,24 @@ NS_METHOD nsTableRowGroupFrame::Paint(nsIPresContext* aPresContext, } #endif - PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + if ((NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + (eCompatibility_Standard == mode)) { + // paint the backgrouds of the rows, skipping the cells + nsIFrame* kid = mFrames.FirstChild(); + while (kid) { + PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer, NS_ROW_FRAME_PAINT_SKIP_CELLS); + kid->GetNextSibling(&kid); + } + // paint the backgrounds of the cells and their descendants, skipping the rows + kid = mFrames.FirstChild(); + while (kid) { + PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer, NS_ROW_FRAME_PAINT_SKIP_ROW); + kid->GetNextSibling(&kid); + } + } + else { + PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + } return NS_OK; /*nsFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);*/ @@ -255,7 +268,8 @@ nsTableRowGroupFrame::GetSkipSides() const void nsTableRowGroupFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIFrame* kid = GetFirstFrame(); while (nsnull != kid) { diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.h b/mozilla/layout/html/table/src/nsTableRowGroupFrame.h index 1ba63c04f0e..4a7a3a5eaad 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.h +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.h @@ -121,7 +121,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** ask all children to paint themselves, without clipping (for cells with rowspan>1) * @see nsIFrame::Paint @@ -129,7 +130,8 @@ public: virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Find the correct descendant frame. diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp index 251e641de3d..aea5a1fe4cd 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp @@ -880,7 +880,8 @@ NS_IMETHODIMP nsMathMLContainerFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsresult rv = NS_OK; diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h index 4878c212661..d344452aa96 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h @@ -143,7 +143,8 @@ public: Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); // -------------------------------------------------------------------------- // Additional methods diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp index 5a6d727c22f..f063769c5a6 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp @@ -286,7 +286,8 @@ NS_IMETHODIMP nsMathMLmactionFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* visib = NS_STATIC_CAST(const nsStyleVisibility*, mStyleContext->GetStyleData(eStyleStruct_Visibility)); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h index f686e8eddf2..81cc167cca5 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.h @@ -66,7 +66,8 @@ public: Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Place(nsIPresContext* aPresContext, diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp index 4c2474ffabc..a4e4f54410a 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp @@ -209,7 +209,8 @@ NS_IMETHODIMP nsMathMLmfencedFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsresult rv = NS_OK; diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h index 07769885d8c..fcad1fa258e 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h @@ -63,7 +63,8 @@ public: Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); protected: nsMathMLmfencedFrame(); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp index d612c87e240..465298a88e4 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp @@ -157,7 +157,8 @@ NS_IMETHODIMP nsMathMLmfracFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { //////////// // paint the fraction line diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h index b5762259f18..68d2c6b7a6f 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h @@ -88,7 +88,8 @@ public: Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext, diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp index de942217e4b..6dd8d48c56d 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp @@ -116,7 +116,8 @@ NS_IMETHODIMP nsMathMLmoFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsresult rv = NS_OK; if (NS_MATHML_OPERATOR_GET_FORM(mFlags) || diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h index d2ab0db6291..47170afcc0a 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h @@ -58,7 +58,8 @@ public: Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD Reflow(nsIPresContext* aPresContext, diff --git a/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.cpp index a8728f9f831..de7064bb26c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.cpp @@ -83,7 +83,8 @@ NS_METHOD nsMathMLmphantomFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // do nothing, this is not a bug. return NS_OK; diff --git a/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.h index 9076cc8f143..da0fbc5076b 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.h @@ -45,7 +45,8 @@ public: Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); protected: nsMathMLmphantomFrame(); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp index fcb3f35b129..90e8a7259b8 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp @@ -111,7 +111,8 @@ NS_IMETHODIMP nsMathMLmrootFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsresult rv = NS_OK; diff --git a/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.h index 89571060922..999ba78cb53 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.h @@ -78,7 +78,8 @@ public: Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); protected: nsMathMLmrootFrame(); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.cpp index d342e0c4b0d..1a62b32178b 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.cpp @@ -111,7 +111,8 @@ NS_IMETHODIMP nsMathMLmsqrtFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsresult rv = NS_OK; diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.h index 37f2d23b95e..520449adcdd 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmsqrtFrame.h @@ -83,7 +83,8 @@ public: Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext, diff --git a/mozilla/layout/svg/base/src/nsPolygonFrame.cpp b/mozilla/layout/svg/base/src/nsPolygonFrame.cpp index 24cf04411ef..6a241c69f39 100644 --- a/mozilla/layout/svg/base/src/nsPolygonFrame.cpp +++ b/mozilla/layout/svg/base/src/nsPolygonFrame.cpp @@ -331,10 +331,11 @@ NS_METHOD nsPolygonFrame::RenderPoints(nsIRenderingContext& aRenderingContext, // // NS_METHOD -nsPolygonFrame::Paint(nsIPresContext* aPresContext, +nsPolygonFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // if we aren't visible then we are done. diff --git a/mozilla/layout/svg/base/src/nsPolygonFrame.h b/mozilla/layout/svg/base/src/nsPolygonFrame.h index 9f786a35d7d..06dd196aa8e 100644 --- a/mozilla/layout/svg/base/src/nsPolygonFrame.h +++ b/mozilla/layout/svg/base/src/nsPolygonFrame.h @@ -82,10 +82,11 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD RenderPoints(nsIRenderingContext& aRenderingContext, const nsPoint aPoints[], PRInt32 aNumPoints); diff --git a/mozilla/layout/svg/base/src/nsSVGContainerFrame.cpp b/mozilla/layout/svg/base/src/nsSVGContainerFrame.cpp index 3bb1a21d42a..5662532d2c1 100644 --- a/mozilla/layout/svg/base/src/nsSVGContainerFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGContainerFrame.cpp @@ -391,10 +391,11 @@ nsSVGContainerFrame::AttributeChanged(nsIPresContext* aPresContext, NS_IMETHODIMP -nsSVGContainerFrame::Paint ( nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +nsSVGContainerFrame::Paint (nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* visib = (const nsStyleVisibility*) mStyleContext->GetStyleData(eStyleStruct_Visibility); @@ -413,11 +414,12 @@ nsSVGContainerFrame::Paint ( nsIPresContext* aPresContext, // Paint one child frame void -nsSVGContainerFrame::PaintChild(nsIPresContext* aPresContext, +nsSVGContainerFrame::PaintChild(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* visib; aFrame->GetStyleData(eStyleStruct_Visibility, ((const nsStyleStruct *&)visib)); @@ -430,10 +432,11 @@ nsSVGContainerFrame::PaintChild(nsIPresContext* aPresContext, } void -nsSVGContainerFrame::PaintChildren(nsIPresContext* aPresContext, +nsSVGContainerFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); diff --git a/mozilla/layout/svg/base/src/nsSVGContainerFrame.h b/mozilla/layout/svg/base/src/nsSVGContainerFrame.h index b5664c3527d..6e41d437a30 100644 --- a/mozilla/layout/svg/base/src/nsSVGContainerFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGContainerFrame.h @@ -70,10 +70,11 @@ public: PRInt32 aModType, PRInt32 aHint); - NS_IMETHOD Paint ( nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + NS_IMETHOD Paint ( nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); @@ -123,12 +124,14 @@ protected: nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); - virtual void PaintChildren(nsIPresContext* aPresContext, + virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); nsresult GenerateDirtyReflowCommand(nsIPresContext* aPresContext, diff --git a/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp b/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp index c5297081127..6e3c39d9efc 100644 --- a/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp @@ -231,10 +231,11 @@ nsSVGPathFrame::AttributeChanged(nsIPresContext* aPresContext, // // NS_METHOD -nsSVGPathFrame::Paint(nsIPresContext* aPresContext, +nsSVGPathFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* visib = NS_STATIC_CAST(const nsStyleVisibility*, mStyleContext->GetStyleData(eStyleStruct_Visibility)); diff --git a/mozilla/layout/svg/base/src/nsSVGPathFrame.h b/mozilla/layout/svg/base/src/nsSVGPathFrame.h index efcb3fbfff1..58fd57bdf7b 100644 --- a/mozilla/layout/svg/base/src/nsSVGPathFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGPathFrame.h @@ -82,10 +82,11 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index e9536eff086..94c56307510 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -295,10 +295,12 @@ nsTableCellFrame::DecorateForSelection(nsIPresContext* aPresContext, return NS_OK; } -NS_METHOD nsTableCellFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableCellFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/tables/nsTableCellFrame.h b/mozilla/layout/tables/nsTableCellFrame.h index 728f0b84eb0..b6ea98f0b3b 100644 --- a/mozilla/layout/tables/nsTableCellFrame.h +++ b/mozilla/layout/tables/nsTableCellFrame.h @@ -105,10 +105,11 @@ public: friend nsresult NS_NewTableCellFrame(nsIPresShell* aPresShell, nsIFrame** aResult); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/tables/nsTableColFrame.cpp b/mozilla/layout/tables/nsTableColFrame.cpp index bfb9b19b45f..9a90aad6225 100644 --- a/mozilla/layout/tables/nsTableColFrame.cpp +++ b/mozilla/layout/tables/nsTableColFrame.cpp @@ -101,10 +101,12 @@ void nsTableColFrame::ResetSizingInfo() mConstrainingCell = nsnull; } -NS_METHOD nsTableColFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableColFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/tables/nsTableColFrame.h b/mozilla/layout/tables/nsTableColFrame.h index c055b49629d..c6a4f643736 100644 --- a/mozilla/layout/tables/nsTableColFrame.h +++ b/mozilla/layout/tables/nsTableColFrame.h @@ -94,10 +94,11 @@ public: nsIStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index b50114c9ce3..c2357cfae4e 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp @@ -411,10 +411,12 @@ nsTableColGroupFrame::RemoveFrame(nsIPresContext* aPresContext, return NS_OK; } -NS_METHOD nsTableColGroupFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableColGroupFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { diff --git a/mozilla/layout/tables/nsTableColGroupFrame.h b/mozilla/layout/tables/nsTableColGroupFrame.h index a73f9ecdba8..c9ae0dd9564 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.h +++ b/mozilla/layout/tables/nsTableColGroupFrame.h @@ -97,10 +97,11 @@ public: void RemoveChildrenAtEnd(nsIPresContext& aPresContext, PRInt32 aNumChildrenToRemove); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 45e0b15b35c..f83fee98042 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -1432,10 +1432,12 @@ nsTableFrame::GetAdditionalChildListName(PRInt32 aIndex, } /* SEC: TODO: adjust the rect for captions */ -NS_METHOD nsTableFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // table paint code is concerned primarily with borders and bg color if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { diff --git a/mozilla/layout/tables/nsTableFrame.h b/mozilla/layout/tables/nsTableFrame.h index 8bd6d3d56db..29c02cb4715 100644 --- a/mozilla/layout/tables/nsTableFrame.h +++ b/mozilla/layout/tables/nsTableFrame.h @@ -266,10 +266,11 @@ public: nsIAtom** aListName) const; /** @see nsIFrame::Paint */ - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index 747448d2cef..94a4f54497a 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/nsTableOuterFrame.cpp @@ -315,10 +315,12 @@ nsTableOuterFrame::RemoveFrame(nsIPresContext* aPresContext, return NS_OK; } -NS_METHOD nsTableOuterFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +NS_METHOD +nsTableOuterFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { #ifdef DEBUG // for debug... diff --git a/mozilla/layout/tables/nsTableOuterFrame.h b/mozilla/layout/tables/nsTableOuterFrame.h index 4a649b249a0..b4ba23ecce3 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.h +++ b/mozilla/layout/tables/nsTableOuterFrame.h @@ -112,10 +112,11 @@ public: #endif /** @see nsIFrame::Paint */ - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index badae03ada1..20e6fb80fc9 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -452,16 +452,18 @@ PRBool IsFirstRow(nsIPresContext* aPresContext, } #endif -NS_METHOD nsTableRowFrame::Paint(nsIPresContext* aPresContext, +NS_METHOD nsTableRowFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { return NS_OK; } - if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { + if ((NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + !(aFlags && (NS_ROW_FRAME_PAINT_SKIP_ROW == aFlags))) { nsCompatibility mode; aPresContext->GetCompatibilityMode(&mode); if (eCompatibility_Standard == mode) { @@ -487,7 +489,9 @@ NS_METHOD nsTableRowFrame::Paint(nsIPresContext* aPresContext, } #endif - PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + if (!(aFlags && (NS_ROW_FRAME_PAINT_SKIP_CELLS == aFlags))) { + PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + } return NS_OK; } @@ -511,7 +515,8 @@ nsTableRowFrame::GetSkipSides() const void nsTableRowFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIFrame* kid = mFrames.FirstChild(); while (nsnull != kid) { diff --git a/mozilla/layout/tables/nsTableRowFrame.h b/mozilla/layout/tables/nsTableRowFrame.h index a36d08aeec3..1e1b155659e 100644 --- a/mozilla/layout/tables/nsTableRowFrame.h +++ b/mozilla/layout/tables/nsTableRowFrame.h @@ -33,6 +33,8 @@ class nsReflowTimer; #endif #define NS_TABLE_MAX_ROW_INDEX (1<<19) +#define NS_ROW_FRAME_PAINT_SKIP_ROW 0x00000001 +#define NS_ROW_FRAME_PAINT_SKIP_CELLS 0x00000002 /** * nsTableRowFrame is the frame that maps table rows @@ -83,7 +85,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** ask all children to paint themselves, without clipping (for cells with rowspan>1) @@ -92,7 +95,8 @@ public: virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index e4bf3b57691..916bfbe7056 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -190,33 +190,29 @@ nsTableRowGroupFrame::InitRepeatedFrame(nsIPresContext* aPresContext, NS_METHOD nsTableRowGroupFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { PRBool isVisible; if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_FALSE, &isVisible)) && !isVisible) { return NS_OK; } - nsresult rv; - if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { - nsCompatibility mode; - aPresContext->GetCompatibilityMode(&mode); - if (eCompatibility_Standard == mode) { - const nsStyleVisibility* vis = - (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); - if (vis->IsVisibleOrCollapsed()) { - const nsStyleBorder* border = - (const nsStyleBorder*)mStyleContext->GetStyleData(eStyleStruct_Border); - const nsStyleBackground* color = - (const nsStyleBackground*)mStyleContext->GetStyleData(eStyleStruct_Background); - nsTableFrame* tableFrame = nsnull; - rv = nsTableFrame::GetTableFrame(this, tableFrame); - if (NS_FAILED(rv) || (nsnull == tableFrame)) { - return rv; - } - nsRect rect(0,0,mRect.width, mRect.height); - nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, - aDirtyRect, rect, *color, *border, 0, 0); - } + + nsCompatibility mode; + aPresContext->GetCompatibilityMode(&mode); + + if ((NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + (eCompatibility_Standard == mode)) { + const nsStyleVisibility* vis = + (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); + if (vis->IsVisibleOrCollapsed()) { + const nsStyleBorder* border = + (const nsStyleBorder*)mStyleContext->GetStyleData(eStyleStruct_Border); + const nsStyleBackground* color = + (const nsStyleBackground*)mStyleContext->GetStyleData(eStyleStruct_Background); + nsRect rect(0,0,mRect.width, mRect.height); + nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this, + aDirtyRect, rect, *color, *border, 0, 0); } } @@ -228,7 +224,24 @@ NS_METHOD nsTableRowGroupFrame::Paint(nsIPresContext* aPresContext, } #endif - PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + if ((NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + (eCompatibility_Standard == mode)) { + // paint the backgrouds of the rows, skipping the cells + nsIFrame* kid = mFrames.FirstChild(); + while (kid) { + PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer, NS_ROW_FRAME_PAINT_SKIP_CELLS); + kid->GetNextSibling(&kid); + } + // paint the backgrounds of the cells and their descendants, skipping the rows + kid = mFrames.FirstChild(); + while (kid) { + PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer, NS_ROW_FRAME_PAINT_SKIP_ROW); + kid->GetNextSibling(&kid); + } + } + else { + PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); + } return NS_OK; /*nsFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);*/ @@ -255,7 +268,8 @@ nsTableRowGroupFrame::GetSkipSides() const void nsTableRowGroupFrame::PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsIFrame* kid = GetFirstFrame(); while (nsnull != kid) { diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.h b/mozilla/layout/tables/nsTableRowGroupFrame.h index 1ba63c04f0e..4a7a3a5eaad 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.h +++ b/mozilla/layout/tables/nsTableRowGroupFrame.h @@ -121,7 +121,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** ask all children to paint themselves, without clipping (for cells with rowspan>1) * @see nsIFrame::Paint @@ -129,7 +130,8 @@ public: virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Find the correct descendant frame. diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index b0492956f63..08c2b3a93cf 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -1403,10 +1403,11 @@ nsBoxFrameInner::GetDebugPref(nsIPresContext* aPresContext) } NS_IMETHODIMP -nsBoxFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +nsBoxFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* vis = @@ -1485,10 +1486,11 @@ nsBoxFrame::Paint(nsIPresContext* aPresContext, */ void nsBoxFrame::PaintChild(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer) + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsIFrame* aFrame, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* vis; aFrame->GetStyleData(eStyleStruct_Visibility, ((const nsStyleStruct *&)vis)); @@ -1529,9 +1531,10 @@ nsBoxFrame::PaintChild(nsIPresContext* aPresContext, void nsBoxFrame::PaintChildren(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { nsMargin debugBorder; nsMargin debugMargin; diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.h b/mozilla/layout/xul/base/src/nsBoxFrame.h index b8b525645f4..5c00a1ee742 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsBoxFrame.h @@ -174,10 +174,11 @@ public: nsIStyleContext* aStyleContext, PRBool aForce); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); protected: virtual void GetBoxName(nsAutoString& aName); @@ -190,16 +191,18 @@ protected: // Paint one child frame - virtual void PaintChild(nsIPresContext* aPresContext, + virtual void PaintChild(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); - virtual void PaintChildren(nsIPresContext* aPresContext, + virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); virtual PRIntn GetSkipSides() const { return 0; } diff --git a/mozilla/layout/xul/base/src/nsDeckFrame.cpp b/mozilla/layout/xul/base/src/nsDeckFrame.cpp index 40b98b7db96..6c85b1c5aae 100644 --- a/mozilla/layout/xul/base/src/nsDeckFrame.cpp +++ b/mozilla/layout/xul/base/src/nsDeckFrame.cpp @@ -293,10 +293,11 @@ nsDeckFrame::GetSelectedBox() NS_IMETHODIMP -nsDeckFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +nsDeckFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // if a tab is hidden all its children are too. const nsStyleVisibility* vis = diff --git a/mozilla/layout/xul/base/src/nsDeckFrame.h b/mozilla/layout/xul/base/src/nsDeckFrame.h index 0d57edf4a3c..07d68793947 100644 --- a/mozilla/layout/xul/base/src/nsDeckFrame.h +++ b/mozilla/layout/xul/base/src/nsDeckFrame.h @@ -50,10 +50,11 @@ public: NS_IMETHOD DoLayout(nsBoxLayoutState& aState); - NS_IMETHOD Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + NS_IMETHOD Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp index 184fdc22d3f..159da779bdb 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp @@ -305,10 +305,11 @@ nsImageBoxFrame::UpdateImage(nsIPresContext* aPresContext, PRBool& aResize) } NS_IMETHODIMP -nsImageBoxFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +nsImageBoxFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* vis = (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.h b/mozilla/layout/xul/base/src/nsImageBoxFrame.h index 64b945af8c3..0e6b169c552 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.h @@ -87,10 +87,11 @@ public: virtual void UpdateImage(nsIPresContext* aPresContext, PRBool& aResize); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD OnStartDecode(imgIRequest *request, nsIPresContext *cx); NS_IMETHOD OnStartContainer(imgIRequest *request, nsIPresContext *cx, imgIContainer *image); diff --git a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp index 4f986522a77..b623f6002f9 100644 --- a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp @@ -89,10 +89,11 @@ public: nsFramePaintLayer aWhichLayer, nsIFrame** aFrame); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); /** * Get the "type" of the frame @@ -263,10 +264,11 @@ nsRootBoxFrame::GetFrameType(nsIAtom** aType) const } NS_IMETHODIMP -nsRootBoxFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +nsRootBoxFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { SetDefaultBackgroundColor(aPresContext); return nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); diff --git a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp index 79bae2c9dab..3ce51b8c517 100644 --- a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp @@ -618,9 +618,10 @@ nsScrollBoxFrame::GetMaxSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize) NS_IMETHODIMP nsScrollBoxFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { // Only paint the border and background if we're visible diff --git a/mozilla/layout/xul/base/src/nsScrollBoxFrame.h b/mozilla/layout/xul/base/src/nsScrollBoxFrame.h index 433576976c0..ef110687d20 100644 --- a/mozilla/layout/xul/base/src/nsScrollBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsScrollBoxFrame.h @@ -74,7 +74,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); /** * Get the "type" of the frame diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp index 0f721f7d35a..ee48276700b 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -275,10 +275,11 @@ nsSliderFrame::AttributeChanged(nsIPresContext* aPresContext, } NS_IMETHODIMP -nsSliderFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +nsSliderFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // if we are too small to have a thumb don't paint it. nsIBox* thumb; diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.h b/mozilla/layout/xul/base/src/nsSliderFrame.h index 4ae99a0830e..91dd462ce73 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.h +++ b/mozilla/layout/xul/base/src/nsSliderFrame.h @@ -152,10 +152,11 @@ public: NS_IMETHOD Destroy(nsIPresContext* aPresContext); - NS_IMETHOD Paint(nsIPresContext* aPresContext, + NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, diff --git a/mozilla/layout/xul/base/src/nsStackFrame.cpp b/mozilla/layout/xul/base/src/nsStackFrame.cpp index 0f9fc511160..f38c9f13f86 100644 --- a/mozilla/layout/xul/base/src/nsStackFrame.cpp +++ b/mozilla/layout/xul/base/src/nsStackFrame.cpp @@ -178,9 +178,10 @@ nsStackFrame::GetStackedFrameForPoint(nsIPresContext* aPresContext, void nsStackFrame::PaintChildren(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // we need to make sure we paint background then foreground of each child because they // are stacked. Otherwise the foreground of the first child could be on the top of the @@ -194,10 +195,11 @@ nsStackFrame::PaintChildren(nsIPresContext* aPresContext, // Paint one child frame void nsStackFrame::PaintChild(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer) + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsIFrame* aFrame, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // we need to make sure we paint background then foreground of each child because they // are stacked. Otherwise the foreground of the first child could be on the top of the diff --git a/mozilla/layout/xul/base/src/nsStackFrame.h b/mozilla/layout/xul/base/src/nsStackFrame.h index 99e30b8826c..eb50be044c3 100644 --- a/mozilla/layout/xul/base/src/nsStackFrame.h +++ b/mozilla/layout/xul/base/src/nsStackFrame.h @@ -47,16 +47,18 @@ public: #endif // Paint one child frame - virtual void PaintChild(nsIPresContext* aPresContext, + virtual void PaintChild(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsIFrame* aFrame, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); virtual void PaintChildren(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, const nsPoint& aPoint, diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp index 4d9114f0755..f9f8554dea1 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp @@ -238,7 +238,8 @@ NS_IMETHODIMP nsTextBoxFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { const nsStyleVisibility* vis = (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.h b/mozilla/layout/xul/base/src/nsTextBoxFrame.h index 7d196a255cc..577c62a577f 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.h @@ -68,7 +68,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); virtual ~nsTextBoxFrame(); diff --git a/mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp index dce9a4dacf1..7f4f68371aa 100644 --- a/mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp @@ -34,10 +34,11 @@ public: NS_IMETHOD GetBorderAndPadding(nsMargin& aBorderAndPadding); - NS_METHOD Paint(nsIPresContext* aPresContext, + NS_METHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags); #ifdef DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const { @@ -98,10 +99,11 @@ nsTitledBoxFrame::nsTitledBoxFrame(nsIPresShell* aShell):nsBoxFrame(aShell) // this is identical to nsHTMLContainerFrame::Paint except for the background and border. NS_IMETHODIMP -nsTitledBoxFrame::Paint(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) +nsTitledBoxFrame::Paint(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + const nsRect& aDirtyRect, + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { // Paint our background and border diff --git a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp index 0d5fb3c20f7..96f30a2182d 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp @@ -756,7 +756,7 @@ nsXULTreeGroupFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* // NS_IMETHODIMP nsXULTreeGroupFrame :: Paint ( nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer) + const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer, PRUint32 aFlags) { nsresult res = NS_OK; res = nsBoxFrame::Paint ( aPresContext, aRenderingContext, aDirtyRect, aWhichLayer ); diff --git a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.h b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.h index a4ab5ccde9b..e4930358191 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.h +++ b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.h @@ -62,7 +62,7 @@ public: NS_IMETHOD Init ( nsIPresContext* aPresContext, nsIContent* aContent, nsIFrame* aParent, nsIStyleContext* aContext, nsIFrame* aPrevInFlow) ; NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, - const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); + const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer, PRUint32 aFlags = 0); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType, PRInt32 aHint) ; diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp index fcd42f07424..ee6fd54be5d 100644 --- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp @@ -1463,7 +1463,8 @@ nsRect nsOutlinerBodyFrame::GetInnerBox() NS_IMETHODIMP nsOutlinerBodyFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // XXX This trap handles an odd bogus 1 pixel invalidation that we keep getting // when scrolling. diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h index db6ee28725a..ba0a27048fc 100644 --- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h +++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h @@ -235,7 +235,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); // This method paints a specific column background of the outliner. NS_IMETHOD PaintColumn(nsOutlinerColumn* aColumn, diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index fcd42f07424..ee6fd54be5d 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp @@ -1463,7 +1463,8 @@ nsRect nsOutlinerBodyFrame::GetInnerBox() NS_IMETHODIMP nsOutlinerBodyFrame::Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer) + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags) { // XXX This trap handles an odd bogus 1 pixel invalidation that we keep getting // when scrolling. diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h index db6ee28725a..ba0a27048fc 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h @@ -235,7 +235,8 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, - nsFramePaintLayer aWhichLayer); + nsFramePaintLayer aWhichLayer, + PRUint32 aFlags = 0); // This method paints a specific column background of the outliner. NS_IMETHOD PaintColumn(nsOutlinerColumn* aColumn,