From 2de14973bc94d43584d433bb3b7e83d5ad3d22f8 Mon Sep 17 00:00:00 2001
From: uid502 <uid502>
Date: Sat, 1 Nov 2003 01:34:06 +0000
Subject: [PATCH] Bug 212366. Make nsFrameInnerFrame be a moz-anonymous-box
 pseudoelement. This stops style on an IFRAME from being applied to both the
 outerframe and the innerframe. r+sr=dbaron

---
 layout/generic/nsFrameFrame.cpp           | 7 ++++---
 layout/html/document/src/nsFrameFrame.cpp | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp
index c89bfad6f483..6c9a03715d6d 100644
--- a/layout/generic/nsFrameFrame.cpp
+++ b/layout/generic/nsFrameFrame.cpp
@@ -94,6 +94,7 @@
 #include "nsIRenderingContext.h"
 #include "nsIFrameFrame.h"
 #include "nsAutoPtr.h"
+#include "nsCSSAnonBoxes.h"
 
 // For Accessibility
 #ifdef ACCESSIBILITY
@@ -409,9 +410,9 @@ nsHTMLFrameOuterFrame::Init(nsIPresContext*  aPresContext,
     mFrames.SetFrames(firstChild);
     // Resolve the style context for the inner frame
     nsresult rv = NS_OK;
-    nsRefPtr<nsStyleContext> innerStyleContext;
-    innerStyleContext = aPresContext->ResolveStyleContextFor(mContent,
-                                                             mStyleContext);
+    nsRefPtr<nsStyleContext> innerStyleContext
+      = aPresContext->ResolvePseudoStyleContextFor(aContent,
+        nsCSSAnonBoxes::mozAnonymousBlock, mStyleContext);
     rv = firstChild->Init(aPresContext, mContent, this, innerStyleContext, nsnull);
     if (NS_FAILED(rv)){
       NS_WARNING( "Error initializing InnerFrame in nsHTMLFrameOuterFrame");
diff --git a/layout/html/document/src/nsFrameFrame.cpp b/layout/html/document/src/nsFrameFrame.cpp
index c89bfad6f483..6c9a03715d6d 100644
--- a/layout/html/document/src/nsFrameFrame.cpp
+++ b/layout/html/document/src/nsFrameFrame.cpp
@@ -94,6 +94,7 @@
 #include "nsIRenderingContext.h"
 #include "nsIFrameFrame.h"
 #include "nsAutoPtr.h"
+#include "nsCSSAnonBoxes.h"
 
 // For Accessibility
 #ifdef ACCESSIBILITY
@@ -409,9 +410,9 @@ nsHTMLFrameOuterFrame::Init(nsIPresContext*  aPresContext,
     mFrames.SetFrames(firstChild);
     // Resolve the style context for the inner frame
     nsresult rv = NS_OK;
-    nsRefPtr<nsStyleContext> innerStyleContext;
-    innerStyleContext = aPresContext->ResolveStyleContextFor(mContent,
-                                                             mStyleContext);
+    nsRefPtr<nsStyleContext> innerStyleContext
+      = aPresContext->ResolvePseudoStyleContextFor(aContent,
+        nsCSSAnonBoxes::mozAnonymousBlock, mStyleContext);
     rv = firstChild->Init(aPresContext, mContent, this, innerStyleContext, nsnull);
     if (NS_FAILED(rv)){
       NS_WARNING( "Error initializing InnerFrame in nsHTMLFrameOuterFrame");