From cd4979b51c4ecac2fc6e098fb0e9b5bd2ffcc93d Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 16 Oct 1998 03:47:40 +0000 Subject: [PATCH] Fixed inheritance behavior of line-height ala peterl git-svn-id: svn://10.0.0.236/trunk@12964 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsStyleContext.cpp | 2 +- mozilla/layout/base/src/nsStyleContext.cpp | 2 +- mozilla/layout/style/nsStyleContext.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index 0be80cfa0d1..c7b748e7833 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -537,7 +537,7 @@ void StyleTextImpl::ResetFrom(const nsStyleText* aParent, nsIPresContext* aPresC mWhiteSpace = aParent->mWhiteSpace; mLetterSpacing = aParent->mLetterSpacing; - mLineHeight = aParent->mLineHeight; + mLineHeight.SetInheritValue(); mTextIndent = aParent->mTextIndent; mWordSpacing = aParent->mWordSpacing; } diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index 0be80cfa0d1..c7b748e7833 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -537,7 +537,7 @@ void StyleTextImpl::ResetFrom(const nsStyleText* aParent, nsIPresContext* aPresC mWhiteSpace = aParent->mWhiteSpace; mLetterSpacing = aParent->mLetterSpacing; - mLineHeight = aParent->mLineHeight; + mLineHeight.SetInheritValue(); mTextIndent = aParent->mTextIndent; mWordSpacing = aParent->mWordSpacing; } diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index 0be80cfa0d1..c7b748e7833 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -537,7 +537,7 @@ void StyleTextImpl::ResetFrom(const nsStyleText* aParent, nsIPresContext* aPresC mWhiteSpace = aParent->mWhiteSpace; mLetterSpacing = aParent->mLetterSpacing; - mLineHeight = aParent->mLineHeight; + mLineHeight.SetInheritValue(); mTextIndent = aParent->mTextIndent; mWordSpacing = aParent->mWordSpacing; }