From c84deb6d8c1d1e1df8de4a49f476bebc5be2ba93 Mon Sep 17 00:00:00 2001 From: "pierre%netscape.com" Date: Fri, 17 Mar 2000 10:15:13 +0000 Subject: [PATCH] Fix 32199 (visibility:collapse is not being interpreted as hidden on block and inline level elements) and parts of 21701 (misuse of style attr mVisible). In the following files, replacing disp->mVisible with disp->IsVisible() is a BUG FIX: nsBlockFrame, nsBulletFrame, nsHRFrame, nsHTMLContainerFrame, nsImageFrame, nsTextFrame. In all the other files, replacing disp->mVisible with disp->IsVisible() or disp->IsVisibleOrCollapsed() is merely a SYNTACTICAL CHANGE. The respective owners will later review the use of IsVisibleOrCollapsed() and in some cases replace it with IsVisible(). See bug 21701. git-svn-id: svn://10.0.0.236/trunk@63284 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/public/nsIStyleContext.h | 9 +++++++++ mozilla/layout/forms/nsFieldSetFrame.cpp | 2 +- mozilla/layout/forms/nsFormControlFrame.cpp | 2 +- mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp | 2 +- mozilla/layout/forms/nsGfxRadioControlFrame.cpp | 2 +- mozilla/layout/forms/nsHTMLButtonControlFrame.cpp | 2 +- mozilla/layout/forms/nsListControlFrame.cpp | 2 +- mozilla/layout/generic/nsBlockFrame.cpp | 2 +- mozilla/layout/generic/nsBlockReflowState.cpp | 2 +- mozilla/layout/generic/nsBlockReflowState.h | 2 +- mozilla/layout/generic/nsBulletFrame.cpp | 2 +- mozilla/layout/generic/nsFrameFrame.cpp | 4 ++-- mozilla/layout/generic/nsHTMLContainerFrame.cpp | 2 +- mozilla/layout/generic/nsImageFrame.cpp | 2 +- mozilla/layout/generic/nsLeafFrame.cpp | 2 +- mozilla/layout/generic/nsObjectFrame.cpp | 2 +- mozilla/layout/generic/nsTextFrame.cpp | 2 +- mozilla/layout/html/base/src/nsBlockFrame.cpp | 2 +- mozilla/layout/html/base/src/nsBlockReflowState.cpp | 2 +- mozilla/layout/html/base/src/nsBlockReflowState.h | 2 +- mozilla/layout/html/base/src/nsBulletFrame.cpp | 2 +- mozilla/layout/html/base/src/nsHRFrame.cpp | 2 +- mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp | 2 +- mozilla/layout/html/base/src/nsImageFrame.cpp | 2 +- mozilla/layout/html/base/src/nsLeafFrame.cpp | 2 +- mozilla/layout/html/base/src/nsObjectFrame.cpp | 2 +- mozilla/layout/html/base/src/nsScrollFrame.cpp | 4 ++-- mozilla/layout/html/base/src/nsScrollPortFrame.cpp | 4 ++-- mozilla/layout/html/base/src/nsTextFrame.cpp | 2 +- mozilla/layout/html/document/src/nsFrameFrame.cpp | 4 ++-- mozilla/layout/html/forms/src/nsFieldSetFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsFormControlFrame.cpp | 2 +- .../layout/html/forms/src/nsGfxCheckboxControlFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp | 4 ++-- .../layout/html/forms/src/nsHTMLButtonControlFrame.cpp | 2 +- mozilla/layout/html/forms/src/nsListControlFrame.cpp | 2 +- mozilla/layout/html/table/src/nsTableCellFrame.cpp | 2 +- mozilla/layout/html/table/src/nsTableColFrame.cpp | 2 +- mozilla/layout/html/table/src/nsTableColGroupFrame.cpp | 2 +- mozilla/layout/html/table/src/nsTableFrame.cpp | 2 +- mozilla/layout/html/table/src/nsTableRowFrame.cpp | 2 +- mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp | 2 +- mozilla/layout/tables/nsTableCellFrame.cpp | 2 +- mozilla/layout/tables/nsTableColFrame.cpp | 2 +- mozilla/layout/tables/nsTableColGroupFrame.cpp | 2 +- mozilla/layout/tables/nsTableFrame.cpp | 2 +- mozilla/layout/tables/nsTableRowFrame.cpp | 2 +- mozilla/layout/tables/nsTableRowGroupFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsBoxFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsColorPickerFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsDeckFrame.cpp | 4 ++-- mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsSliderFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsToolboxFrame.cpp | 2 +- mozilla/layout/xul/base/src/nsXULTextFrame.cpp | 2 +- 59 files changed, 73 insertions(+), 64 deletions(-) diff --git a/mozilla/layout/base/public/nsIStyleContext.h b/mozilla/layout/base/public/nsIStyleContext.h index 526c27e830c..7114c037350 100644 --- a/mozilla/layout/base/public/nsIStyleContext.h +++ b/mozilla/layout/base/public/nsIStyleContext.h @@ -204,6 +204,15 @@ struct nsStyleDisplay : public nsStyleStruct { PRBool IsFloating() const { return NS_STYLE_FLOAT_NONE != mFloats; } + + PRBool IsVisible() const { + return (mVisible == NS_STYLE_VISIBILITY_VISIBLE); + } + + PRBool IsVisibleOrCollapsed() const { + return ((mVisible == NS_STYLE_VISIBILITY_VISIBLE) || + (mVisible == NS_STYLE_VISIBILITY_COLLAPSE)); + } }; struct nsStyleTable: public nsStyleStruct { diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp index eac7473c8c9..c58db576cb9 100644 --- a/mozilla/layout/forms/nsFieldSetFrame.cpp +++ b/mozilla/layout/forms/nsFieldSetFrame.cpp @@ -143,7 +143,7 @@ nsFieldSetFrame::Paint(nsIPresContext* aPresContext, const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible == NS_STYLE_VISIBILITY_VISIBLE && mRect.width && mRect.height) { + if (disp->IsVisible() && mRect.width && mRect.height) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp index f05865520a6..a8b82979c39 100644 --- a/mozilla/layout/forms/nsFormControlFrame.cpp +++ b/mozilla/layout/forms/nsFormControlFrame.cpp @@ -344,7 +344,7 @@ nsFormControlFrame::DidReflow(nsIPresContext* aPresContext, if (view) { const nsStyleDisplay* display; GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - nsViewVisibility newVis = NS_STYLE_VISIBILITY_VISIBLE == display->mVisible ? nsViewVisibility_kShow : nsViewVisibility_kHide; + nsViewVisibility newVis = display->IsVisible() ? nsViewVisibility_kShow : nsViewVisibility_kHide; nsViewVisibility oldVis; // only change if different. view->GetVisibility(oldVis); diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp index 423eac39b71..45f5fa758f3 100644 --- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp @@ -306,7 +306,7 @@ nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE) + if (!disp->IsVisible()) return NS_OK; // Paint the background diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp index cf59ee56913..1c45f866b56 100644 --- a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp @@ -286,7 +286,7 @@ nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE) + if (!disp->IsVisible()) return NS_OK; // Paint the background diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index 9c2e43994d1..70ca4bd8013 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -432,7 +432,7 @@ nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible == NS_STYLE_VISIBILITY_VISIBLE) + if (disp->IsVisible()) { nsRect rect(0, 0, mRect.width, mRect.height); mRenderer.PaintButton(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, rect); diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index 08f5cae2e3f..3641071c0b1 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -2666,7 +2666,7 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent) } const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE) { + if (!disp->IsVisible()) { return NS_OK; } diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 88d661ca993..c38079d1861 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -5814,7 +5814,7 @@ nsBlockFrame::Paint(nsIPresContext* aPresContext, } // Only paint the border and background if we're visible - if (disp->mVisible && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + if (disp->IsVisible() && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && (0 != mRect.width) && (0 != mRect.height)) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 88d661ca993..c38079d1861 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -5814,7 +5814,7 @@ nsBlockFrame::Paint(nsIPresContext* aPresContext, } // Only paint the border and background if we're visible - if (disp->mVisible && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + if (disp->IsVisible() && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && (0 != mRect.width) && (0 != mRect.height)) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 88d661ca993..c38079d1861 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -5814,7 +5814,7 @@ nsBlockFrame::Paint(nsIPresContext* aPresContext, } // Only paint the border and background if we're visible - if (disp->mVisible && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + if (disp->IsVisible() && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && (0 != mRect.width) && (0 != mRect.height)) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index 22047884de2..eff5f701ac3 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -120,7 +120,7 @@ nsBulletFrame::Paint(nsIPresContext* aCX, const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisible()) { const nsStyleList* myList = (const nsStyleList*)mStyleContext->GetStyleData(eStyleStruct_List); PRUint8 listStyleType = myList->mListStyleType; diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index 842fdd130b1..b33ba64a81c 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -673,7 +673,7 @@ nsHTMLFrameInnerFrame::DidReflow(nsIPresContext* aPresContext, if (view) { const nsStyleDisplay* display; GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - nsViewVisibility newVis = NS_STYLE_VISIBILITY_VISIBLE == display->mVisible ? nsViewVisibility_kShow : nsViewVisibility_kHide; + nsViewVisibility newVis = display->IsVisible() ? nsViewVisibility_kShow : nsViewVisibility_kHide; nsViewVisibility oldVis; // only change if different. view->GetVisibility(oldVis); @@ -834,7 +834,7 @@ nsHTMLFrameInnerFrame::CreateDocShell(nsIPresContext* aPresContext, // if the visibility is hidden, reflect that in the view const nsStyleDisplay* display; GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - if (NS_STYLE_VISIBILITY_VISIBLE != display->mVisible) { + if (!display->IsVisible()) { view->SetVisibility(nsViewVisibility_kHide); } diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index 023766d77ee..58de574e25b 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -64,7 +64,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible && mRect.width && mRect.height) { + if (disp->IsVisible() && mRect.width && mRect.height) { // Paint our background and border PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 2d2f7553212..778257704f6 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -468,7 +468,7 @@ nsImageFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible && mRect.width && mRect.height) { + if (disp->IsVisible() && mRect.width && mRect.height) { if (NS_STYLE_OVERFLOW_HIDDEN == disp->mOverflow) { aRenderingContext.PushState(); SetClipRect(aRenderingContext); diff --git a/mozilla/layout/generic/nsLeafFrame.cpp b/mozilla/layout/generic/nsLeafFrame.cpp index 34f3966eb6d..7d3944a73fd 100644 --- a/mozilla/layout/generic/nsLeafFrame.cpp +++ b/mozilla/layout/generic/nsLeafFrame.cpp @@ -42,7 +42,7 @@ nsLeafFrame::Paint(nsIPresContext* aPresContext, if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleColor* myColor = (const nsStyleColor*) mStyleContext->GetStyleData(eStyleStruct_Color); const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 2367b784ecc..e8a72ac7b05 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -1207,7 +1207,7 @@ nsObjectFrame::Paint(nsIPresContext* aPresContext, nsFramePaintLayer aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if ((disp != nsnull) && !disp->mVisible) + if ((disp != nsnull) && !disp->IsVisibleOrCollapsed()) { return NS_OK; } diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 98ffd986461..1e9514f3a81 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -817,7 +817,7 @@ nsTextFrame::Paint(nsIPresContext* aPresContext, nsIStyleContext* sc = mStyleContext; const nsStyleDisplay* disp = (const nsStyleDisplay*) sc->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisible()) { TextStyle ts(aPresContext, aRenderingContext, mStyleContext); if (ts.mSmallCaps || (0 != ts.mWordSpacing) || (0 != ts.mLetterSpacing)) { PaintTextSlowly(aPresContext, aRenderingContext, sc, ts, 0, 0); diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 88d661ca993..c38079d1861 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -5814,7 +5814,7 @@ nsBlockFrame::Paint(nsIPresContext* aPresContext, } // Only paint the border and background if we're visible - if (disp->mVisible && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + if (disp->IsVisible() && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && (0 != mRect.width) && (0 != mRect.height)) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 88d661ca993..c38079d1861 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -5814,7 +5814,7 @@ nsBlockFrame::Paint(nsIPresContext* aPresContext, } // Only paint the border and background if we're visible - if (disp->mVisible && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + if (disp->IsVisible() && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && (0 != mRect.width) && (0 != mRect.height)) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 88d661ca993..c38079d1861 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -5814,7 +5814,7 @@ nsBlockFrame::Paint(nsIPresContext* aPresContext, } // Only paint the border and background if we're visible - if (disp->mVisible && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && + if (disp->IsVisible() && (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) && (0 != mRect.width) && (0 != mRect.height)) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp index 22047884de2..eff5f701ac3 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.cpp +++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp @@ -120,7 +120,7 @@ nsBulletFrame::Paint(nsIPresContext* aCX, const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisible()) { const nsStyleList* myList = (const nsStyleList*)mStyleContext->GetStyleData(eStyleStruct_List); PRUint8 listStyleType = myList->mListStyleType; diff --git a/mozilla/layout/html/base/src/nsHRFrame.cpp b/mozilla/layout/html/base/src/nsHRFrame.cpp index b9bec93239a..54d3d3ad939 100644 --- a/mozilla/layout/html/base/src/nsHRFrame.cpp +++ b/mozilla/layout/html/base/src/nsHRFrame.cpp @@ -99,7 +99,7 @@ HRuleFrame::Paint(nsIPresContext* aPresContext, const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (!disp->mVisible) { + if (!disp->IsVisible()) { return NS_OK; } diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index 023766d77ee..58de574e25b 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -64,7 +64,7 @@ nsHTMLContainerFrame::Paint(nsIPresContext* aPresContext, if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible && mRect.width && mRect.height) { + if (disp->IsVisible() && mRect.width && mRect.height) { // Paint our background and border PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 2d2f7553212..778257704f6 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -468,7 +468,7 @@ nsImageFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible && mRect.width && mRect.height) { + if (disp->IsVisible() && mRect.width && mRect.height) { if (NS_STYLE_OVERFLOW_HIDDEN == disp->mOverflow) { aRenderingContext.PushState(); SetClipRect(aRenderingContext); diff --git a/mozilla/layout/html/base/src/nsLeafFrame.cpp b/mozilla/layout/html/base/src/nsLeafFrame.cpp index 34f3966eb6d..7d3944a73fd 100644 --- a/mozilla/layout/html/base/src/nsLeafFrame.cpp +++ b/mozilla/layout/html/base/src/nsLeafFrame.cpp @@ -42,7 +42,7 @@ nsLeafFrame::Paint(nsIPresContext* aPresContext, if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleColor* myColor = (const nsStyleColor*) mStyleContext->GetStyleData(eStyleStruct_Color); const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 2367b784ecc..e8a72ac7b05 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -1207,7 +1207,7 @@ nsObjectFrame::Paint(nsIPresContext* aPresContext, nsFramePaintLayer aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if ((disp != nsnull) && !disp->mVisible) + if ((disp != nsnull) && !disp->IsVisibleOrCollapsed()) { return NS_OK; } diff --git a/mozilla/layout/html/base/src/nsScrollFrame.cpp b/mozilla/layout/html/base/src/nsScrollFrame.cpp index 16f53b22bb1..740b578a256 100644 --- a/mozilla/layout/html/base/src/nsScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsScrollFrame.cpp @@ -329,7 +329,7 @@ nsScrollFrame::CreateScrollingView(nsIPresContext* aPresContext) } // Initialize the scrolling view - view->Init(viewManager, mRect, parentView, nsnull, display->mVisible == NS_STYLE_VISIBILITY_VISIBLE? + view->Init(viewManager, mRect, parentView, nsnull, display->IsVisible()? nsViewVisibility_kShow : nsViewVisibility_kHide); // Insert the view into the view hierarchy @@ -826,7 +826,7 @@ nsScrollFrame::Paint(nsIPresContext* aPresContext, const nsStyleDisplay* display = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (display->mVisible == NS_STYLE_VISIBILITY_VISIBLE) { + if (display->IsVisible()) { // Paint our border only (no background) const nsStyleSpacing* spacing = (const nsStyleSpacing*) mStyleContext->GetStyleData(eStyleStruct_Spacing); diff --git a/mozilla/layout/html/base/src/nsScrollPortFrame.cpp b/mozilla/layout/html/base/src/nsScrollPortFrame.cpp index c2400105796..d889af03c03 100644 --- a/mozilla/layout/html/base/src/nsScrollPortFrame.cpp +++ b/mozilla/layout/html/base/src/nsScrollPortFrame.cpp @@ -273,7 +273,7 @@ nsScrollPortFrame::CreateScrollingView(nsIPresContext* aPresContext) } // Initialize the scrolling view - view->Init(viewManager, mRect, parentView, nsnull, display->mVisible ? + view->Init(viewManager, mRect, parentView, nsnull, display->IsVisibleOrCollapsed() ? nsViewVisibility_kShow : nsViewVisibility_kHide); // Insert the view into the view hierarchy @@ -553,7 +553,7 @@ nsScrollPortFrame::Paint(nsIPresContext* aPresContext, const nsStyleDisplay* display = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (display->mVisible) { + if (display->IsVisibleOrCollapsed()) { // Paint our border only (no background) const nsStyleSpacing* spacing = (const nsStyleSpacing*) mStyleContext->GetStyleData(eStyleStruct_Spacing); diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 98ffd986461..1e9514f3a81 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -817,7 +817,7 @@ nsTextFrame::Paint(nsIPresContext* aPresContext, nsIStyleContext* sc = mStyleContext; const nsStyleDisplay* disp = (const nsStyleDisplay*) sc->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisible()) { TextStyle ts(aPresContext, aRenderingContext, mStyleContext); if (ts.mSmallCaps || (0 != ts.mWordSpacing) || (0 != ts.mLetterSpacing)) { PaintTextSlowly(aPresContext, aRenderingContext, sc, ts, 0, 0); diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index 842fdd130b1..b33ba64a81c 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -673,7 +673,7 @@ nsHTMLFrameInnerFrame::DidReflow(nsIPresContext* aPresContext, if (view) { const nsStyleDisplay* display; GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - nsViewVisibility newVis = NS_STYLE_VISIBILITY_VISIBLE == display->mVisible ? nsViewVisibility_kShow : nsViewVisibility_kHide; + nsViewVisibility newVis = display->IsVisible() ? nsViewVisibility_kShow : nsViewVisibility_kHide; nsViewVisibility oldVis; // only change if different. view->GetVisibility(oldVis); @@ -834,7 +834,7 @@ nsHTMLFrameInnerFrame::CreateDocShell(nsIPresContext* aPresContext, // if the visibility is hidden, reflect that in the view const nsStyleDisplay* display; GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - if (NS_STYLE_VISIBILITY_VISIBLE != display->mVisible) { + if (!display->IsVisible()) { view->SetVisibility(nsViewVisibility_kHide); } diff --git a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp index eac7473c8c9..c58db576cb9 100644 --- a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp @@ -143,7 +143,7 @@ nsFieldSetFrame::Paint(nsIPresContext* aPresContext, const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible == NS_STYLE_VISIBILITY_VISIBLE && mRect.width && mRect.height) { + if (disp->IsVisible() && mRect.width && mRect.height) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp index f05865520a6..a8b82979c39 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp @@ -344,7 +344,7 @@ nsFormControlFrame::DidReflow(nsIPresContext* aPresContext, if (view) { const nsStyleDisplay* display; GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - nsViewVisibility newVis = NS_STYLE_VISIBILITY_VISIBLE == display->mVisible ? nsViewVisibility_kShow : nsViewVisibility_kHide; + nsViewVisibility newVis = display->IsVisible() ? nsViewVisibility_kShow : nsViewVisibility_kHide; nsViewVisibility oldVis; // only change if different. view->GetVisibility(oldVis); diff --git a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp index 423eac39b71..45f5fa758f3 100644 --- a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp @@ -306,7 +306,7 @@ nsGfxCheckboxControlFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE) + if (!disp->IsVisible()) return NS_OK; // Paint the background diff --git a/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp index 99d3c11b14f..96a14c88903 100644 --- a/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp @@ -3100,7 +3100,7 @@ nsGfxListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent) } const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE) { + if (!disp->IsVisible()) { return NS_OK; } diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp index cf59ee56913..1c45f866b56 100644 --- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp @@ -286,7 +286,7 @@ nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE) + if (!disp->IsVisible()) return NS_OK; // Paint the background diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp index 4ea35fc795b..6feaa35a330 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp @@ -1272,7 +1272,7 @@ nsGfxTextControlFrame::PaintTextControl(nsIPresContext* aPresContext, mDebugPaintsSinceLastReflow++; #endif const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible == NS_STYLE_VISIBILITY_VISIBLE) + if (disp->IsVisible()) { nsCompatibility mode; aPresContext->GetCompatibilityMode(&mode); @@ -1596,7 +1596,7 @@ nsGfxTextControlFrame::CreateDocShell(nsIPresContext* aPresContext, // if the visibility is hidden, reflect that in the view const nsStyleDisplay* display; GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display)); - if (NS_STYLE_VISIBILITY_VISIBLE != display->mVisible) { + if (!display->IsVisible()) { view->SetVisibility(nsViewVisibility_kHide); } diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp index 9c2e43994d1..70ca4bd8013 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp @@ -432,7 +432,7 @@ nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible == NS_STYLE_VISIBILITY_VISIBLE) + if (disp->IsVisible()) { nsRect rect(0, 0, mRect.width, mRect.height); mRenderer.PaintButton(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer, rect); diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp index 08f5cae2e3f..3641071c0b1 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp @@ -2666,7 +2666,7 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent) } const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE) { + if (!disp->IsVisible()) { return NS_OK; } diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index d22c81b91ad..4a340433b62 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -245,7 +245,7 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext* aPresContext, (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleColor* myColor = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); const nsStyleSpacing* mySpacing = diff --git a/mozilla/layout/html/table/src/nsTableColFrame.cpp b/mozilla/layout/html/table/src/nsTableColFrame.cpp index 9e6184fd233..90cc53a3ad0 100644 --- a/mozilla/layout/html/table/src/nsTableColFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColFrame.cpp @@ -116,7 +116,7 @@ NS_METHOD nsTableColFrame::Paint(nsIPresContext* aPresContext, if (eCompatibility_Standard == mode) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp index 33b366d7310..072715dbb13 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp @@ -439,7 +439,7 @@ NS_METHOD nsTableColGroupFrame::Paint(nsIPresContext* aPresContext, if (eCompatibility_Standard == mode) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index 78e3f6c9aa2..520123a017c 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -1228,7 +1228,7 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext* aPresContext, if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index 690ca0aa4e5..54bb27ab464 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -354,7 +354,7 @@ NS_METHOD nsTableRowFrame::Paint(nsIPresContext* aPresContext, if (eCompatibility_Standard == mode) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index 11acb8204db..0df0f68445d 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -171,7 +171,7 @@ NS_METHOD nsTableRowGroupFrame::Paint(nsIPresContext* aPresContext, if (eCompatibility_Standard == mode) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index d22c81b91ad..4a340433b62 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -245,7 +245,7 @@ NS_METHOD nsTableCellFrame::Paint(nsIPresContext* aPresContext, (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleColor* myColor = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); const nsStyleSpacing* mySpacing = diff --git a/mozilla/layout/tables/nsTableColFrame.cpp b/mozilla/layout/tables/nsTableColFrame.cpp index 9e6184fd233..90cc53a3ad0 100644 --- a/mozilla/layout/tables/nsTableColFrame.cpp +++ b/mozilla/layout/tables/nsTableColFrame.cpp @@ -116,7 +116,7 @@ NS_METHOD nsTableColFrame::Paint(nsIPresContext* aPresContext, if (eCompatibility_Standard == mode) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index 33b366d7310..072715dbb13 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp @@ -439,7 +439,7 @@ NS_METHOD nsTableColGroupFrame::Paint(nsIPresContext* aPresContext, if (eCompatibility_Standard == mode) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 78e3f6c9aa2..520123a017c 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -1228,7 +1228,7 @@ NS_METHOD nsTableFrame::Paint(nsIPresContext* aPresContext, if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 690ca0aa4e5..54bb27ab464 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -354,7 +354,7 @@ NS_METHOD nsTableRowFrame::Paint(nsIPresContext* aPresContext, if (eCompatibility_Standard == mode) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index 11acb8204db..0df0f68445d 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -171,7 +171,7 @@ NS_METHOD nsTableRowGroupFrame::Paint(nsIPresContext* aPresContext, if (eCompatibility_Standard == mode) { const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleSpacing* spacing = (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); const nsStyleColor* color = diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index 5f9c7de2f44..b03b9e53edd 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -3066,7 +3066,7 @@ nsBoxFrame :: Paint ( nsIPresContext* aPresContext, mStyleContext->GetStyleData(eStyleStruct_Display); // if we aren't visible then we are done. - if (!disp->mVisible) + if (!disp->IsVisibleOrCollapsed()) return NS_OK; // if we are visible then tell our superclass to paint diff --git a/mozilla/layout/xul/base/src/nsColorPickerFrame.cpp b/mozilla/layout/xul/base/src/nsColorPickerFrame.cpp index 1bc012ef5c8..8086c1384fe 100644 --- a/mozilla/layout/xul/base/src/nsColorPickerFrame.cpp +++ b/mozilla/layout/xul/base/src/nsColorPickerFrame.cpp @@ -154,7 +154,7 @@ nsColorPickerFrame::Paint(nsIPresContext* aPresContext, mStyleContext->GetStyleData(eStyleStruct_Display); // if we aren't visible then we are done. - if (!disp->mVisible) + if (!disp->IsVisibleOrCollapsed()) return NS_OK; // if we are visible then tell our superclass to paint diff --git a/mozilla/layout/xul/base/src/nsDeckFrame.cpp b/mozilla/layout/xul/base/src/nsDeckFrame.cpp index a6e4da78c02..2975e103815 100644 --- a/mozilla/layout/xul/base/src/nsDeckFrame.cpp +++ b/mozilla/layout/xul/base/src/nsDeckFrame.cpp @@ -154,11 +154,11 @@ nsDeckFrame::Paint(nsIPresContext* aPresContext, // if a tab is hidden all its children are too. const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (!disp->mVisible) + if (!disp->IsVisibleOrCollapsed()) return NS_OK; if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { - if (disp->mVisible && mRect.width && mRect.height) { + if (disp->IsVisibleOrCollapsed() && mRect.width && mRect.height) { // Paint our background and border PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*) diff --git a/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp b/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp index b19d6011557..73556e852ea 100644 --- a/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp @@ -168,7 +168,7 @@ nsTitledBoxFrame::Paint(nsIPresContext* aPresContext, const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible == NS_STYLE_VISIBILITY_VISIBLE && mRect.width && mRect.height) { + if (disp->IsVisible() && mRect.width && mRect.height) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp index 1bef64836a8..a2bbf563d2e 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -221,7 +221,7 @@ nsSliderFrame::Paint(nsIPresContext* aPresContext, if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible) { + if (disp->IsVisibleOrCollapsed()) { const nsStyleColor* myColor = (const nsStyleColor*) mStyleContext->GetStyleData(eStyleStruct_Color); const nsStyleSpacing* mySpacing = (const nsStyleSpacing*) diff --git a/mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp index b19d6011557..73556e852ea 100644 --- a/mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTitledBoxFrame.cpp @@ -168,7 +168,7 @@ nsTitledBoxFrame::Paint(nsIPresContext* aPresContext, const nsStyleDisplay* disp = (const nsStyleDisplay*)mStyleContext->GetStyleData(eStyleStruct_Display); - if (disp->mVisible == NS_STYLE_VISIBILITY_VISIBLE && mRect.width && mRect.height) { + if (disp->IsVisible() && mRect.width && mRect.height) { PRIntn skipSides = GetSkipSides(); const nsStyleColor* color = (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color); diff --git a/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp b/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp index 3ba61441bc0..fbd3e822c6e 100644 --- a/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp @@ -480,7 +480,7 @@ nsTitledButtonFrame::Paint(nsIPresContext* aPresContext, #endif const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (!disp->mVisible) + if (!disp->IsVisibleOrCollapsed()) return NS_OK; nsRect rect (0,0, mRect.width, mRect.height); diff --git a/mozilla/layout/xul/base/src/nsToolboxFrame.cpp b/mozilla/layout/xul/base/src/nsToolboxFrame.cpp index 7c433bf1286..dd6d12f38ad 100644 --- a/mozilla/layout/xul/base/src/nsToolboxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsToolboxFrame.cpp @@ -251,7 +251,7 @@ nsToolboxFrame :: Paint ( nsIPresContext* aPresContext, const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (!disp->mVisible) + if (!disp->IsVisibleOrCollapsed()) return NS_OK; // take care of bg painting, borders and children diff --git a/mozilla/layout/xul/base/src/nsXULTextFrame.cpp b/mozilla/layout/xul/base/src/nsXULTextFrame.cpp index 6e6a2189e43..5850cecf173 100644 --- a/mozilla/layout/xul/base/src/nsXULTextFrame.cpp +++ b/mozilla/layout/xul/base/src/nsXULTextFrame.cpp @@ -229,7 +229,7 @@ nsXULTextFrame::Paint(nsIPresContext* aPresContext, { const nsStyleDisplay* disp = (const nsStyleDisplay*) mStyleContext->GetStyleData(eStyleStruct_Display); - if (!disp->mVisible) + if (!disp->IsVisibleOrCollapsed()) return NS_OK; if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {