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

Display inline borders/background during content painting, not during background painting (per css2 spec)

Browse Source
This commit is contained in:
kipp@netscape.com
1998-12-18 22:12:15 +00:00
parent 5d197a1257
commit e14e849e2f
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
layout/generic/nsBlockFrame.cpp
View File

@@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display); mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible // Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) { if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides(); PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*) const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color); mStyleContext->GetStyleData(eStyleStruct_Color);

5
layout/generic/nsBlockReflowState.cpp
View File

@@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display); mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible // Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) { if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides(); PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*) const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color); mStyleContext->GetStyleData(eStyleStruct_Color);

5
layout/generic/nsBlockReflowState.h
View File

@@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display); mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible // Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) { if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides(); PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*) const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color); mStyleContext->GetStyleData(eStyleStruct_Color);

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

@@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display); mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible // Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) { if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides(); PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*) const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color); mStyleContext->GetStyleData(eStyleStruct_Color);

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

@@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display); mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible // Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) { if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides(); PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*) const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color); mStyleContext->GetStyleData(eStyleStruct_Color);

5
layout/html/base/src/nsBlockReflowState.h
View File

@@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display); mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible // Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) { if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides(); PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*) const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color); mStyleContext->GetStyleData(eStyleStruct_Color);