Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

<frame> or <iframe> without web shell gets background color from ua.css

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@29500 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
1999-04-27 21:05:32 +00:00
parent 820b064ad9
commit a6287dc06f
4 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/generic/nsFrameFrame.cpp
View File

@@ -615,10 +615,12 @@ nsHTMLFrameInnerFrame::Paint(nsIPresContext& aPresContext,
nsFramePaintLayer aWhichLayer)
{
//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 all white.
// if there is not web shell paint based on our background color,
// otherwise let the web shell paint the sub document
if (!mWebShell) {
nscolor white = NS_RGB(255, 255, 255);
aRenderingContext.SetColor(white);
const nsStyleColor* color =
(const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color);
aRenderingContext.SetColor(color->mBackgroundColor);
aRenderingContext.FillRect(mRect);
}
return NS_OK;
@@ -866,6 +868,8 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext& aPresContext,
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.descent = 0;
aStatus = NS_FRAME_COMPLETE;
// resize the sub document
if (mWebShell) {
float t2p;
@@ -879,7 +883,6 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext& aPresContext,
mWebShell->SetBounds(subBounds.x, subBounds.y,
subBounds.width, subBounds.height);
mWebShell->Repaint(PR_TRUE);
aStatus = NS_FRAME_COMPLETE;
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("exit nsHTMLFrameInnerFrame::Reflow: size=%d,%d rv=%x",

11
mozilla/layout/html/document/src/nsFrameFrame.cpp
View File

@@ -615,10 +615,12 @@ nsHTMLFrameInnerFrame::Paint(nsIPresContext& aPresContext,
nsFramePaintLayer aWhichLayer)
{
//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 all white.
// if there is not web shell paint based on our background color,
// otherwise let the web shell paint the sub document
if (!mWebShell) {
nscolor white = NS_RGB(255, 255, 255);
aRenderingContext.SetColor(white);
const nsStyleColor* color =
(const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color);
aRenderingContext.SetColor(color->mBackgroundColor);
aRenderingContext.FillRect(mRect);
}
return NS_OK;
@@ -866,6 +868,8 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext& aPresContext,
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.descent = 0;
aStatus = NS_FRAME_COMPLETE;
// resize the sub document
if (mWebShell) {
float t2p;
@@ -879,7 +883,6 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext& aPresContext,
mWebShell->SetBounds(subBounds.x, subBounds.y,
subBounds.width, subBounds.height);
mWebShell->Repaint(PR_TRUE);
aStatus = NS_FRAME_COMPLETE;
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("exit nsHTMLFrameInnerFrame::Reflow: size=%d,%d rv=%x",

8
mozilla/layout/html/document/src/ua.css
View File

@@ -29,6 +29,14 @@ frameset {
overflow: hidden;
}
frame {
background-color: white;
}
iframe {
background-color: white;
}
/* blocks */
p {

8
mozilla/layout/style/ua.css
View File

@@ -29,6 +29,14 @@ frameset {
overflow: hidden;
}
frame {
background-color: white;
}
iframe {
background-color: white;
}
/* blocks */
p {