Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 224628 - backout part of 212366 so that scrolling=no works. r+sr=roc

Browse Source
This commit is contained in:
tor%cs.brown.edu 2003-11-04 15:50:09 +00:00
parent cd176fdba9
commit 7a1a7ec1d4
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/generic/nsFrameFrame.cpp
View File

@ -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<nsStyleContext> innerStyleContext
= aPresContext->ResolvePseudoStyleContextFor(aContent,
nsCSSAnonBoxes::mozAnonymousBlock, mStyleContext);
nsRefPtr<nsStyleContext> 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");

7
layout/html/document/src/nsFrameFrame.cpp
View File

@ -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<nsStyleContext> innerStyleContext
= aPresContext->ResolvePseudoStyleContextFor(aContent,
nsCSSAnonBoxes::mozAnonymousBlock, mStyleContext);
nsRefPtr<nsStyleContext> 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");