From efa6744bfd33a201755ac64c7d5a90364645083e Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Thu, 11 Mar 1999 20:29:02 +0000 Subject: [PATCH] Fixed MapDeclarationInto() so it correctly handles 'min-width', 'max-width', 'min-height', and 'max-height' git-svn-id: svn://10.0.0.236/trunk@23736 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSStyleRule.cpp | 8 ++++---- mozilla/layout/html/style/src/nsCSSStyleRule.cpp | 8 ++++---- mozilla/layout/style/nsCSSStyleRule.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index afe3542a0fa..23ce134818b 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -1853,16 +1853,16 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, } SetCoord(ourPosition->mWidth, position->mWidth, SETCOORD_LPAH, font, aPresContext); - SetCoord(ourPosition->mMinWidth, position->mWidth, SETCOORD_LPH, font, aPresContext); - if (! SetCoord(ourPosition->mMaxWidth, position->mWidth, SETCOORD_LPH, font, aPresContext)) { + SetCoord(ourPosition->mMinWidth, position->mMinWidth, SETCOORD_LPH, font, aPresContext); + if (! SetCoord(ourPosition->mMaxWidth, position->mMaxWidth, SETCOORD_LPH, font, aPresContext)) { if (eCSSUnit_None == ourPosition->mMaxWidth.GetUnit()) { position->mMaxWidth.Reset(); } } SetCoord(ourPosition->mHeight, position->mHeight, SETCOORD_LPAH, font, aPresContext); - SetCoord(ourPosition->mMinHeight, position->mHeight, SETCOORD_LPH, font, aPresContext); - if (! SetCoord(ourPosition->mMaxHeight, position->mHeight, SETCOORD_LPH, font, aPresContext)) { + SetCoord(ourPosition->mMinHeight, position->mMinHeight, SETCOORD_LPH, font, aPresContext); + if (! SetCoord(ourPosition->mMaxHeight, position->mMaxHeight, SETCOORD_LPH, font, aPresContext)) { if (eCSSUnit_None == ourPosition->mMaxHeight.GetUnit()) { position->mMaxHeight.Reset(); } diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index afe3542a0fa..23ce134818b 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -1853,16 +1853,16 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, } SetCoord(ourPosition->mWidth, position->mWidth, SETCOORD_LPAH, font, aPresContext); - SetCoord(ourPosition->mMinWidth, position->mWidth, SETCOORD_LPH, font, aPresContext); - if (! SetCoord(ourPosition->mMaxWidth, position->mWidth, SETCOORD_LPH, font, aPresContext)) { + SetCoord(ourPosition->mMinWidth, position->mMinWidth, SETCOORD_LPH, font, aPresContext); + if (! SetCoord(ourPosition->mMaxWidth, position->mMaxWidth, SETCOORD_LPH, font, aPresContext)) { if (eCSSUnit_None == ourPosition->mMaxWidth.GetUnit()) { position->mMaxWidth.Reset(); } } SetCoord(ourPosition->mHeight, position->mHeight, SETCOORD_LPAH, font, aPresContext); - SetCoord(ourPosition->mMinHeight, position->mHeight, SETCOORD_LPH, font, aPresContext); - if (! SetCoord(ourPosition->mMaxHeight, position->mHeight, SETCOORD_LPH, font, aPresContext)) { + SetCoord(ourPosition->mMinHeight, position->mMinHeight, SETCOORD_LPH, font, aPresContext); + if (! SetCoord(ourPosition->mMaxHeight, position->mMaxHeight, SETCOORD_LPH, font, aPresContext)) { if (eCSSUnit_None == ourPosition->mMaxHeight.GetUnit()) { position->mMaxHeight.Reset(); } diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index afe3542a0fa..23ce134818b 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -1853,16 +1853,16 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, } SetCoord(ourPosition->mWidth, position->mWidth, SETCOORD_LPAH, font, aPresContext); - SetCoord(ourPosition->mMinWidth, position->mWidth, SETCOORD_LPH, font, aPresContext); - if (! SetCoord(ourPosition->mMaxWidth, position->mWidth, SETCOORD_LPH, font, aPresContext)) { + SetCoord(ourPosition->mMinWidth, position->mMinWidth, SETCOORD_LPH, font, aPresContext); + if (! SetCoord(ourPosition->mMaxWidth, position->mMaxWidth, SETCOORD_LPH, font, aPresContext)) { if (eCSSUnit_None == ourPosition->mMaxWidth.GetUnit()) { position->mMaxWidth.Reset(); } } SetCoord(ourPosition->mHeight, position->mHeight, SETCOORD_LPAH, font, aPresContext); - SetCoord(ourPosition->mMinHeight, position->mHeight, SETCOORD_LPH, font, aPresContext); - if (! SetCoord(ourPosition->mMaxHeight, position->mHeight, SETCOORD_LPH, font, aPresContext)) { + SetCoord(ourPosition->mMinHeight, position->mMinHeight, SETCOORD_LPH, font, aPresContext); + if (! SetCoord(ourPosition->mMaxHeight, position->mMaxHeight, SETCOORD_LPH, font, aPresContext)) { if (eCSSUnit_None == ourPosition->mMaxHeight.GetUnit()) { position->mMaxHeight.Reset(); }