added font flags

content/base/src/nsStyleContext.cpp

@@ -59,12 +59,12 @@ void StyleFontImpl::ResetFrom(const nsStyleFont* aParent, nsIPresContext* aPresC
   if (nsnull != aParent) {
     mFont = aParent->mFont;
     mFixedFont = aParent->mFixedFont;
-    mThreeD = aParent->mThreeD;
+    mFlags = aParent->mFlags;
   }
   else {
     mFont = aPresContext->GetDefaultFont();
     mFixedFont = aPresContext->GetDefaultFixedFont();
-    mThreeD = PR_FALSE;
+    mFlags = NS_STYLE_FONT_DEFAULT;
   }
 }
 

layout/base/src/nsStyleConsts.h

@@ -132,6 +132,11 @@
 #define NS_STYLE_FONT_SIZE_LARGER               7
 #define NS_STYLE_FONT_SIZE_SMALLER              8
 
+// See nsStyleFont mFlags
+#define NS_STYLE_FONT_DEFAULT                   0x00
+#define NS_STYLE_FONT_SIZE_EXPLICIT             0x01
+#define NS_STYLE_FONT_FACE_EXPLICIT             0x02
+
 // See nsStylePosition.mPosition
 #define NS_STYLE_POSITION_NORMAL                0
 #define NS_STYLE_POSITION_RELATIVE              1

layout/base/src/nsStyleContext.cpp

@@ -59,12 +59,12 @@ void StyleFontImpl::ResetFrom(const nsStyleFont* aParent, nsIPresContext* aPresC
   if (nsnull != aParent) {
     mFont = aParent->mFont;
     mFixedFont = aParent->mFixedFont;
-    mThreeD = aParent->mThreeD;
+    mFlags = aParent->mFlags;
   }
   else {
     mFont = aPresContext->GetDefaultFont();
     mFixedFont = aPresContext->GetDefaultFixedFont();
-    mThreeD = PR_FALSE;
+    mFlags = NS_STYLE_FONT_DEFAULT;
   }
 }
 

layout/style/nsStyleContext.cpp

@@ -59,12 +59,12 @@ void StyleFontImpl::ResetFrom(const nsStyleFont* aParent, nsIPresContext* aPresC
   if (nsnull != aParent) {
     mFont = aParent->mFont;
     mFixedFont = aParent->mFixedFont;
-    mThreeD = aParent->mThreeD;
+    mFlags = aParent->mFlags;
   }
   else {
     mFont = aPresContext->GetDefaultFont();
     mFixedFont = aPresContext->GetDefaultFixedFont();
-    mThreeD = PR_FALSE;
+    mFlags = NS_STYLE_FONT_DEFAULT;
   }
 }