From 2655f63ca96fdf0fc5d00f8a7ae331bf49a3c313 Mon Sep 17 00:00:00 2001 From: "tor%cs.brown.edu" Date: Tue, 4 Nov 2003 15:50:09 +0000 Subject: [PATCH] Bug 224628 - backout part of 212366 so that scrolling=no works. r+sr=roc git-svn-id: svn://10.0.0.236/trunk@148834 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrameFrame.cpp | 7 +++---- mozilla/layout/html/document/src/nsFrameFrame.cpp | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index 6c9a03715d6..c89bfad6f48 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -94,7 +94,6 @@ #include "nsIRenderingContext.h" #include "nsIFrameFrame.h" #include "nsAutoPtr.h" -#include "nsCSSAnonBoxes.h" // For Accessibility #ifdef ACCESSIBILITY @@ -410,9 +409,9 @@ nsHTMLFrameOuterFrame::Init(nsIPresContext* aPresContext, mFrames.SetFrames(firstChild); // Resolve the style context for the inner frame nsresult rv = NS_OK; - nsRefPtr innerStyleContext - = aPresContext->ResolvePseudoStyleContextFor(aContent, - nsCSSAnonBoxes::mozAnonymousBlock, mStyleContext); + nsRefPtr innerStyleContext; + innerStyleContext = aPresContext->ResolveStyleContextFor(mContent, + mStyleContext); rv = firstChild->Init(aPresContext, mContent, this, innerStyleContext, nsnull); if (NS_FAILED(rv)){ NS_WARNING( "Error initializing InnerFrame in nsHTMLFrameOuterFrame"); diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index 6c9a03715d6..c89bfad6f48 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -94,7 +94,6 @@ #include "nsIRenderingContext.h" #include "nsIFrameFrame.h" #include "nsAutoPtr.h" -#include "nsCSSAnonBoxes.h" // For Accessibility #ifdef ACCESSIBILITY @@ -410,9 +409,9 @@ nsHTMLFrameOuterFrame::Init(nsIPresContext* aPresContext, mFrames.SetFrames(firstChild); // Resolve the style context for the inner frame nsresult rv = NS_OK; - nsRefPtr innerStyleContext - = aPresContext->ResolvePseudoStyleContextFor(aContent, - nsCSSAnonBoxes::mozAnonymousBlock, mStyleContext); + nsRefPtr innerStyleContext; + innerStyleContext = aPresContext->ResolveStyleContextFor(mContent, + mStyleContext); rv = firstChild->Init(aPresContext, mContent, this, innerStyleContext, nsnull); if (NS_FAILED(rv)){ NS_WARNING( "Error initializing InnerFrame in nsHTMLFrameOuterFrame");