From a6287dc06f64a936f374fd31c0df7185b582f9e9 Mon Sep 17 00:00:00 2001
From: "karnaze%netscape.com"
 <karnaze%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 27 Apr 1999 21:05:32 +0000
Subject: [PATCH] <frame> or <iframe> without web shell gets background color
 from ua.css

git-svn-id: svn://10.0.0.236/trunk@29500 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsFrameFrame.cpp           | 11 +++++++----
 mozilla/layout/html/document/src/nsFrameFrame.cpp | 11 +++++++----
 mozilla/layout/html/document/src/ua.css           |  8 ++++++++
 mozilla/layout/style/ua.css                       |  8 ++++++++
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp
index e5eb00105fd..29363831f4b 100644
--- a/mozilla/layout/generic/nsFrameFrame.cpp
+++ b/mozilla/layout/generic/nsFrameFrame.cpp
@@ -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",
diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp
index e5eb00105fd..29363831f4b 100644
--- a/mozilla/layout/html/document/src/nsFrameFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp
@@ -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",
diff --git a/mozilla/layout/html/document/src/ua.css b/mozilla/layout/html/document/src/ua.css
index 0cab28e0737..9439d5b0792 100644
--- a/mozilla/layout/html/document/src/ua.css
+++ b/mozilla/layout/html/document/src/ua.css
@@ -29,6 +29,14 @@ frameset {
   overflow: hidden;
 }
 
+frame {
+  background-color: white;
+}
+
+iframe {
+  background-color: white;
+}
+
 /* blocks */
 
 p {
diff --git a/mozilla/layout/style/ua.css b/mozilla/layout/style/ua.css
index 0cab28e0737..9439d5b0792 100644
--- a/mozilla/layout/style/ua.css
+++ b/mozilla/layout/style/ua.css
@@ -29,6 +29,14 @@ frameset {
   overflow: hidden;
 }
 
+frame {
+  background-color: white;
+}
+
+iframe {
+  background-color: white;
+}
+
 /* blocks */
 
 p {