added factor unit type

added nsStyleSides
1998-05-12 22:18:42 +00:00 · 1998-05-12 22:18:42 +00:00 · 1f3c71eb21
--- a/content/shared/public/nsStyleCoord.h
+++ b/content/shared/public/nsStyleCoord.h
@ -20,6 +20,7 @@

 #include "nscore.h"
 #include "nsCoord.h"
+#include "nsCRT.h"
 class nsString;

 enum nsStyleUnit {
@ -28,18 +29,24 @@ enum nsStyleUnit {
  eStyleUnit_Auto         = 2,      // (no value)
  eStyleUnit_Inherit      = 3,      // (no value) value should be inherited
  eStyleUnit_Percent      = 10,     // (float) 1.0 == 100%
+  eStyleUnit_Factor       = 11,     // (float) a multiplier
  eStyleUnit_Coord        = 20,     // (nscoord) value is twips
  eStyleUnit_Integer      = 30,     // (int) value is simple integer
  eStyleUnit_Proportional = 31,     // (int) value has proportional meaning
  eStyleUnit_Enumerated   = 32      // (int) value has enumerated meaning
 };

+typedef union {
+  PRInt32     mInt;   // nscoord is a PRInt32 for now
+  float       mFloat;
+} nsStyleUnion;
+
 class nsStyleCoord {
 public:
  nsStyleCoord(nsStyleUnit aUnit = eStyleUnit_Null);
  nsStyleCoord(nscoord aValue);
  nsStyleCoord(PRInt32 aValue, nsStyleUnit aUnit);
-  nsStyleCoord(float aValue);
+  nsStyleCoord(float aValue, nsStyleUnit aUnit);
  nsStyleCoord(const nsStyleCoord& aCopy);

  nsStyleCoord&  operator=(const nsStyleCoord& aCopy);
@ -49,26 +56,70 @@ public:
  nscoord     GetCoordValue(void) const;
  PRInt32     GetIntValue(void) const;
  float       GetPercentValue(void) const;
+  float       GetFactorValue(void) const;
+  void        GetUnionValue(nsStyleUnion& aValue) const;

  void  Reset(void);  // sets to null
  void  SetCoordValue(nscoord aValue);
  void  SetIntValue(PRInt32 aValue, nsStyleUnit aUnit);
  void  SetPercentValue(float aValue);
+  void  SetFactorValue(float aValue);
  void  SetNormalValue(void);
  void  SetAutoValue(void);
  void  SetInheritValue(void);
+  void  SetUnionValue(const nsStyleUnion& aValue, nsStyleUnit aUnit);

  void  AppendToString(nsString& aBuffer) const;
  void  ToString(nsString& aBuffer) const;

 protected:
-  nsStyleUnit mUnit;
-  union {
-    PRInt32     mInt;   // nscoord is a PRInt32 for now
-    float       mFloat;
-  }           mValue;
+  nsStyleUnit   mUnit;
+  nsStyleUnion  mValue;
 };

+
+class nsStyleSides {
+public:
+  nsStyleSides(void);
+
+//  nsStyleSides&  operator=(const nsStyleSides& aCopy);  // use compiler's version
+//  PRBool         operator==(const nsStyleSides& aOther) const;
+
+  nsStyleUnit GetLeftUnit(void) const;
+  nsStyleUnit GetTopUnit(void) const;
+  nsStyleUnit GetRightUnit(void) const;
+  nsStyleUnit GetBottomUnit(void) const;
+
+  nsStyleCoord& GetLeft(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetTop(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetRight(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetBottom(nsStyleCoord& aCoord) const;
+
+  void  Reset(void);
+  void  SetLeft(const nsStyleCoord& aCoord);
+  void  SetTop(const nsStyleCoord& aCoord);
+  void  SetRight(const nsStyleCoord& aCoord);
+  void  SetBottom(const nsStyleCoord& aCoord);
+
+  void  AppendToString(nsString& aBuffer) const;
+  void  ToString(nsString& aBuffer) const;
+
+protected:
+  struct {
+    PRUint32  mLeftUnit: 8; // use bit fields to ensure packing...
+    PRUint32  mTopUnit: 8;
+    PRUint32  mRightUnit: 8;
+    PRUint32  mBottomUnit: 8;
+  };
+  nsStyleUnion  mLeftValue;
+  nsStyleUnion  mTopValue;
+  nsStyleUnion  mRightValue;
+  nsStyleUnion  mBottomValue;
+};
+
+// -------------------------
+// nsStyleCoord inlines
+//
 inline PRInt32 nsStyleCoord::GetCoordValue(void) const
 {
  NS_ASSERTION((mUnit == eStyleUnit_Coord), "not a coord value");
@ -100,6 +151,89 @@ inline float nsStyleCoord::GetPercentValue(void) const
  return 0.0f;
 }

+inline float nsStyleCoord::GetFactorValue(void) const
+{
+  NS_ASSERTION(mUnit == eStyleUnit_Factor, "not a factor value");
+  if (mUnit == eStyleUnit_Factor) {
+    return mValue.mFloat;
+  }
+  return 0.0f;
+}

+inline void nsStyleCoord::GetUnionValue(nsStyleUnion& aValue) const
+{
+  nsCRT::memcpy(&aValue, &mValue, sizeof(nsStyleUnion));
+}
+
+// -------------------------
+// nsStyleSides inlines
+//
+inline nsStyleUnit nsStyleSides::GetLeftUnit(void) const
+{
+  return (nsStyleUnit)mLeftUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetTopUnit(void) const
+{
+  return (nsStyleUnit)mTopUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetRightUnit(void) const
+{
+  return (nsStyleUnit)mRightUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetBottomUnit(void) const
+{
+  return (nsStyleUnit)mBottomUnit;
+}
+
+inline nsStyleCoord& nsStyleSides::GetLeft(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mLeftValue, (nsStyleUnit)mLeftUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetTop(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mTopValue, (nsStyleUnit)mTopUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetRight(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mRightValue, (nsStyleUnit)mRightUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetBottom(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mBottomValue, (nsStyleUnit)mBottomUnit);
+  return aCoord;
+}
+
+inline void nsStyleSides::SetLeft(const nsStyleCoord& aCoord)
+{
+  mLeftUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mLeftValue);
+}
+
+inline void nsStyleSides::SetTop(const nsStyleCoord& aCoord)
+{
+  mTopUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mTopValue);
+}
+
+inline void nsStyleSides::SetRight(const nsStyleCoord& aCoord)
+{
+  mRightUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mRightValue);
+}
+
+inline void nsStyleSides::SetBottom(const nsStyleCoord& aCoord)
+{
+  mBottomUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mBottomValue);
+}

 #endif /* nsStyleCoord_h___ */
--- a/layout/base/public/nsStyleCoord.h
+++ b/layout/base/public/nsStyleCoord.h
@ -20,6 +20,7 @@

 #include "nscore.h"
 #include "nsCoord.h"
+#include "nsCRT.h"
 class nsString;

 enum nsStyleUnit {
@ -28,18 +29,24 @@ enum nsStyleUnit {
  eStyleUnit_Auto         = 2,      // (no value)
  eStyleUnit_Inherit      = 3,      // (no value) value should be inherited
  eStyleUnit_Percent      = 10,     // (float) 1.0 == 100%
+  eStyleUnit_Factor       = 11,     // (float) a multiplier
  eStyleUnit_Coord        = 20,     // (nscoord) value is twips
  eStyleUnit_Integer      = 30,     // (int) value is simple integer
  eStyleUnit_Proportional = 31,     // (int) value has proportional meaning
  eStyleUnit_Enumerated   = 32      // (int) value has enumerated meaning
 };

+typedef union {
+  PRInt32     mInt;   // nscoord is a PRInt32 for now
+  float       mFloat;
+} nsStyleUnion;
+
 class nsStyleCoord {
 public:
  nsStyleCoord(nsStyleUnit aUnit = eStyleUnit_Null);
  nsStyleCoord(nscoord aValue);
  nsStyleCoord(PRInt32 aValue, nsStyleUnit aUnit);
-  nsStyleCoord(float aValue);
+  nsStyleCoord(float aValue, nsStyleUnit aUnit);
  nsStyleCoord(const nsStyleCoord& aCopy);

  nsStyleCoord&  operator=(const nsStyleCoord& aCopy);
@ -49,26 +56,70 @@ public:
  nscoord     GetCoordValue(void) const;
  PRInt32     GetIntValue(void) const;
  float       GetPercentValue(void) const;
+  float       GetFactorValue(void) const;
+  void        GetUnionValue(nsStyleUnion& aValue) const;

  void  Reset(void);  // sets to null
  void  SetCoordValue(nscoord aValue);
  void  SetIntValue(PRInt32 aValue, nsStyleUnit aUnit);
  void  SetPercentValue(float aValue);
+  void  SetFactorValue(float aValue);
  void  SetNormalValue(void);
  void  SetAutoValue(void);
  void  SetInheritValue(void);
+  void  SetUnionValue(const nsStyleUnion& aValue, nsStyleUnit aUnit);

  void  AppendToString(nsString& aBuffer) const;
  void  ToString(nsString& aBuffer) const;

 protected:
-  nsStyleUnit mUnit;
-  union {
-    PRInt32     mInt;   // nscoord is a PRInt32 for now
-    float       mFloat;
-  }           mValue;
+  nsStyleUnit   mUnit;
+  nsStyleUnion  mValue;
 };

+
+class nsStyleSides {
+public:
+  nsStyleSides(void);
+
+//  nsStyleSides&  operator=(const nsStyleSides& aCopy);  // use compiler's version
+//  PRBool         operator==(const nsStyleSides& aOther) const;
+
+  nsStyleUnit GetLeftUnit(void) const;
+  nsStyleUnit GetTopUnit(void) const;
+  nsStyleUnit GetRightUnit(void) const;
+  nsStyleUnit GetBottomUnit(void) const;
+
+  nsStyleCoord& GetLeft(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetTop(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetRight(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetBottom(nsStyleCoord& aCoord) const;
+
+  void  Reset(void);
+  void  SetLeft(const nsStyleCoord& aCoord);
+  void  SetTop(const nsStyleCoord& aCoord);
+  void  SetRight(const nsStyleCoord& aCoord);
+  void  SetBottom(const nsStyleCoord& aCoord);
+
+  void  AppendToString(nsString& aBuffer) const;
+  void  ToString(nsString& aBuffer) const;
+
+protected:
+  struct {
+    PRUint32  mLeftUnit: 8; // use bit fields to ensure packing...
+    PRUint32  mTopUnit: 8;
+    PRUint32  mRightUnit: 8;
+    PRUint32  mBottomUnit: 8;
+  };
+  nsStyleUnion  mLeftValue;
+  nsStyleUnion  mTopValue;
+  nsStyleUnion  mRightValue;
+  nsStyleUnion  mBottomValue;
+};
+
+// -------------------------
+// nsStyleCoord inlines
+//
 inline PRInt32 nsStyleCoord::GetCoordValue(void) const
 {
  NS_ASSERTION((mUnit == eStyleUnit_Coord), "not a coord value");
@ -100,6 +151,89 @@ inline float nsStyleCoord::GetPercentValue(void) const
  return 0.0f;
 }

+inline float nsStyleCoord::GetFactorValue(void) const
+{
+  NS_ASSERTION(mUnit == eStyleUnit_Factor, "not a factor value");
+  if (mUnit == eStyleUnit_Factor) {
+    return mValue.mFloat;
+  }
+  return 0.0f;
+}

+inline void nsStyleCoord::GetUnionValue(nsStyleUnion& aValue) const
+{
+  nsCRT::memcpy(&aValue, &mValue, sizeof(nsStyleUnion));
+}
+
+// -------------------------
+// nsStyleSides inlines
+//
+inline nsStyleUnit nsStyleSides::GetLeftUnit(void) const
+{
+  return (nsStyleUnit)mLeftUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetTopUnit(void) const
+{
+  return (nsStyleUnit)mTopUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetRightUnit(void) const
+{
+  return (nsStyleUnit)mRightUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetBottomUnit(void) const
+{
+  return (nsStyleUnit)mBottomUnit;
+}
+
+inline nsStyleCoord& nsStyleSides::GetLeft(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mLeftValue, (nsStyleUnit)mLeftUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetTop(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mTopValue, (nsStyleUnit)mTopUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetRight(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mRightValue, (nsStyleUnit)mRightUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetBottom(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mBottomValue, (nsStyleUnit)mBottomUnit);
+  return aCoord;
+}
+
+inline void nsStyleSides::SetLeft(const nsStyleCoord& aCoord)
+{
+  mLeftUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mLeftValue);
+}
+
+inline void nsStyleSides::SetTop(const nsStyleCoord& aCoord)
+{
+  mTopUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mTopValue);
+}
+
+inline void nsStyleSides::SetRight(const nsStyleCoord& aCoord)
+{
+  mRightUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mRightValue);
+}
+
+inline void nsStyleSides::SetBottom(const nsStyleCoord& aCoord)
+{
+  mBottomUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mBottomValue);
+}

 #endif /* nsStyleCoord_h___ */
--- a/layout/style/nsStyleCoord.h
+++ b/layout/style/nsStyleCoord.h
@ -20,6 +20,7 @@

 #include "nscore.h"
 #include "nsCoord.h"
+#include "nsCRT.h"
 class nsString;

 enum nsStyleUnit {
@ -28,18 +29,24 @@ enum nsStyleUnit {
  eStyleUnit_Auto         = 2,      // (no value)
  eStyleUnit_Inherit      = 3,      // (no value) value should be inherited
  eStyleUnit_Percent      = 10,     // (float) 1.0 == 100%
+  eStyleUnit_Factor       = 11,     // (float) a multiplier
  eStyleUnit_Coord        = 20,     // (nscoord) value is twips
  eStyleUnit_Integer      = 30,     // (int) value is simple integer
  eStyleUnit_Proportional = 31,     // (int) value has proportional meaning
  eStyleUnit_Enumerated   = 32      // (int) value has enumerated meaning
 };

+typedef union {
+  PRInt32     mInt;   // nscoord is a PRInt32 for now
+  float       mFloat;
+} nsStyleUnion;
+
 class nsStyleCoord {
 public:
  nsStyleCoord(nsStyleUnit aUnit = eStyleUnit_Null);
  nsStyleCoord(nscoord aValue);
  nsStyleCoord(PRInt32 aValue, nsStyleUnit aUnit);
-  nsStyleCoord(float aValue);
+  nsStyleCoord(float aValue, nsStyleUnit aUnit);
  nsStyleCoord(const nsStyleCoord& aCopy);

  nsStyleCoord&  operator=(const nsStyleCoord& aCopy);
@ -49,26 +56,70 @@ public:
  nscoord     GetCoordValue(void) const;
  PRInt32     GetIntValue(void) const;
  float       GetPercentValue(void) const;
+  float       GetFactorValue(void) const;
+  void        GetUnionValue(nsStyleUnion& aValue) const;

  void  Reset(void);  // sets to null
  void  SetCoordValue(nscoord aValue);
  void  SetIntValue(PRInt32 aValue, nsStyleUnit aUnit);
  void  SetPercentValue(float aValue);
+  void  SetFactorValue(float aValue);
  void  SetNormalValue(void);
  void  SetAutoValue(void);
  void  SetInheritValue(void);
+  void  SetUnionValue(const nsStyleUnion& aValue, nsStyleUnit aUnit);

  void  AppendToString(nsString& aBuffer) const;
  void  ToString(nsString& aBuffer) const;

 protected:
-  nsStyleUnit mUnit;
-  union {
-    PRInt32     mInt;   // nscoord is a PRInt32 for now
-    float       mFloat;
-  }           mValue;
+  nsStyleUnit   mUnit;
+  nsStyleUnion  mValue;
 };

+
+class nsStyleSides {
+public:
+  nsStyleSides(void);
+
+//  nsStyleSides&  operator=(const nsStyleSides& aCopy);  // use compiler's version
+//  PRBool         operator==(const nsStyleSides& aOther) const;
+
+  nsStyleUnit GetLeftUnit(void) const;
+  nsStyleUnit GetTopUnit(void) const;
+  nsStyleUnit GetRightUnit(void) const;
+  nsStyleUnit GetBottomUnit(void) const;
+
+  nsStyleCoord& GetLeft(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetTop(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetRight(nsStyleCoord& aCoord) const;
+  nsStyleCoord& GetBottom(nsStyleCoord& aCoord) const;
+
+  void  Reset(void);
+  void  SetLeft(const nsStyleCoord& aCoord);
+  void  SetTop(const nsStyleCoord& aCoord);
+  void  SetRight(const nsStyleCoord& aCoord);
+  void  SetBottom(const nsStyleCoord& aCoord);
+
+  void  AppendToString(nsString& aBuffer) const;
+  void  ToString(nsString& aBuffer) const;
+
+protected:
+  struct {
+    PRUint32  mLeftUnit: 8; // use bit fields to ensure packing...
+    PRUint32  mTopUnit: 8;
+    PRUint32  mRightUnit: 8;
+    PRUint32  mBottomUnit: 8;
+  };
+  nsStyleUnion  mLeftValue;
+  nsStyleUnion  mTopValue;
+  nsStyleUnion  mRightValue;
+  nsStyleUnion  mBottomValue;
+};
+
+// -------------------------
+// nsStyleCoord inlines
+//
 inline PRInt32 nsStyleCoord::GetCoordValue(void) const
 {
  NS_ASSERTION((mUnit == eStyleUnit_Coord), "not a coord value");
@ -100,6 +151,89 @@ inline float nsStyleCoord::GetPercentValue(void) const
  return 0.0f;
 }

+inline float nsStyleCoord::GetFactorValue(void) const
+{
+  NS_ASSERTION(mUnit == eStyleUnit_Factor, "not a factor value");
+  if (mUnit == eStyleUnit_Factor) {
+    return mValue.mFloat;
+  }
+  return 0.0f;
+}

+inline void nsStyleCoord::GetUnionValue(nsStyleUnion& aValue) const
+{
+  nsCRT::memcpy(&aValue, &mValue, sizeof(nsStyleUnion));
+}
+
+// -------------------------
+// nsStyleSides inlines
+//
+inline nsStyleUnit nsStyleSides::GetLeftUnit(void) const
+{
+  return (nsStyleUnit)mLeftUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetTopUnit(void) const
+{
+  return (nsStyleUnit)mTopUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetRightUnit(void) const
+{
+  return (nsStyleUnit)mRightUnit;
+}
+
+inline nsStyleUnit nsStyleSides::GetBottomUnit(void) const
+{
+  return (nsStyleUnit)mBottomUnit;
+}
+
+inline nsStyleCoord& nsStyleSides::GetLeft(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mLeftValue, (nsStyleUnit)mLeftUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetTop(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mTopValue, (nsStyleUnit)mTopUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetRight(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mRightValue, (nsStyleUnit)mRightUnit);
+  return aCoord;
+}
+
+inline nsStyleCoord& nsStyleSides::GetBottom(nsStyleCoord& aCoord) const
+{
+  aCoord.SetUnionValue(mBottomValue, (nsStyleUnit)mBottomUnit);
+  return aCoord;
+}
+
+inline void nsStyleSides::SetLeft(const nsStyleCoord& aCoord)
+{
+  mLeftUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mLeftValue);
+}
+
+inline void nsStyleSides::SetTop(const nsStyleCoord& aCoord)
+{
+  mTopUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mTopValue);
+}
+
+inline void nsStyleSides::SetRight(const nsStyleCoord& aCoord)
+{
+  mRightUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mRightValue);
+}
+
+inline void nsStyleSides::SetBottom(const nsStyleCoord& aCoord)
+{
+  mBottomUnit = aCoord.GetUnit();
+  aCoord.GetUnionValue(mBottomValue);
+}

 #endif /* nsStyleCoord_h___ */