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

bug 68998 - added extra param to Paint, PaintChild, PaintChildren used by tables in standard mode. sr=waterson, r=alexsavulov.

Browse Source
This commit is contained in:
karnaze@netscape.com
2001-09-19 12:35:19 +00:00
parent d7046adb91
commit 5b7e018561
173 changed files with 853 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
layout/base/public/nsIFrame.h
View File

@@ -608,7 +608,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) = 0; nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0) = 0;
/** /**
* Event handling of GUI events. * Event handling of GUI events.

7
layout/forms/nsComboboxControlFrame.cpp
View File

@@ -2585,10 +2585,11 @@ nsComboboxControlFrame::RestoreState(nsIPresContext* aPresContext, nsIPresState*
} }
NS_METHOD NS_METHOD
nsComboboxControlFrame::Paint(nsIPresContext* aPresContext, nsComboboxControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/forms/nsComboboxControlFrame.h
View File

@@ -107,10 +107,11 @@ public:
nsGUIEvent* aEvent, nsGUIEvent* aEvent,
nsEventStatus* aEventStatus); nsEventStatus* aEventStatus);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsString& aResult) const; NS_IMETHOD GetFrameName(nsString& aResult) const;
#endif #endif

14
layout/forms/nsFieldSetFrame.cpp
View File

@@ -63,10 +63,11 @@ public:
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus); nsReflowStatus& aStatus);
NS_METHOD Paint(nsIPresContext* aPresContext, NS_METHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD AppendFrames(nsIPresContext* aPresContext, NS_IMETHOD AppendFrames(nsIPresContext* aPresContext,
nsIPresShell& aPresShell, nsIPresShell& aPresShell,
@@ -149,10 +150,11 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext* aPresContext,
// this is identical to nsHTMLContainerFrame::Paint except for the background and border. // this is identical to nsHTMLContainerFrame::Paint except for the background and border.
NS_IMETHODIMP NS_IMETHODIMP
nsFieldSetFrame::Paint(nsIPresContext* aPresContext, nsFieldSetFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
// Paint our background and border // Paint our background and border

7
layout/forms/nsFileControlFrame.cpp
View File

@@ -674,10 +674,11 @@ NS_IMETHODIMP nsFileControlFrame::GetProperty(nsIAtom* aName, nsAWritableString&
NS_METHOD NS_METHOD
nsFileControlFrame::Paint(nsIPresContext* aPresContext, nsFileControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/forms/nsFileControlFrame.h
View File

@@ -64,10 +64,11 @@ public:
virtual void SetFormFrame(nsFormFrame* aFormFrame) { mFormFrame = aFormFrame; } virtual void SetFormFrame(nsFormFrame* aFormFrame) { mFormFrame = aFormFrame; }
virtual nsFormFrame* GetFromFrame() { return mFormFrame; } virtual nsFormFrame* GetFromFrame() { return mFormFrame; }
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
// nsIFormControlFrame // nsIFormControlFrame
NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAReadableString& aValue); NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAReadableString& aValue);

7
layout/forms/nsFormControlFrame.cpp
View File

@@ -400,10 +400,11 @@ nsFormControlFrame::SetClickPoint(nscoord aX, nscoord aY)
// XXX it would be cool if form element used our rendering sw, then // XXX it would be cool if form element used our rendering sw, then
// they could be blended, and bordered, and so on... // they could be blended, and bordered, and so on...
NS_METHOD NS_METHOD
nsFormControlFrame::Paint(nsIPresContext* aPresContext, nsFormControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/forms/nsFormControlFrame.h
View File

@@ -96,10 +96,11 @@ public:
* Draw this frame within the context of a presentation context and rendering context * Draw this frame within the context of a presentation context and rendering context
* @see nsIFrame::Paint * @see nsIFrame::Paint
*/ */
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext, NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext,
nsIAtom* aListName, nsIAtom* aListName,

7
layout/forms/nsGfxCheckboxControlFrame.cpp
View File

@@ -381,10 +381,11 @@ nsGfxCheckboxControlFrame::PaintMixedMark ( nsIRenderingContext& aRenderingConte
//------------------------------------------------------------ //------------------------------------------------------------
NS_METHOD NS_METHOD
nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext, nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/forms/nsGfxCheckboxControlFrame.h
View File

@@ -67,10 +67,11 @@ public:
PRInt32 aModType, PRInt32 aModType,
PRInt32 aHint) ; PRInt32 aHint) ;
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
#ifdef ACCESSIBILITY #ifdef ACCESSIBILITY
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);

7
layout/forms/nsGfxRadioControlFrame.cpp
View File

@@ -331,10 +331,11 @@ nsGfxRadioControlFrame::PaintRadioButton(nsIPresContext* aPresContext,
//-------------------------------------------------------------- //--------------------------------------------------------------
NS_METHOD NS_METHOD
nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext, nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/forms/nsGfxRadioControlFrame.h
View File

@@ -78,10 +78,11 @@ public:
// Expect this code to repackaged and moved to a new location in the future. // 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, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
virtual void PaintRadioButton(nsIPresContext* aPresContext, virtual void PaintRadioButton(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,

7
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@@ -473,10 +473,11 @@ nsHTMLButtonControlFrame::SetInitialChildList(nsIPresContext* aPresContext,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext, nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/forms/nsHTMLButtonControlFrame.h
View File

@@ -64,10 +64,11 @@ public:
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,

7
layout/forms/nsIsIndexFrame.cpp
View File

@@ -105,10 +105,11 @@ nsIsIndexFrame::~nsIsIndexFrame()
} }
NS_IMETHODIMP NS_IMETHODIMP
nsIsIndexFrame::Paint(nsIPresContext* aPresContext, nsIsIndexFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/forms/nsIsIndexFrame.h
View File

@@ -47,10 +47,11 @@ public:
nsIsIndexFrame(); nsIsIndexFrame();
virtual ~nsIsIndexFrame(); virtual ~nsIsIndexFrame();
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
// XXX Hack so we can squirrel away the pres context pointer for the KeyPress method // XXX Hack so we can squirrel away the pres context pointer for the KeyPress method
NS_IMETHOD Init(nsIPresContext* aPresContext, NS_IMETHOD Init(nsIPresContext* aPresContext,

7
layout/forms/nsLegendFrame.cpp
View File

@@ -105,10 +105,11 @@ nsLegendFrame::Reflow(nsIPresContext* aPresContext,
NS_IMETHODIMP NS_IMETHODIMP
nsLegendFrame::Paint(nsIPresContext* aPresContext, nsLegendFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/forms/nsLegendFrame.h
View File

@@ -52,10 +52,11 @@ public:
NS_IMETHOD Destroy(nsIPresContext *aPresContext); NS_IMETHOD Destroy(nsIPresContext *aPresContext);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsString& aResult) const; NS_IMETHOD GetFrameName(nsString& aResult) const;

7
layout/forms/nsListControlFrame.cpp
View File

@@ -458,10 +458,11 @@ nsListControlFrame::Destroy(nsIPresContext *aPresContext)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsListControlFrame::Paint(nsIPresContext* aPresContext, nsListControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
nsIStyleContext* sc = mStyleContext; nsIStyleContext* sc = mStyleContext;
const nsStyleVisibility* vis = const nsStyleVisibility* vis =

7
layout/forms/nsListControlFrame.h
View File

@@ -194,10 +194,11 @@ public:
NS_IMETHOD MoveTo(nsIPresContext* aPresContext, nscoord aX, nscoord aY); NS_IMETHOD MoveTo(nsIPresContext* aPresContext, nscoord aX, nscoord aY);
NS_IMETHOD Destroy(nsIPresContext *aPresContext); NS_IMETHOD Destroy(nsIPresContext *aPresContext);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
/** /**
* Get the "type" of the frame * Get the "type" of the frame

14
layout/generic/nsBRFrame.cpp
View File

@@ -41,10 +41,11 @@ class BRFrame : public nsFrame {
public: public:
// nsIFrame // nsIFrame
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
#endif #endif
NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX, NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX,
const nsPoint& aPoint, const nsPoint& aPoint,
@@ -86,10 +87,11 @@ BRFrame::~BRFrame()
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHODIMP NS_IMETHODIMP
BRFrame::Paint(nsIPresContext* aPresContext, BRFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) { if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
float p2t; float p2t;

10
layout/generic/nsBlockFrame.cpp
View File

@@ -4969,7 +4969,8 @@ NS_IMETHODIMP
nsBlockFrame::Paint(nsIPresContext* aPresContext, nsBlockFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_IS_UNFLOWABLE & mState) { if (NS_FRAME_IS_UNFLOWABLE & mState) {
return NS_OK; return NS_OK;
@@ -5119,10 +5120,11 @@ nsBlockFrame::PaintFloaters(nsIPresContext* aPresContext,
} }
void void
nsBlockFrame::PaintChildren(nsIPresContext* aPresContext, nsBlockFrame::PaintChildren(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
#ifdef DEBUG #ifdef DEBUG
PRInt32 depth = 0; PRInt32 depth = 0;

10
layout/generic/nsBlockFrame.h
View File

@@ -95,7 +95,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
#ifdef DEBUG #ifdef DEBUG
NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const;
@@ -386,10 +387,11 @@ protected:
//---------------------------------------- //----------------------------------------
//XXX //XXX
virtual void PaintChildren(nsIPresContext* aPresContext, virtual void PaintChildren(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
void PaintFloaters(nsIPresContext* aPresContext, void PaintFloaters(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,

3
layout/generic/nsBulletFrame.cpp
View File

@@ -158,7 +158,8 @@ NS_IMETHODIMP
nsBulletFrame::Paint(nsIPresContext* aPresContext, nsBulletFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;

7
layout/generic/nsBulletFrame.h
View File

@@ -45,10 +45,11 @@ public:
nsIStyleContext* aContext, nsIStyleContext* aContext,
nsIFrame* aPrevInFlow); nsIFrame* aPrevInFlow);
NS_IMETHOD Destroy(nsIPresContext* aPresContext); NS_IMETHOD Destroy(nsIPresContext* aPresContext);
NS_IMETHOD Paint(nsIPresContext* aCX, NS_IMETHOD Paint(nsIPresContext* aCX,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsString& aResult) const; NS_IMETHOD GetFrameName(nsString& aResult) const;

15
layout/generic/nsContainerFrame.cpp
View File

@@ -150,9 +150,10 @@ NS_IMETHODIMP
nsContainerFrame::Paint(nsIPresContext* aPresContext, nsContainerFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags);
return NS_OK; return NS_OK;
} }
@@ -166,11 +167,12 @@ void
nsContainerFrame::PaintChildren(nsIPresContext* aPresContext, nsContainerFrame::PaintChildren(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
nsIFrame* kid = mFrames.FirstChild(); nsIFrame* kid = mFrames.FirstChild();
while (nsnull != kid) { while (nsnull != kid) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer); PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer, aFlags);
kid->GetNextSibling(&kid); kid->GetNextSibling(&kid);
} }
} }
@@ -181,7 +183,8 @@ nsContainerFrame::PaintChild(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsIFrame* aFrame, nsIFrame* aFrame,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
nsIView *pView; nsIView *pView;
aFrame->GetView(aPresContext, &pView); aFrame->GetView(aPresContext, &pView);
@@ -225,7 +228,7 @@ nsContainerFrame::PaintChild(nsIPresContext* aPresContext,
aRenderingContext.Translate(kidRect.x, kidRect.y); aRenderingContext.Translate(kidRect.x, kidRect.y);
// Paint the kid // 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 // don't use PushState and PopState, because they're slow
aRenderingContext.Translate(-kidRect.x, -kidRect.y); aRenderingContext.Translate(-kidRect.x, -kidRect.y);

9
layout/generic/nsContainerFrame.h
View File

@@ -54,7 +54,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext,
const nsPoint& aPoint, const nsPoint& aPoint,
nsFramePaintLayer aWhichLayer, nsFramePaintLayer aWhichLayer,
@@ -165,13 +166,15 @@ protected:
virtual void PaintChildren(nsIPresContext* aPresContext, virtual void PaintChildren(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
virtual void PaintChild(nsIPresContext* aPresContext, virtual void PaintChild(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsIFrame* aFrame, nsIFrame* aFrame,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
/** /**
* Get the frames on the overflow list * Get the frames on the overflow list

3
layout/generic/nsFrame.cpp
View File

@@ -699,7 +699,8 @@ NS_IMETHODIMP
nsFrame::Paint(nsIPresContext* aPresContext, nsFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (aWhichLayer != NS_FRAME_PAINT_LAYER_FOREGROUND) if (aWhichLayer != NS_FRAME_PAINT_LAYER_FOREGROUND)
return NS_OK; return NS_OK;

3
layout/generic/nsFrame.h
View File

@@ -196,7 +196,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, NS_IMETHOD HandleEvent(nsIPresContext* aPresContext,
nsGUIEvent* aEvent, nsGUIEvent* aEvent,
nsEventStatus* aEventStatus); nsEventStatus* aEventStatus);

24
layout/generic/nsFrameFrame.cpp
View File

@@ -141,10 +141,11 @@ public:
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD Init(nsIPresContext* aPresContext, NS_IMETHOD Init(nsIPresContext* aPresContext,
nsIContent* aContent, nsIContent* aContent,
@@ -206,10 +207,11 @@ public:
/** /**
* @see nsIFrame::Paint * @see nsIFrame::Paint
*/ */
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
/** /**
* @see nsIFrame::Reflow * @see nsIFrame::Reflow
@@ -410,10 +412,11 @@ PRBool nsHTMLFrameOuterFrame::IsInline()
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext, nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {
@@ -905,7 +908,8 @@ NS_IMETHODIMP
nsHTMLFrameInnerFrame::Paint(nsIPresContext* aPresContext, nsHTMLFrameInnerFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, 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); //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, // if there is not web shell paint based on our background color,

19
layout/generic/nsFrameSetFrame.cpp
View File

@@ -122,10 +122,11 @@ public:
nsPoint& aPoint, nsPoint& aPoint,
PRInt32& aCursor); PRInt32& aCursor);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
@@ -166,7 +167,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
@@ -648,7 +650,8 @@ NS_IMETHODIMP
nsHTMLFramesetFrame::Paint(nsIPresContext* aPresContext, nsHTMLFramesetFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, 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); //printf("frameset paint %X (%d,%d,%d,%d) \n", this, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height);
return nsHTMLContainerFrame::Paint(aPresContext, aRenderingContext, return nsHTMLContainerFrame::Paint(aPresContext, aRenderingContext,
@@ -1671,7 +1674,8 @@ NS_METHOD
nsHTMLFramesetBorderFrame::Paint(nsIPresContext* aPresContext, nsHTMLFramesetBorderFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;
@@ -1855,7 +1859,8 @@ NS_METHOD
nsHTMLFramesetBlankFrame::Paint(nsIPresContext* aPresContext, nsHTMLFramesetBlankFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;

3
layout/generic/nsFrameSetFrame.h
View File

@@ -139,7 +139,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,

5
layout/generic/nsGfxScrollFrame.cpp
View File

@@ -558,10 +558,11 @@ nsGfxScrollFrame::GetPadding(nsMargin& aMargin)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsGfxScrollFrame::Paint(nsIPresContext* aPresContext, nsGfxScrollFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
// Paint our children // Paint our children
return nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, return nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect,

3
layout/generic/nsGfxScrollFrame.h
View File

@@ -97,7 +97,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX, NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX,
const nsPoint& aPoint, const nsPoint& aPoint,

12
layout/generic/nsHTMLContainerFrame.cpp
View File

@@ -52,10 +52,11 @@
static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID);
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_IS_UNFLOWABLE & mState) { if (NS_FRAME_IS_UNFLOWABLE & mState) {
return NS_OK; return NS_OK;
@@ -93,8 +94,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext,
// an image to represent this "hidden" element. // an image to represent this "hidden" element.
if (!mFrames.FirstChild()) if (!mFrames.FirstChild())
{ {
nsFrame::Paint(aPresContext, nsFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags);
aRenderingContext, aDirtyRect, aWhichLayer);
} }
} }
} }
@@ -117,7 +117,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext,
// override the visibility property and display even if their parent is // override the visibility property and display even if their parent is
// hidden // hidden
PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags);
return NS_OK; return NS_OK;
} }

7
layout/generic/nsHTMLContainerFrame.h
View File

@@ -45,10 +45,11 @@ struct nsStylePosition;
// functionality. // functionality.
class nsHTMLContainerFrame : public nsContainerFrame { class nsHTMLContainerFrame : public nsContainerFrame {
public: public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
/** /**
* Helper method to create next-in-flows if necessary. If aFrame * Helper method to create next-in-flows if necessary. If aFrame

14
layout/generic/nsHTMLFrame.cpp
View File

@@ -114,10 +114,11 @@ public:
return NS_OK; return NS_OK;
} }
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
// nsIScrollPositionListener // nsIScrollPositionListener
NS_IMETHOD ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY); NS_IMETHOD ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY);
@@ -386,10 +387,11 @@ CanvasFrame::DrawDottedRect(nsIRenderingContext& aRenderingContext, nsRect& aRec
NS_IMETHODIMP NS_IMETHODIMP
CanvasFrame::Paint(nsIPresContext* aPresContext, CanvasFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
SetDefaultBackgroundColor(aPresContext); SetDefaultBackgroundColor(aPresContext);

3
layout/generic/nsIFrame.h
View File

@@ -608,7 +608,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) = 0; nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0) = 0;
/** /**
* Event handling of GUI events. * Event handling of GUI events.

7
layout/generic/nsImageFrame.cpp
View File

@@ -936,10 +936,11 @@ nsImageFrame::DisplayAltFeedback(nsIPresContext* aPresContext,
} }
NS_METHOD NS_METHOD
nsImageFrame::Paint(nsIPresContext* aPresContext, nsImageFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) &&

7
layout/generic/nsImageFrame.h
View File

@@ -74,10 +74,11 @@ public:
nsIFrame* aParent, nsIFrame* aParent,
nsIStyleContext* aContext, nsIStyleContext* aContext,
nsIFrame* aPrevInFlow); nsIFrame* aPrevInFlow);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,

7
layout/generic/nsLeafFrame.cpp
View File

@@ -34,10 +34,11 @@ nsLeafFrame::~nsLeafFrame()
} }
NS_IMETHODIMP NS_IMETHODIMP
nsLeafFrame::Paint(nsIPresContext* aPresContext, nsLeafFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
PRBool isVisible; PRBool isVisible;

7
layout/generic/nsLeafFrame.h
View File

@@ -34,10 +34,11 @@ class nsLeafFrame : public nsFrame {
public: public:
// nsIFrame replacements // nsIFrame replacements
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,

7
layout/generic/nsObjectFrame.cpp
View File

@@ -1514,10 +1514,11 @@ nsObjectFrame::DidReflow(nsIPresContext* aPresContext,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsObjectFrame::Paint(nsIPresContext* aPresContext, nsObjectFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
const nsStyleVisibility* vis = (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); const nsStyleVisibility* vis = (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility);
if ((vis != nsnull) && !vis->IsVisibleOrCollapsed()) { if ((vis != nsnull) && !vis->IsVisibleOrCollapsed()) {

7
layout/generic/nsObjectFrame.h
View File

@@ -53,10 +53,11 @@ public:
nsReflowStatus& aStatus); nsReflowStatus& aStatus);
NS_IMETHOD DidReflow(nsIPresContext* aPresContext, NS_IMETHOD DidReflow(nsIPresContext* aPresContext,
nsDidReflowStatus aStatus); nsDidReflowStatus aStatus);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, NS_IMETHOD HandleEvent(nsIPresContext* aPresContext,
nsGUIEvent* aEvent, nsGUIEvent* aEvent,

3
layout/generic/nsPageFrame.cpp
View File

@@ -358,7 +358,8 @@ NS_IMETHODIMP
nsPageFrame::Paint(nsIPresContext* aPresContext, nsPageFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
aRenderingContext.PushState(); aRenderingContext.PushState();
PRBool clipEmpty; PRBool clipEmpty;

3
layout/generic/nsPageFrame.h
View File

@@ -39,7 +39,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD IsPercentageBase(PRBool& aBase) const; NS_IMETHOD IsPercentageBase(PRBool& aBase) const;

7
layout/generic/nsPlaceholderFrame.cpp
View File

@@ -74,10 +74,11 @@ nsPlaceholderFrame::GetFrameType(nsIAtom** aType) const
#ifdef DEBUG #ifdef DEBUG
NS_IMETHODIMP NS_IMETHODIMP
nsPlaceholderFrame::Paint(nsIPresContext* aPresContext, nsPlaceholderFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) { if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
float p2t; float p2t;

7
layout/generic/nsPlaceholderFrame.h
View File

@@ -47,10 +47,11 @@ public:
// nsIFrame overrides // nsIFrame overrides
#ifdef DEBUG #ifdef DEBUG
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const;
#endif #endif

14
layout/generic/nsTextFrame.cpp
View File

@@ -368,10 +368,11 @@ public:
NS_IMETHOD QueryInterface(const nsIID& aIID, NS_IMETHOD QueryInterface(const nsIID& aIID,
void** aInstancePtrResult); void** aInstancePtrResult);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD GetCursor(nsIPresContext* aPresContext, NS_IMETHOD GetCursor(nsIPresContext* aPresContext,
nsPoint& aPoint, nsPoint& aPoint,
@@ -1350,10 +1351,11 @@ nsTextFrame::ContentChanged(nsIPresContext* aPresContext,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsTextFrame::Paint(nsIPresContext* aPresContext, nsTextFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;

14
layout/html/base/src/nsBRFrame.cpp
View File

@@ -41,10 +41,11 @@ class BRFrame : public nsFrame {
public: public:
// nsIFrame // nsIFrame
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
#endif #endif
NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX, NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX,
const nsPoint& aPoint, const nsPoint& aPoint,
@@ -86,10 +87,11 @@ BRFrame::~BRFrame()
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHODIMP NS_IMETHODIMP
BRFrame::Paint(nsIPresContext* aPresContext, BRFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) { if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
float p2t; float p2t;

10
layout/html/base/src/nsBlockFrame.cpp
View File

@@ -4969,7 +4969,8 @@ NS_IMETHODIMP
nsBlockFrame::Paint(nsIPresContext* aPresContext, nsBlockFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_IS_UNFLOWABLE & mState) { if (NS_FRAME_IS_UNFLOWABLE & mState) {
return NS_OK; return NS_OK;
@@ -5119,10 +5120,11 @@ nsBlockFrame::PaintFloaters(nsIPresContext* aPresContext,
} }
void void
nsBlockFrame::PaintChildren(nsIPresContext* aPresContext, nsBlockFrame::PaintChildren(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
#ifdef DEBUG #ifdef DEBUG
PRInt32 depth = 0; PRInt32 depth = 0;

10
layout/html/base/src/nsBlockFrame.h
View File

@@ -95,7 +95,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
#ifdef DEBUG #ifdef DEBUG
NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const;
@@ -386,10 +387,11 @@ protected:
//---------------------------------------- //----------------------------------------
//XXX //XXX
virtual void PaintChildren(nsIPresContext* aPresContext, virtual void PaintChildren(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
void PaintFloaters(nsIPresContext* aPresContext, void PaintFloaters(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,

3
layout/html/base/src/nsBulletFrame.cpp
View File

@@ -158,7 +158,8 @@ NS_IMETHODIMP
nsBulletFrame::Paint(nsIPresContext* aPresContext, nsBulletFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;

7
layout/html/base/src/nsBulletFrame.h
View File

@@ -45,10 +45,11 @@ public:
nsIStyleContext* aContext, nsIStyleContext* aContext,
nsIFrame* aPrevInFlow); nsIFrame* aPrevInFlow);
NS_IMETHOD Destroy(nsIPresContext* aPresContext); NS_IMETHOD Destroy(nsIPresContext* aPresContext);
NS_IMETHOD Paint(nsIPresContext* aCX, NS_IMETHOD Paint(nsIPresContext* aCX,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsString& aResult) const; NS_IMETHOD GetFrameName(nsString& aResult) const;

15
layout/html/base/src/nsContainerFrame.cpp
View File

@@ -150,9 +150,10 @@ NS_IMETHODIMP
nsContainerFrame::Paint(nsIPresContext* aPresContext, nsContainerFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags);
return NS_OK; return NS_OK;
} }
@@ -166,11 +167,12 @@ void
nsContainerFrame::PaintChildren(nsIPresContext* aPresContext, nsContainerFrame::PaintChildren(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
nsIFrame* kid = mFrames.FirstChild(); nsIFrame* kid = mFrames.FirstChild();
while (nsnull != kid) { while (nsnull != kid) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer); PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer, aFlags);
kid->GetNextSibling(&kid); kid->GetNextSibling(&kid);
} }
} }
@@ -181,7 +183,8 @@ nsContainerFrame::PaintChild(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsIFrame* aFrame, nsIFrame* aFrame,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
nsIView *pView; nsIView *pView;
aFrame->GetView(aPresContext, &pView); aFrame->GetView(aPresContext, &pView);
@@ -225,7 +228,7 @@ nsContainerFrame::PaintChild(nsIPresContext* aPresContext,
aRenderingContext.Translate(kidRect.x, kidRect.y); aRenderingContext.Translate(kidRect.x, kidRect.y);
// Paint the kid // 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 // don't use PushState and PopState, because they're slow
aRenderingContext.Translate(-kidRect.x, -kidRect.y); aRenderingContext.Translate(-kidRect.x, -kidRect.y);

9
layout/html/base/src/nsContainerFrame.h
View File

@@ -54,7 +54,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext,
const nsPoint& aPoint, const nsPoint& aPoint,
nsFramePaintLayer aWhichLayer, nsFramePaintLayer aWhichLayer,
@@ -165,13 +166,15 @@ protected:
virtual void PaintChildren(nsIPresContext* aPresContext, virtual void PaintChildren(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
virtual void PaintChild(nsIPresContext* aPresContext, virtual void PaintChild(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsIFrame* aFrame, nsIFrame* aFrame,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
/** /**
* Get the frames on the overflow list * Get the frames on the overflow list

3
layout/html/base/src/nsFrame.cpp
View File

@@ -699,7 +699,8 @@ NS_IMETHODIMP
nsFrame::Paint(nsIPresContext* aPresContext, nsFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (aWhichLayer != NS_FRAME_PAINT_LAYER_FOREGROUND) if (aWhichLayer != NS_FRAME_PAINT_LAYER_FOREGROUND)
return NS_OK; return NS_OK;

3
layout/html/base/src/nsFrame.h
View File

@@ -196,7 +196,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, NS_IMETHOD HandleEvent(nsIPresContext* aPresContext,
nsGUIEvent* aEvent, nsGUIEvent* aEvent,
nsEventStatus* aEventStatus); nsEventStatus* aEventStatus);

5
layout/html/base/src/nsGfxScrollFrame.cpp
View File

@@ -558,10 +558,11 @@ nsGfxScrollFrame::GetPadding(nsMargin& aMargin)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsGfxScrollFrame::Paint(nsIPresContext* aPresContext, nsGfxScrollFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
// Paint our children // Paint our children
return nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, return nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect,

3
layout/html/base/src/nsGfxScrollFrame.h
View File

@@ -97,7 +97,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX, NS_IMETHOD GetContentAndOffsetsFromPoint(nsIPresContext* aCX,
const nsPoint& aPoint, const nsPoint& aPoint,

10
layout/html/base/src/nsHRFrame.cpp
View File

@@ -50,10 +50,11 @@ public:
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus); nsReflowStatus& aStatus);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
#ifdef DEBUG #ifdef DEBUG
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
@@ -89,7 +90,8 @@ NS_METHOD
HRuleFrame::Paint(nsIPresContext* aPresContext, HRuleFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;

12
layout/html/base/src/nsHTMLContainerFrame.cpp
View File

@@ -52,10 +52,11 @@
static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID);
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_IS_UNFLOWABLE & mState) { if (NS_FRAME_IS_UNFLOWABLE & mState) {
return NS_OK; return NS_OK;
@@ -93,8 +94,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext,
// an image to represent this "hidden" element. // an image to represent this "hidden" element.
if (!mFrames.FirstChild()) if (!mFrames.FirstChild())
{ {
nsFrame::Paint(aPresContext, nsFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags);
aRenderingContext, aDirtyRect, aWhichLayer);
} }
} }
} }
@@ -117,7 +117,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext,
// override the visibility property and display even if their parent is // override the visibility property and display even if their parent is
// hidden // hidden
PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer); PaintChildren(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, aFlags);
return NS_OK; return NS_OK;
} }

7
layout/html/base/src/nsHTMLContainerFrame.h
View File

@@ -45,10 +45,11 @@ struct nsStylePosition;
// functionality. // functionality.
class nsHTMLContainerFrame : public nsContainerFrame { class nsHTMLContainerFrame : public nsContainerFrame {
public: public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
/** /**
* Helper method to create next-in-flows if necessary. If aFrame * Helper method to create next-in-flows if necessary. If aFrame

14
layout/html/base/src/nsHTMLFrame.cpp
View File

@@ -114,10 +114,11 @@ public:
return NS_OK; return NS_OK;
} }
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
// nsIScrollPositionListener // nsIScrollPositionListener
NS_IMETHOD ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY); NS_IMETHOD ScrollPositionWillChange(nsIScrollableView* aScrollable, nscoord aX, nscoord aY);
@@ -386,10 +387,11 @@ CanvasFrame::DrawDottedRect(nsIRenderingContext& aRenderingContext, nsRect& aRec
NS_IMETHODIMP NS_IMETHODIMP
CanvasFrame::Paint(nsIPresContext* aPresContext, CanvasFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
SetDefaultBackgroundColor(aPresContext); SetDefaultBackgroundColor(aPresContext);

7
layout/html/base/src/nsImageFrame.cpp
View File

@@ -936,10 +936,11 @@ nsImageFrame::DisplayAltFeedback(nsIPresContext* aPresContext,
} }
NS_METHOD NS_METHOD
nsImageFrame::Paint(nsIPresContext* aPresContext, nsImageFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) &&

7
layout/html/base/src/nsImageFrame.h
View File

@@ -74,10 +74,11 @@ public:
nsIFrame* aParent, nsIFrame* aParent,
nsIStyleContext* aContext, nsIStyleContext* aContext,
nsIFrame* aPrevInFlow); nsIFrame* aPrevInFlow);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,

7
layout/html/base/src/nsLeafFrame.cpp
View File

@@ -34,10 +34,11 @@ nsLeafFrame::~nsLeafFrame()
} }
NS_IMETHODIMP NS_IMETHODIMP
nsLeafFrame::Paint(nsIPresContext* aPresContext, nsLeafFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
PRBool isVisible; PRBool isVisible;

7
layout/html/base/src/nsLeafFrame.h
View File

@@ -34,10 +34,11 @@ class nsLeafFrame : public nsFrame {
public: public:
// nsIFrame replacements // nsIFrame replacements
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,

7
layout/html/base/src/nsObjectFrame.cpp
View File

@@ -1514,10 +1514,11 @@ nsObjectFrame::DidReflow(nsIPresContext* aPresContext,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsObjectFrame::Paint(nsIPresContext* aPresContext, nsObjectFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
const nsStyleVisibility* vis = (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility); const nsStyleVisibility* vis = (const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility);
if ((vis != nsnull) && !vis->IsVisibleOrCollapsed()) { if ((vis != nsnull) && !vis->IsVisibleOrCollapsed()) {

7
layout/html/base/src/nsObjectFrame.h
View File

@@ -53,10 +53,11 @@ public:
nsReflowStatus& aStatus); nsReflowStatus& aStatus);
NS_IMETHOD DidReflow(nsIPresContext* aPresContext, NS_IMETHOD DidReflow(nsIPresContext* aPresContext,
nsDidReflowStatus aStatus); nsDidReflowStatus aStatus);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD HandleEvent(nsIPresContext* aPresContext, NS_IMETHOD HandleEvent(nsIPresContext* aPresContext,
nsGUIEvent* aEvent, nsGUIEvent* aEvent,

3
layout/html/base/src/nsPageFrame.cpp
View File

@@ -358,7 +358,8 @@ NS_IMETHODIMP
nsPageFrame::Paint(nsIPresContext* aPresContext, nsPageFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
aRenderingContext.PushState(); aRenderingContext.PushState();
PRBool clipEmpty; PRBool clipEmpty;

3
layout/html/base/src/nsPageFrame.h
View File

@@ -39,7 +39,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD IsPercentageBase(PRBool& aBase) const; NS_IMETHOD IsPercentageBase(PRBool& aBase) const;

7
layout/html/base/src/nsPlaceholderFrame.cpp
View File

@@ -74,10 +74,11 @@ nsPlaceholderFrame::GetFrameType(nsIAtom** aType) const
#ifdef DEBUG #ifdef DEBUG
NS_IMETHODIMP NS_IMETHODIMP
nsPlaceholderFrame::Paint(nsIPresContext* aPresContext, nsPlaceholderFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) { if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
float p2t; float p2t;

7
layout/html/base/src/nsPlaceholderFrame.h
View File

@@ -47,10 +47,11 @@ public:
// nsIFrame overrides // nsIFrame overrides
#ifdef DEBUG #ifdef DEBUG
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const; NS_IMETHOD List(nsIPresContext* aPresContext, FILE* out, PRInt32 aIndent) const;
#endif #endif

3
layout/html/base/src/nsScrollFrame.cpp
View File

@@ -973,7 +973,8 @@ NS_IMETHODIMP
nsScrollFrame::Paint(nsIPresContext* aPresContext, nsScrollFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
// Only paint the border and background if we're visible // Only paint the border and background if we're visible

3
layout/html/base/src/nsScrollFrame.h
View File

@@ -84,7 +84,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext,
const nsPoint& aPoint, const nsPoint& aPoint,

14
layout/html/base/src/nsTextFrame.cpp
View File

@@ -368,10 +368,11 @@ public:
NS_IMETHOD QueryInterface(const nsIID& aIID, NS_IMETHOD QueryInterface(const nsIID& aIID,
void** aInstancePtrResult); void** aInstancePtrResult);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD GetCursor(nsIPresContext* aPresContext, NS_IMETHOD GetCursor(nsIPresContext* aPresContext,
nsPoint& aPoint, nsPoint& aPoint,
@@ -1350,10 +1351,11 @@ nsTextFrame::ContentChanged(nsIPresContext* aPresContext,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsTextFrame::Paint(nsIPresContext* aPresContext, nsTextFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;

24
layout/html/document/src/nsFrameFrame.cpp
View File

@@ -141,10 +141,11 @@ public:
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD Init(nsIPresContext* aPresContext, NS_IMETHOD Init(nsIPresContext* aPresContext,
nsIContent* aContent, nsIContent* aContent,
@@ -206,10 +207,11 @@ public:
/** /**
* @see nsIFrame::Paint * @see nsIFrame::Paint
*/ */
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
/** /**
* @see nsIFrame::Reflow * @see nsIFrame::Reflow
@@ -410,10 +412,11 @@ PRBool nsHTMLFrameOuterFrame::IsInline()
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext, nsHTMLFrameOuterFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {
@@ -905,7 +908,8 @@ NS_IMETHODIMP
nsHTMLFrameInnerFrame::Paint(nsIPresContext* aPresContext, nsHTMLFrameInnerFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, 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); //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, // if there is not web shell paint based on our background color,

19
layout/html/document/src/nsFrameSetFrame.cpp
View File

@@ -122,10 +122,11 @@ public:
nsPoint& aPoint, nsPoint& aPoint,
PRInt32& aCursor); PRInt32& aCursor);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
@@ -166,7 +167,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,
@@ -648,7 +650,8 @@ NS_IMETHODIMP
nsHTMLFramesetFrame::Paint(nsIPresContext* aPresContext, nsHTMLFramesetFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, 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); //printf("frameset paint %X (%d,%d,%d,%d) \n", this, aDirtyRect.x, aDirtyRect.y, aDirtyRect.width, aDirtyRect.height);
return nsHTMLContainerFrame::Paint(aPresContext, aRenderingContext, return nsHTMLContainerFrame::Paint(aPresContext, aRenderingContext,
@@ -1671,7 +1674,8 @@ NS_METHOD
nsHTMLFramesetBorderFrame::Paint(nsIPresContext* aPresContext, nsHTMLFramesetBorderFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;
@@ -1855,7 +1859,8 @@ NS_METHOD
nsHTMLFramesetBlankFrame::Paint(nsIPresContext* aPresContext, nsHTMLFramesetBlankFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) { if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
return NS_OK; return NS_OK;

3
layout/html/document/src/nsFrameSetFrame.h
View File

@@ -139,7 +139,8 @@ public:
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,

7
layout/html/forms/src/nsComboboxControlFrame.cpp
View File

@@ -2585,10 +2585,11 @@ nsComboboxControlFrame::RestoreState(nsIPresContext* aPresContext, nsIPresState*
} }
NS_METHOD NS_METHOD
nsComboboxControlFrame::Paint(nsIPresContext* aPresContext, nsComboboxControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsComboboxControlFrame.h
View File

@@ -107,10 +107,11 @@ public:
nsGUIEvent* aEvent, nsGUIEvent* aEvent,
nsEventStatus* aEventStatus); nsEventStatus* aEventStatus);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsString& aResult) const; NS_IMETHOD GetFrameName(nsString& aResult) const;
#endif #endif

14
layout/html/forms/src/nsFieldSetFrame.cpp
View File

@@ -63,10 +63,11 @@ public:
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus); nsReflowStatus& aStatus);
NS_METHOD Paint(nsIPresContext* aPresContext, NS_METHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags);
NS_IMETHOD AppendFrames(nsIPresContext* aPresContext, NS_IMETHOD AppendFrames(nsIPresContext* aPresContext,
nsIPresShell& aPresShell, nsIPresShell& aPresShell,
@@ -149,10 +150,11 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext* aPresContext,
// this is identical to nsHTMLContainerFrame::Paint except for the background and border. // this is identical to nsHTMLContainerFrame::Paint except for the background and border.
NS_IMETHODIMP NS_IMETHODIMP
nsFieldSetFrame::Paint(nsIPresContext* aPresContext, nsFieldSetFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
// Paint our background and border // Paint our background and border

7
layout/html/forms/src/nsFileControlFrame.cpp
View File

@@ -674,10 +674,11 @@ NS_IMETHODIMP nsFileControlFrame::GetProperty(nsIAtom* aName, nsAWritableString&
NS_METHOD NS_METHOD
nsFileControlFrame::Paint(nsIPresContext* aPresContext, nsFileControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsFileControlFrame.h
View File

@@ -64,10 +64,11 @@ public:
virtual void SetFormFrame(nsFormFrame* aFormFrame) { mFormFrame = aFormFrame; } virtual void SetFormFrame(nsFormFrame* aFormFrame) { mFormFrame = aFormFrame; }
virtual nsFormFrame* GetFromFrame() { return mFormFrame; } virtual nsFormFrame* GetFromFrame() { return mFormFrame; }
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
// nsIFormControlFrame // nsIFormControlFrame
NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAReadableString& aValue); NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAReadableString& aValue);

7
layout/html/forms/src/nsFormControlFrame.cpp
View File

@@ -400,10 +400,11 @@ nsFormControlFrame::SetClickPoint(nscoord aX, nscoord aY)
// XXX it would be cool if form element used our rendering sw, then // XXX it would be cool if form element used our rendering sw, then
// they could be blended, and bordered, and so on... // they could be blended, and bordered, and so on...
NS_METHOD NS_METHOD
nsFormControlFrame::Paint(nsIPresContext* aPresContext, nsFormControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsFormControlFrame.h
View File

@@ -96,10 +96,11 @@ public:
* Draw this frame within the context of a presentation context and rendering context * Draw this frame within the context of a presentation context and rendering context
* @see nsIFrame::Paint * @see nsIFrame::Paint
*/ */
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext, NS_IMETHOD SetInitialChildList(nsIPresContext* aPresContext,
nsIAtom* aListName, nsIAtom* aListName,

7
layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
View File

@@ -381,10 +381,11 @@ nsGfxCheckboxControlFrame::PaintMixedMark ( nsIRenderingContext& aRenderingConte
//------------------------------------------------------------ //------------------------------------------------------------
NS_METHOD NS_METHOD
nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext, nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsGfxCheckboxControlFrame.h
View File

@@ -67,10 +67,11 @@ public:
PRInt32 aModType, PRInt32 aModType,
PRInt32 aHint) ; PRInt32 aHint) ;
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
#ifdef ACCESSIBILITY #ifdef ACCESSIBILITY
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);

7
layout/html/forms/src/nsGfxRadioControlFrame.cpp
View File

@@ -331,10 +331,11 @@ nsGfxRadioControlFrame::PaintRadioButton(nsIPresContext* aPresContext,
//-------------------------------------------------------------- //--------------------------------------------------------------
NS_METHOD NS_METHOD
nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext, nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsGfxRadioControlFrame.h
View File

@@ -78,10 +78,11 @@ public:
// Expect this code to repackaged and moved to a new location in the future. // 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, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
virtual void PaintRadioButton(nsIPresContext* aPresContext, virtual void PaintRadioButton(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,

7
layout/html/forms/src/nsGfxTextControlFrame2.cpp
View File

@@ -2238,10 +2238,11 @@ nsGfxTextControlFrame2::Reflow(nsIPresContext* aPresContext,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext, nsGfxTextControlFrame2::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsGfxTextControlFrame2.h
View File

@@ -71,10 +71,11 @@ public:
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus); nsReflowStatus& aStatus);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); NS_IMETHOD GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize);
NS_IMETHOD GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); NS_IMETHOD GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize);

7
layout/html/forms/src/nsHTMLButtonControlFrame.cpp
View File

@@ -473,10 +473,11 @@ nsHTMLButtonControlFrame::SetInitialChildList(nsIPresContext* aPresContext,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext, nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsHTMLButtonControlFrame.h
View File

@@ -64,10 +64,11 @@ public:
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD Reflow(nsIPresContext* aPresContext, NS_IMETHOD Reflow(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize, nsHTMLReflowMetrics& aDesiredSize,

7
layout/html/forms/src/nsIsIndexFrame.cpp
View File

@@ -105,10 +105,11 @@ nsIsIndexFrame::~nsIsIndexFrame()
} }
NS_IMETHODIMP NS_IMETHODIMP
nsIsIndexFrame::Paint(nsIPresContext* aPresContext, nsIsIndexFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsIsIndexFrame.h
View File

@@ -47,10 +47,11 @@ public:
nsIsIndexFrame(); nsIsIndexFrame();
virtual ~nsIsIndexFrame(); virtual ~nsIsIndexFrame();
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
// XXX Hack so we can squirrel away the pres context pointer for the KeyPress method // XXX Hack so we can squirrel away the pres context pointer for the KeyPress method
NS_IMETHOD Init(nsIPresContext* aPresContext, NS_IMETHOD Init(nsIPresContext* aPresContext,

7
layout/html/forms/src/nsLegendFrame.cpp
View File

@@ -105,10 +105,11 @@ nsLegendFrame::Reflow(nsIPresContext* aPresContext,
NS_IMETHODIMP NS_IMETHODIMP
nsLegendFrame::Paint(nsIPresContext* aPresContext, nsLegendFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
PRBool isVisible; PRBool isVisible;
if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) { if (NS_SUCCEEDED(IsVisibleForPainting(aPresContext, aRenderingContext, PR_TRUE, &isVisible)) && !isVisible) {

7
layout/html/forms/src/nsLegendFrame.h
View File

@@ -52,10 +52,11 @@ public:
NS_IMETHOD Destroy(nsIPresContext *aPresContext); NS_IMETHOD Destroy(nsIPresContext *aPresContext);
NS_IMETHOD Paint(nsIPresContext* aPresContext, NS_IMETHOD Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer); nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
#ifdef NS_DEBUG #ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsString& aResult) const; NS_IMETHOD GetFrameName(nsString& aResult) const;

7
layout/html/forms/src/nsListControlFrame.cpp
View File

@@ -458,10 +458,11 @@ nsListControlFrame::Destroy(nsIPresContext *aPresContext)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsListControlFrame::Paint(nsIPresContext* aPresContext, nsListControlFrame::Paint(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext, nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer) nsFramePaintLayer aWhichLayer,
PRUint32 aFlags)
{ {
nsIStyleContext* sc = mStyleContext; nsIStyleContext* sc = mStyleContext;
const nsStyleVisibility* vis = const nsStyleVisibility* vis =

Some files were not shown because too many files have changed in this diff Show More