From 02e53b2bb57d63d35dd93d5ecf4e0f00d5828227 Mon Sep 17 00:00:00 2001 From: peterl Date: Thu, 30 Apr 1998 19:52:26 +0000 Subject: [PATCH] changed to nsStylePosition to use nsStyleCoord git-svn-id: svn://10.0.0.236/trunk@921 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsStyleContext.cpp | 24 +++++++++------------ mozilla/layout/base/src/nsStyleContext.cpp | 24 +++++++++------------ mozilla/layout/style/nsStyleContext.cpp | 24 +++++++++------------ 3 files changed, 30 insertions(+), 42 deletions(-) diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index c0b88aaa2cf..1b0c752a96e 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -200,15 +200,11 @@ struct StylePositionImpl: public nsStylePosition { { mPosition = NS_STYLE_POSITION_STATIC; mOverflow = NS_STYLE_OVERFLOW_VISIBLE; - mLeftOffsetFlags = NS_STYLE_POSITION_VALUE_AUTO; - mLeftOffset = 0; - mTopOffsetFlags = NS_STYLE_POSITION_VALUE_AUTO; - mTopOffset = 0; - mWidthFlags = NS_STYLE_POSITION_VALUE_AUTO; - mWidth = 0; - mHeightFlags = NS_STYLE_POSITION_VALUE_AUTO; - mHeight = 0; - mZIndex = 0; + mLeftOffset.SetAutoValue(); + mTopOffset.SetAutoValue(); + mWidth.SetAutoValue(); + mHeight.SetAutoValue(); + mZIndex.SetAutoValue(); mClipFlags = NS_STYLE_CLIP_AUTO; mClip.SizeTo(0,0,0,0); } @@ -241,11 +237,11 @@ struct StyleTextImpl: public nsStyleText { mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE; mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL; - mLetterSpacing.SetNormal(); - mLineHeight.SetNormal(); - mTextIndent.Set(0); - mWordSpacing.SetNormal(); - mVerticalAlign.Set(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated); + mLetterSpacing.SetNormalValue(); + mLineHeight.SetNormalValue(); + mTextIndent.SetCoordValue(0); + mWordSpacing.SetNormalValue(); + mVerticalAlign.SetIntValue(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated); } virtual const nsID& GetID() { diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index c0b88aaa2cf..1b0c752a96e 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -200,15 +200,11 @@ struct StylePositionImpl: public nsStylePosition { { mPosition = NS_STYLE_POSITION_STATIC; mOverflow = NS_STYLE_OVERFLOW_VISIBLE; - mLeftOffsetFlags = NS_STYLE_POSITION_VALUE_AUTO; - mLeftOffset = 0; - mTopOffsetFlags = NS_STYLE_POSITION_VALUE_AUTO; - mTopOffset = 0; - mWidthFlags = NS_STYLE_POSITION_VALUE_AUTO; - mWidth = 0; - mHeightFlags = NS_STYLE_POSITION_VALUE_AUTO; - mHeight = 0; - mZIndex = 0; + mLeftOffset.SetAutoValue(); + mTopOffset.SetAutoValue(); + mWidth.SetAutoValue(); + mHeight.SetAutoValue(); + mZIndex.SetAutoValue(); mClipFlags = NS_STYLE_CLIP_AUTO; mClip.SizeTo(0,0,0,0); } @@ -241,11 +237,11 @@ struct StyleTextImpl: public nsStyleText { mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE; mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL; - mLetterSpacing.SetNormal(); - mLineHeight.SetNormal(); - mTextIndent.Set(0); - mWordSpacing.SetNormal(); - mVerticalAlign.Set(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated); + mLetterSpacing.SetNormalValue(); + mLineHeight.SetNormalValue(); + mTextIndent.SetCoordValue(0); + mWordSpacing.SetNormalValue(); + mVerticalAlign.SetIntValue(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated); } virtual const nsID& GetID() { diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index c0b88aaa2cf..1b0c752a96e 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -200,15 +200,11 @@ struct StylePositionImpl: public nsStylePosition { { mPosition = NS_STYLE_POSITION_STATIC; mOverflow = NS_STYLE_OVERFLOW_VISIBLE; - mLeftOffsetFlags = NS_STYLE_POSITION_VALUE_AUTO; - mLeftOffset = 0; - mTopOffsetFlags = NS_STYLE_POSITION_VALUE_AUTO; - mTopOffset = 0; - mWidthFlags = NS_STYLE_POSITION_VALUE_AUTO; - mWidth = 0; - mHeightFlags = NS_STYLE_POSITION_VALUE_AUTO; - mHeight = 0; - mZIndex = 0; + mLeftOffset.SetAutoValue(); + mTopOffset.SetAutoValue(); + mWidth.SetAutoValue(); + mHeight.SetAutoValue(); + mZIndex.SetAutoValue(); mClipFlags = NS_STYLE_CLIP_AUTO; mClip.SizeTo(0,0,0,0); } @@ -241,11 +237,11 @@ struct StyleTextImpl: public nsStyleText { mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE; mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL; - mLetterSpacing.SetNormal(); - mLineHeight.SetNormal(); - mTextIndent.Set(0); - mWordSpacing.SetNormal(); - mVerticalAlign.Set(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated); + mLetterSpacing.SetNormalValue(); + mLineHeight.SetNormalValue(); + mTextIndent.SetCoordValue(0); + mWordSpacing.SetNormalValue(); + mVerticalAlign.SetIntValue(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated); } virtual const nsID& GetID() {