From 81bd8188cfd9c6c6d009dfeda2bf68d82cffef7b Mon Sep 17 00:00:00 2001
From: kipp <kipp@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 27 Apr 1998 21:19:45 +0000
Subject: [PATCH] Added nsStyleValue and then updated nsStyleText to use it

git-svn-id: svn://10.0.0.236/trunk@709 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/public/nsIStyleContext.h | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mozilla/layout/base/public/nsIStyleContext.h b/mozilla/layout/base/public/nsIStyleContext.h
index 115a9846dba..672ae5fc702 100644
--- a/mozilla/layout/base/public/nsIStyleContext.h
+++ b/mozilla/layout/base/public/nsIStyleContext.h
@@ -67,6 +67,11 @@ class nsISupportsArray;
 #define NS_SIDE_BOTTOM  2
 #define NS_SIDE_LEFT    3
 
+union nsStyleValue {
+  nscoord coord;
+  float percent;
+};
+
 // The lifetime of these objects is managed by the nsIStyleContext.
 
 struct nsStyleStruct {
@@ -160,13 +165,18 @@ struct nsStyleText : public nsStyleStruct {
   PRUint8 mTextAlign;                   // see nsStyleConsts.h
   PRUint8 mTextDecoration;              // see nsStyleConsts.h
   PRUint8 mTextTransform;               // see nsStyleConsts.h
-  PRUint8 mVerticalAlign;               // see nsStyleConsts.h
+  PRUint8 mVerticalAlignFlags;          // see nsStyleConsts.h
   PRUint8 mWhiteSpace;                  // see nsStyleConsts.h
+  PRUint8 mLetterSpacingFlags;
+  PRUint8 mLineHeightFlags;
+  PRUint8 mTextIndentFlags;
+  PRUint8 mWordSpacingFlags;
 
-  nscoord mLetterSpacing;
-  nscoord mLineHeight;
-  nscoord mTextIndent;
-  nscoord mWordSpacing;
+  nsStyleValue mLetterSpacing;
+  nsStyleValue mLineHeight;
+  nsStyleValue mTextIndent;
+  nsStyleValue mWordSpacing;
+  nsStyleValue mVerticalAlign;
 
 protected:
   nsStyleText();